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/activity_tourism_detail.xml | 549 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 345 insertions(+), 204 deletions(-)
diff --git a/app/src/main/res/layout/activity_tourism_detail.xml b/app/src/main/res/layout/activity_tourism_detail.xml
index d0f9eb1..b1083fe 100644
--- a/app/src/main/res/layout/activity_tourism_detail.xml
+++ b/app/src/main/res/layout/activity_tourism_detail.xml
@@ -12,15 +12,31 @@
<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:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="@{viewModel.beanLiveData.title}"
+ app:title="@{viewModel.beanLiveData.name==null?`鏂板鏃呮父璐圭敤璁板綍`:viewModel.beanLiveData.name}"
app:titleGravity="left"
- />
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@{viewModel.typeLiveData?@drawable/ic_operate_finish:@drawable/ic_operate}"
+ />
+ </FrameLayout>
+ </com.android.app_base.widget.ExtendTitleBar>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -36,7 +52,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"
/>
@@ -47,10 +63,12 @@
android:layout_height="wrap_content"
android:inputType="text"
android:autofillHints="creditCardNumber"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ梾娓稿悕绉癭:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:textSize="16sp"
- android:text="@{viewModel.beanLiveData.title}"
+ android:text="@={viewModel.beanLiveData.name}"
+ android:enabled="@{viewModel.typeLiveData}"
/>
<TextView
@@ -63,13 +81,18 @@
/>
<EditText
+ android:id="@+id/et_start_time"
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.startTime}"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ app:isEditable="@{false}"
+ android:enabled="@{viewModel.typeLiveData}"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -79,31 +102,101 @@
android:textSize="12sp"
/>
<EditText
+ android:id="@+id/et_end_time"
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:text="@={viewModel.beanLiveData.endTime}"
android:textColor="#DE000000"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ 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"
+ />
+ <EditText
+ android:id="@+id/et_whereabouts"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鍘诲悜`:``}"
+ android:text="@={viewModel.beanLiveData.destination}"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ 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:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_tourism_nature"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃呮父鎬ц川`:``}"
+ android:text="@={viewModel.beanLiveData.property}"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ 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:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:id="@+id/et_tourism_way"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`璇烽�夋嫨鏃呮父鏂瑰紡`:``}"
+ android:text="@={viewModel.beanLiveData.manner}"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:enabled="@{viewModel.typeLiveData}"
+ app:isEditable="@{false}"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ 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:autofillHints="creditCardNumber"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ュ洟璐筦:``}"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.totalDay}"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:text="@={viewModel.beanLiveData.groupTotal}"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:inputType="numberDecimal"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -112,207 +205,255 @@
android:textColor="#767375"
android:textSize="12sp"
/>
- <EditText
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="2dp"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.totalMoney}"
- android:textSize="16sp" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="12dp"
>
- <LinearLayout
- android:layout_width="0dp"
+ <EditText
+ android:id="@+id/et_total_cost"
+ android:layout_width="match_parent"
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:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- tools:text="aaa"
- android:text="@={viewModel.beanLiveData.totalMoney}"
- android:textSize="16sp" />
-
- </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:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.mealMoney}"
- android:textSize="16sp" />
-
- </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:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- tools:text="aaa"
- android:text="@={viewModel.beanLiveData.hotelMoney}"
- android:textSize="16sp" />
-
- </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:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.trafficMoney}"
- android:textSize="16sp" />
-
- </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:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- tools:text="aaa"
- android:text="@={viewModel.beanLiveData.ticketMoney}"
- android:textSize="16sp" />
-
- </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:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="text"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:text="@={viewModel.beanLiveData.shoppingMoney}"
- android:textSize="16sp" />
-
- </LinearLayout>
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="14dp"
- android:gravity="center_vertical"
- >
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="姣忔棩璇︾粏娑堣垂璁板綍"
- android:textSize="20sp"
- android:textColor="@color/black"
+ android:layout_marginTop="2dp"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.totalPrice}"
+ android:textSize="16sp"
+ android:enabled="false"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
/>
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_tourism_add"
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_total_cost"
+ app:layout_constraintStart_toStartOf="@id/et_total_cost"
+ app:layout_constraintBottom_toBottomOf="@id/et_total_cost"
+ app:layout_constraintEnd_toEndOf="@id/et_total_cost"
+ android:visibility="@{viewModel.typeLiveData}"
/>
-
- </LinearLayout>
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/rv_daily_consume_record"
- android:orientation="vertical"
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <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"
+ />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <EditText
+ android:id="@+id/et_stay"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="numberDecimal"
+ android:textColorHint="#6b000000"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.stayTotal}"
+ android:textSize="16sp"
+ android:enabled="false"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_stay"
+ app:layout_constraintStart_toStartOf="@id/et_stay"
+ app:layout_constraintBottom_toBottomOf="@id/et_stay"
+ app:layout_constraintEnd_toEndOf="@id/et_stay"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </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"
+ />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <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.travelTotal}"
+ android:textSize="16sp"
+ android:enabled="false"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_traffic"
+ app:layout_constraintStart_toStartOf="@id/et_traffic"
+ app:layout_constraintBottom_toBottomOf="@id/et_traffic"
+ app:layout_constraintEnd_toEndOf="@id/et_traffic"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </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"
+ />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <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.entranceTotal}"
+ android:textSize="16sp"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:enabled="false"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_entrance"
+ app:layout_constraintStart_toStartOf="@id/et_entrance"
+ app:layout_constraintBottom_toBottomOf="@id/et_entrance"
+ app:layout_constraintEnd_toEndOf="@id/et_entrance"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </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"
+ />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <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.eatTotal}"
+ android:textSize="16sp"
+ android:hint="@{viewModel.typeLiveData?`0`:``}"
+ android:enabled="false"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@color/color_non_editable"
+ app:layout_constraintTop_toTopOf="@id/et_eat"
+ app:layout_constraintStart_toStartOf="@id/et_eat"
+ app:layout_constraintBottom_toBottomOf="@id/et_eat"
+ app:layout_constraintEnd_toEndOf="@id/et_eat"
+ android:visibility="@{viewModel.typeLiveData}"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </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"
/>
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/shape_6b0000_stroke"
+ android:padding="10dp"
+ >
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:autofillHints="creditCardNumber"
+ android:hint="@{viewModel.typeLiveData?`璇疯緭鍏ユ劅瑷�`:``}"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:text="@={viewModel.beanLiveData.spee}"
+ android:enabled="@{viewModel.typeLiveData}"
+ android:inputType="textMultiLine"
+ android:background="@null"
+ />
-
+ </RelativeLayout>
</LinearLayout>
</ScrollView>
--
Gitblit v1.9.1