From 8aa3165449dd2757e016bdc43cfd5d111cd4c7a6 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:54:06 +0800
Subject: [PATCH] 修改了家庭资产的显示问题
---
app/src/main/res/layout/acitivity_tourism_experience_detail.xml | 336 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 245 insertions(+), 91 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 67134bc..343600d 100644
--- a/app/src/main/res/layout/acitivity_tourism_experience_detail.xml
+++ b/app/src/main/res/layout/acitivity_tourism_experience_detail.xml
@@ -13,13 +13,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{TextUtils.isEmpty(viewModel.beanLiveData.title)?`鏂板缓鏃呮父缁忓巻`:viewModel.beanLiveData.title}"
+ app:title="@{TextUtils.isEmpty(viewModel.beanLiveData.address)?`鏂板缓鏃呮父缁忓巻`:viewModel.beanLiveData.address}"
app:titleGravity="left"
app:leftIcon="@drawable/ic_back"
>
@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_height="@dimen/dp_20"
- android:text="鏍囬"
+ android:text="琛岀▼鍦扮偣"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -65,10 +65,10 @@
android:inputType="text"
android:autofillHints="creditCardNumber"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ爣棰榒:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヨ绋嬪湴鐐筦:``}"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@={viewModel.beanLiveData.title}"
+ android:text="@={viewModel.beanLiveData.address}"
android:enabled="@{viewModel.typeLiveData}"
/>
@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鏃堕棿"
+ android:text="琛岀▼鏃堕棿"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -89,17 +89,17 @@
android:inputType="text"
android:textColor="#DE000000"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃堕棿`:``}"
- android:text="@={viewModel.beanLiveData.happenTime}"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨琛岀▼鏃堕棿`:``}"
+ android:text="@={viewModel.beanLiveData.happenDate}"
android:textSize="16sp"
- android:clickable="@{viewModel.typeLiveData}"
+ android:enabled="@{viewModel.typeLiveData}"
app:isEditable="@{false}"
/>
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="鍦扮偣"
+ android:text="鏅偣"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -109,8 +109,8 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ湴鐐筦:``}"
- android:text="@={viewModel.beanLiveData.address}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ櫙鐐筦:``}"
+ android:text="@={viewModel.beanLiveData.scenic}"
android:textColor="#DE000000"
android:enabled="@{viewModel.typeLiveData}"
android:textSize="16sp"
@@ -119,7 +119,7 @@
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
- android:text="浜虹墿"
+ android:text="浣忓閰掑簵"
android:textColor="#767375"
android:textSize="12sp"
/>
@@ -129,93 +129,187 @@
android:layout_marginTop="2dp"
android:inputType="text"
android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ汉鐗ー:``}"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヤ綇瀹块厭搴梎:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.people}"
+ android:text="@={viewModel.beanLiveData.hotel}"
android:textSize="16sp"
android:enabled="@{viewModel.typeLiveData}"
/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_height="wrap_content"
- android:text="鏃呮湡"
- android:textColor="#767375"
- android:textSize="12sp"
- />
- <EditText
+
+
+ <LinearLayout
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.travelPeriod}"
- android:textSize="16sp"
- android:enabled="@{viewModel.typeLiveData}"
- />
- <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_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"
+ />
+ <androidx.appcompat.widget.AppCompatEditText
+ android:id="@+id/et_stay"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.stay}"
+ 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"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浜ら�氳垂"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_traffic"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.travel}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
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.certificate}"
- android:textSize="16sp"
- android:enabled="@{viewModel.typeLiveData}"
- />
- <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_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_entrance"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.entrance}"
+ 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"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="椁愯垂"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_eat"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.eat}"
+ android:hint="0"
+ app:need_modify_null="@{true}"
+ android:textSize="16sp"
+ android:maxLines="1"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="numberDecimal"
- android:textColorHint="#6b000000"
- android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ヨ垂鐢╜:``}"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.totalPrice}"
- android:textSize="16sp" />
- <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:id="@+id/et_self"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- tools:text="鑷垂"
- android:drawablePadding="10dp"
- app:isEditable="@{false}"
- android:clickable="@{viewModel.typeLiveData}"
- android:drawableStart="@drawable/ic_radio_button_selected"
- android:text="@{viewModel.beanLiveData.self==0?`鍏垂`:`鑷垂`}"
- android:textSize="16sp" />
+ 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"
@@ -232,7 +326,67 @@
android:textColorHint="#6b000000"
android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ娉╜:``}"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.remark}"
+ android:text="@={viewModel.beanLiveData.backInfo}"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+ <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.travelMode}"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+ <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.flight}"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
+ <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.document}"
android:textSize="16sp"
android:enabled="@{viewModel.typeLiveData}"
/>
--
Gitblit v1.9.1