From 6a44973461e2a91f62f7eed681b4db3abb026289 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 24 十二月 2024 16:52:23 +0800
Subject: [PATCH] 1.优化地图相关代码，提高运行效率和可读性。 2.添加修改密码功能。 3.优化列表和详情页展示。
---
app/src/main/res/layout/activity_order_detail.xml | 429 ++++++++++++++++++++++++++++------------------------
1 files changed, 230 insertions(+), 199 deletions(-)
diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml
index 5d73d1c..3136c82 100644
--- a/app/src/main/res/layout/activity_order_detail.xml
+++ b/app/src/main/res/layout/activity_order_detail.xml
@@ -20,6 +20,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/item_bg_color"
android:orientation="vertical">
<include
@@ -40,266 +41,296 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="20dp">
+ android:orientation="vertical">
-
- <RelativeLayout
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="30dp"
- android:orientation="horizontal">
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="15dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/bg_detail_wite"
+ android:orientation="vertical"
+ android:paddingLeft="10dp"
+ android:paddingTop="15dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="20dp">
- <ImageView
- android:id="@+id/ic_project"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_centerVertical="true"
- android:layout_marginRight="15dp"
- android:src="@mipmap/icon_project" />
- <TextView
- android:id="@+id/projectName"
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
+ android:minHeight="30dp"
+ android:orientation="horizontal">
- android:layout_marginEnd="15dp"
- android:layout_toStartOf="@+id/stateText"
- android:layout_toEndOf="@+id/ic_project"
- android:ellipsize="end"
- android:maxLines="1"
- android:text="@{data.taskType}"
- android:textColor="@color/title_color"
- android:textSize="@dimen/order_detail_text_size" />
+ <ImageView
+ android:id="@+id/ic_project"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="15dp"
+ android:src="@mipmap/icon_project" />
+
+ <TextView
+ android:id="@+id/projectName"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+
+ android:layout_marginEnd="15dp"
+ android:layout_toStartOf="@+id/stateText"
+ android:layout_toEndOf="@+id/ic_project"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.taskType}"
+ android:textColor="@color/title_color"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
- android:id="@+id/stateText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="@drawable/ic_edt_gray_bg"
- android:gravity="center"
- android:paddingLeft="10dp"
- android:paddingTop="5dp"
- android:paddingRight="10dp"
- android:paddingBottom="5dp"
- android:text="@{data.processingState}"
- android:textSize="@dimen/manage_item_text_state_size" />
+ <TextView
+ android:id="@+id/stateText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="@drawable/ic_edt_gray_bg"
+ android:gravity="center"
+ android:paddingLeft="10dp"
+ android:paddingTop="5dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="5dp"
+ android:text="@{data.processingState}"
+ android:textSize="@dimen/manage_item_text_state_size" />
- </RelativeLayout>
+ </RelativeLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="horizontal">
-
-
- <TextView
- android:id="@+id/jinduTag"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="宸ュ崟ID锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
- android:id="@+id/jindu"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.workOrderId}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ android:layout_marginTop="5dp"
+ android:orientation="horizontal">
- </LinearLayout>
+ <TextView
+ android:id="@+id/jinduTag"
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="宸ュ崟ID锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="horizontal">
+ <TextView
+ android:id="@+id/jindu"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.workOrderId}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
+ </LinearLayout>
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="娲惧崟浜哄鍚嶏細"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
-
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{data.dispatcher}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
-
- </LinearLayout>
-
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="horizontal">
-
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="娲惧崟鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
-
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.dispatchTime}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ android:layout_marginTop="5dp"
+ android:orientation="horizontal">
- </LinearLayout>
+ <TextView
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="娲惧崟浜哄鍚嶏細"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{data.dispatcher}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
- android:layout_width="wrap_content"
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:orientation="horizontal">
+
+
+ <TextView
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="娲惧崟鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.dispatchTime}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
android:gravity="center_vertical"
- android:text="浠诲姟绫诲瀷锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ android:orientation="horizontal">
- <TextView
- android:id="@+id/startTime"
+
+ <TextView
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="浠诲姟绫诲瀷锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/startTime"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.taskType}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ </LinearLayout>
+
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.taskType}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- </LinearLayout>
+ android:layout_marginTop="5dp"
+ android:orientation="horizontal">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:orientation="horizontal">
+ <TextView
+ android:id="@+id/daiShenPiTag"
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="瑕佹眰瀹屾垚鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/daiShenPi"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.deadLine}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
- android:id="@+id/daiShenPiTag"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瑕佹眰瀹屾垚鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ </LinearLayout>
- <TextView
- android:id="@+id/daiShenPi"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.deadLine}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ android:layout_marginTop="5dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
- </LinearLayout>
+ <TextView
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="瀹屾垚鏍囧噯锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/xiangMuJianCheng"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+
+ android:text="@{data.completeCriteria}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
- <TextView
+ </LinearLayout>
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瀹屾垚鏍囧噯锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
- <TextView
- android:id="@+id/xiangMuJianCheng"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
- android:text="@{data.completeCriteria}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
+ <TextView
+ android:layout_width="120dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="浠诲姟鍐呭锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/order_detail_text_size" />
+
+ <TextView
+ android:id="@+id/xiangMuType"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{data.taskContent}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/order_detail_text_size" />
+
+
+ </LinearLayout>
</LinearLayout>
-
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center_vertical"
- android:orientation="horizontal">
-
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="浠诲姟鍐呭锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
- <TextView
- android:id="@+id/xiangMuType"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@{data.taskContent}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/order_detail_text_size" />
-
-
- </LinearLayout>
-
<LinearLayout
android:id="@+id/orderDealLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="15dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginBottom="20dp"
+ android:background="@drawable/bg_detail_wite"
android:orientation="vertical"
- android:visibility="gone">
+ android:paddingLeft="10dp"
+ android:paddingTop="15dp"
+ android:paddingRight="10dp"
+ android:paddingBottom="20dp">
+
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+
+ android:layout_marginBottom="5dp"
+ android:gravity="center"
+ android:text="澶勭悊缁撴灉"
+ android:textColor="@color/base_blue"
+ android:textSize="@dimen/order_detail_text_size"
+ android:textStyle="bold" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/base_blue" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:gravity="center"
- android:text="澶勭悊缁撴灉"
- android:textColor="@color/base_blue"
- android:textSize="@dimen/order_detail_text_size" />
<LinearLayout
@@ -315,7 +346,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍙嶉璇︽儏锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<TextView
@@ -341,7 +372,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍙嶉鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<TextView
@@ -365,7 +396,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍙嶉鍥剧墖锛�"
- android:textColor="@color/manage_item_text"
+ android:textColor="@color/item_name_text_color"
android:textSize="@dimen/order_detail_text_size" />
<androidx.recyclerview.widget.RecyclerView
--
Gitblit v1.8.0