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_clean_storage_detail.xml |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/activity_clean_storage_detail.xml b/app/src/main/res/layout/activity_clean_storage_detail.xml
index ca3055e..54ee2ae 100644
--- a/app/src/main/res/layout/activity_clean_storage_detail.xml
+++ b/app/src/main/res/layout/activity_clean_storage_detail.xml
@@ -12,15 +12,33 @@
     <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/titleBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:title="淇濇磥鏀剁撼"
+            app:title="@{viewModel.beanLiveData.id==0?`鏂板淇濇磥鏀剁撼`:viewModel.beanLiveData.type}"
             app:titleGravity="left"
-            />
+            >
+            <FrameLayout
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginHorizontal="16dp"
+                android:layout_gravity="center_vertical|end"
+                android:visibility="@{viewModel.beanLiveData.ownData==1}"
+                >
+                <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"
@@ -46,11 +64,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="text"
+                    android:hint="璇疯緭鍏ョ被鍨�(淇濇磥/鏀剁撼)"
                     android:autofillHints="creditCardNumber"
                     android:textColorHint="#6b000000"
                     android:textColor="#DE000000"
                     android:textSize="16sp"
-                    android:text="@={viewModel.beanLiveData.type}"
+                    android:text="@={viewModel.beanLiveData.kind}"
                     />
 
                 <TextView
@@ -67,8 +86,10 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
                     android:inputType="text"
+                    android:hint="璇疯緭鍏ラ�傜敤浜�"
+                    android:textColorHint="#6b000000"
                     android:textColor="#DE000000"
-                    android:text="@={viewModel.beanLiveData.suitablePeople}"
+                    android:text="@={viewModel.beanLiveData.suitable}"
                     android:textSize="16sp" />
                 <TextView
                     android:layout_width="wrap_content"
@@ -83,8 +104,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
                     android:inputType="text"
+                    android:hint="璇疯緭鍏ョ被鍒�"
                     android:textColorHint="#6b000000"
-                    android:text="@={viewModel.beanLiveData.category}"
+                    android:text="@={viewModel.beanLiveData.type}"
                     android:textColor="#DE000000"
                     android:textSize="16sp" />
                 <TextView
@@ -100,9 +122,10 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
                     android:inputType="text"
+                    android:hint="璇疯緭鍏ヤ繚娲佹柟娉�"
                     android:textColorHint="#6b000000"
                     android:textColor="#DE000000"
-                    android:text="@={viewModel.beanLiveData.cleanMethod}"
+                    android:text="@={viewModel.beanLiveData.method}"
                     android:textSize="16sp" />
                 <TextView
                     android:layout_width="wrap_content"
@@ -117,9 +140,10 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
                     android:inputType="text"
+                    android:hint="璇疯緭鍏ユ潗鏂欏瓨鏀惧湴"
                     android:textColorHint="#6b000000"
                     android:textColor="#DE000000"
-                    android:text="@={viewModel.beanLiveData.materialStorageLocation}"
+                    android:text="@={viewModel.beanLiveData.place}"
                     android:textSize="16sp" />
                 <TextView
                     android:layout_width="wrap_content"
@@ -134,9 +158,10 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
                     android:inputType="text"
+                    android:hint="璇疯緭鍏ユ斁缃湴鐐�"
                     android:textColorHint="#6b000000"
                     android:textColor="#DE000000"
-                    android:text="@={viewModel.beanLiveData.placementLocation}"
+                    android:text="@={viewModel.beanLiveData.location}"
                     android:textSize="16sp" />
                 <TextView
                     android:layout_width="wrap_content"
@@ -151,6 +176,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
                     android:inputType="text"
+                    android:hint="璇疯緭鍏ュ娉�"
                     android:textColorHint="#6b000000"
                     android:textColor="#DE000000"
                     android:text="@={viewModel.beanLiveData.remark}"

--
Gitblit v1.9.1