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/acitivity_tourism_experience_detail.xml | 63 +++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/app/src/main/res/layout/acitivity_tourism_experience_detail.xml b/app/src/main/res/layout/acitivity_tourism_experience_detail.xml index 246b2ca..343600d 100644 --- a/app/src/main/res/layout/acitivity_tourism_experience_detail.xml +++ b/app/src/main/res/layout/acitivity_tourism_experience_detail.xml @@ -267,6 +267,69 @@ </LinearLayout> </LinearLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + > + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical" + > + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="鍏朵粬璐圭敤" + android:textColor="#767375" + android:textSize="12sp" + /> + <EditText + android:id="@+id/et_other" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="numberDecimal" + android:textColorHint="#6b000000" + android:textColor="#DE000000" + android:text="@={viewModel.beanLiveData.otherCost}" + android:hint="0" + app:need_modify_null="@{true}" + android:textSize="16sp" + android:maxLines="1" + android:enabled="@{viewModel.typeLiveData}" + /> + + </LinearLayout> + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical" + android:layout_marginStart="40dp" + > + </LinearLayout> + </LinearLayout> + <TextView + android:layout_width="wrap_content" + android:layout_marginTop="10dp" + android:layout_height="wrap_content" + android:text="澶囨敞" + android:textColor="#767375" + android:textSize="12sp" + /> + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="2dp" + android:inputType="text" + android:textColorHint="#6b000000" + android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ娉╜:``}" + android:textColor="#DE000000" + android:text="@={viewModel.beanLiveData.backInfo}" + android:textSize="16sp" + android:enabled="@{viewModel.typeLiveData}" + /> <TextView android:layout_width="wrap_content" android:layout_marginTop="10dp" -- Gitblit v1.9.1