From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 25 七月 2023 22:18:27 +0800
Subject: [PATCH] 基本功能完成

---
 app/src/main/res/layout/activity_clean_storage_detail.xml |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 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..101b054 100644
--- a/app/src/main/res/layout/activity_clean_storage_detail.xml
+++ b/app/src/main/res/layout/activity_clean_storage_detail.xml
@@ -16,11 +16,28 @@
         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"
+                >
+                <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 +63,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 +85,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 +103,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 +121,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 +139,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 +157,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 +175,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