From 15f5680b532238290d0adf095a93e5af1c5f1203 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 07 二月 2025 17:14:57 +0800
Subject: [PATCH] 1.添加显示隐藏取水口、分水房功能 2.完善图例自定义控件功能和显示 3.处理工单添加选择时间功能

---
 app/src/main/res/layout/activity_order_deal.xml |  111 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 96 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/activity_order_deal.xml b/app/src/main/res/layout/activity_order_deal.xml
index 1465137..8481bf9 100644
--- a/app/src/main/res/layout/activity_order_deal.xml
+++ b/app/src/main/res/layout/activity_order_deal.xml
@@ -10,7 +10,7 @@
 
         <variable
             name="data"
-            type="com.dayu.pipirrapp.bean.net.OrderListResult.Data" />
+            type="com.dayu.pipirrapp.bean.net.OrderDetailResult" />
     </data>
 
     <RelativeLayout
@@ -33,36 +33,117 @@
             android:orientation="vertical"
             android:padding="20dp">
 
-            <TextView
-                android:layout_width="wrap_content"
+
+            <RelativeLayout
+                android:id="@+id/timeLL"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/leftiocn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="* "
+                    android:gravity="center"
+
+                    android:layout_centerVertical="true"
+                    android:textColor="@color/base_red"
+                    android:textSize="@dimen/order_detail_button_size" />
+
+                <TextView
+                    android:id="@+id/timeTV"
+                    android:layout_width="wrap_content"
+
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@+id/leftiocn"
+                    android:text="鍙嶉鏃堕棿锛�"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/order_detail_button_size" />
+                <TextView
+                    android:id="@+id/timeData"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@+id/timeTV"
+                    android:layout_marginLeft="10dp"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/order_detail_button_size" />
+                <ImageView
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:src="@drawable/ic_right" />
+            </RelativeLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_marginTop="10dp"
                 android:layout_height="wrap_content"
-                android:text="鍙嶉鍐呭锛�"
-                android:textColor="@color/black"
-                android:textSize="@dimen/order_detail_button_size" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="* "
+                    android:textColor="@color/base_red"
+                    android:textSize="@dimen/order_detail_button_size" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="鍙嶉鍐呭锛�"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/order_detail_button_size" />
+            </LinearLayout>
 
 
             <EditText
+                android:id="@+id/contentET"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:background="@drawable/edittext_backgroud"
-                android:minHeight="100dp" />
+                android:gravity="start"
+                android:maxHeight="200dp"
+                android:minHeight="100dp"
+                android:text="" />
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="鎻愪氦鍥剧墖锛�"
                 android:layout_marginTop="10dp"
-                android:textColor="@color/black"
-                android:textSize="@dimen/order_detail_button_size" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="* "
+                    android:textColor="@color/base_red"
+                    android:textSize="@dimen/order_detail_button_size" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:text="鎻愪氦鍥剧墖鎴栬棰戯細"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/order_detail_button_size" />
+            </LinearLayout>
+
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:background="@color/white"
                 android:layout_marginTop="10dp"
-                android:overScrollMode="never" />
+                android:background="@color/white"
+                android:overScrollMode="never"
+                android:padding="5dp" />
 
         </LinearLayout>
 

--
Gitblit v1.8.0