From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/src/main/res/layout/item_tourism_experience.xml | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/item_tourism_experience.xml b/app/src/main/res/layout/item_tourism_experience.xml
index b229a41..41289c5 100644
--- a/app/src/main/res/layout/item_tourism_experience.xml
+++ b/app/src/main/res/layout/item_tourism_experience.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -270,6 +270,31 @@
android:textSize="12sp"
/>
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/layout_4"
+ app:layout_constraintStart_toStartOf="@id/layout_4"
+ android:layout_marginTop="6dp"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍏朵粬璐圭敤锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.otherCost}"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ />
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
--
Gitblit v1.9.1