From 798128053bb17ed293aa8d5424db3b5ed007d375 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 23 十二月 2024 10:20:57 +0800
Subject: [PATCH] 1.优化订单列表框架,升级为viewPager2,提升性能。 2.添加收到新工单后的红点提醒。 3.修复查询数据为空时报错。 4.优化修改经纬度的流程。 5.修复mqtt的CLIENT_ID一致导致的连接错误。 6.修复收到新工单后点击消息通知栏跳转详情时不更新数据的bug。
---
app/src/main/res/layout/item_order.xml | 83 +++++------------------------------------
1 files changed, 10 insertions(+), 73 deletions(-)
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index 6a76e2e..f7db4db 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -75,10 +75,7 @@
android:layout_marginTop="5dp"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1">
+
<TextView
android:id="@+id/jinduTag"
@@ -95,7 +92,7 @@
android:text="@{data.workOrderId}"
android:textColor="@color/manage_item_text"
android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
+
</LinearLayout>
@@ -106,10 +103,7 @@
android:layout_marginTop="5dp"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1">
+
<TextView
android:id="@+id/daiShenPiTag"
@@ -129,7 +123,7 @@
</LinearLayout>
- </LinearLayout>
+
<LinearLayout
android:layout_width="match_parent"
@@ -138,13 +132,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingRight="5dp">
+
<TextView
@@ -166,7 +154,7 @@
</LinearLayout>
- </LinearLayout>
+
<LinearLayout
@@ -176,13 +164,6 @@
android:gravity="center_vertical"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingRight="5dp">
<TextView
android:layout_width="wrap_content"
@@ -200,7 +181,7 @@
android:text="@{data.taskContent}"
android:textColor="@color/manage_item_text"
android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
+
</LinearLayout>
@@ -208,16 +189,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
+ android:layout_marginTop="5dp"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:layout_weight="2"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+
<TextView
android:layout_width="wrap_content"
@@ -229,54 +204,16 @@
<TextView
android:id="@+id/startTime"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@{data.dispatchTime}"
android:textColor="@color/manage_item_text"
android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:layout_marginTop="5dp"
- android:layout_marginRight="10dp"
- android:layout_weight="1"
- android:orientation="horizontal"
- android:visibility="gone">
- <TextView
- android:id="@+id/lookDetail"
- android:layout_width="0dp"
- android:layout_height="@dimen/manage_item_btn_height"
- android:layout_weight="1"
- android:background="@drawable/ic_blue_background"
- android:gravity="center"
-
- android:text="鏌ョ湅"
- android:textColor="@color/white"
- android:textSize="@dimen/manage_item_btn_text_size" />
-
-
- <TextView
- android:id="@+id/examineBtn"
- android:layout_width="0dp"
- android:layout_height="@dimen/manage_item_btn_height"
- android:layout_marginLeft="15dp"
- android:layout_weight="1"
- android:background="@drawable/ic_blue_background"
- android:gravity="center"
-
- android:text="瀹℃壒"
- android:textColor="@color/white"
- android:textSize="@dimen/manage_item_btn_text_size" />
-
-
- </LinearLayout>
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0