From 33b0a2e31069086ef68993459502b020ebcd988c Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 12 十二月 2024 16:38:32 +0800
Subject: [PATCH] 1.修复当开启巡检以后在处理工单和上报问题时开启定位导致的自动关闭定位的bug 2.上报问题详情界面部分功能

---
 app/src/main/res/layout/activity_order_deal.xml |   59 +++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/activity_order_deal.xml b/app/src/main/res/layout/activity_order_deal.xml
index 46c5be9..cd2e5e8 100644
--- a/app/src/main/res/layout/activity_order_deal.xml
+++ b/app/src/main/res/layout/activity_order_deal.xml
@@ -16,6 +16,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/bg_color"
         android:orientation="vertical">
 
         <include
@@ -32,34 +33,68 @@
             android:orientation="vertical"
             android:padding="20dp">
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 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:layout_marginTop="10dp"
-                android:overScrollMode="never" />
+                android:background="@color/white"
+                android:overScrollMode="never"
+                android:padding="5dp" />
 
         </LinearLayout>
 

--
Gitblit v1.8.0