From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
app/src/main/res/layout/item_order.xml | 257 ++++++++++++++++++--------------------------------
1 files changed, 94 insertions(+), 163 deletions(-)
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index 43adade..8fea820 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -8,15 +8,15 @@
<variable
name="data"
- type="com.dayu.pipirrapp.bean.net.OrderListResult.Data" />
+ type="com.dayu.pipirrapp.bean.net.OrderDetailResult" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
- android:background="@drawable/ic_choose_gray_edge"
- android:onClick="@{()->itemclidk.startDetail(data.workOrderId)}"
+ android:background="@drawable/item_ripple"
+ android:onClick="@{()->itemclidk.startDetail(data.workOrderId,data.proResultId)}"
android:orientation="vertical"
android:padding="10dp">
@@ -32,6 +32,7 @@
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
+ android:layout_marginLeft="10dp"
android:src="@mipmap/icon_project" />
<TextView
@@ -62,7 +63,8 @@
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
- android:text="@{data.state}"
+ android:text="@{data.processingState}"
+ android:textColor="@color/black"
android:textSize="@dimen/manage_item_text_state_size" />
@@ -74,27 +76,24 @@
android:layout_marginTop="5dp"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
+
+ <TextView
+ android:id="@+id/jinduTag"
+ android:layout_width="100dp"
android:layout_height="wrap_content"
- android:layout_weight="1">
+ android:gravity="right"
+ android:text="宸ュ崟ID锛�"
- <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/manage_item_text_size" />
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
- <TextView
- android:id="@+id/jindu"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{data.workOrderId}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/jindu"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{data.workOrderId}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
</LinearLayout>
@@ -105,66 +104,23 @@
android:layout_marginTop="5dp"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
+
+ <TextView
+ android:id="@+id/daiShenPiTag"
+ android:layout_width="100dp"
android:layout_height="wrap_content"
- android:layout_weight="1">
+ android:gravity="right"
+ android:text="瑕佹眰瀹屾垚鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_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/manage_item_text_size" />
-
- <TextView
- android:id="@+id/daiShenPi"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{data.deadLine}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_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">
-
- <LinearLayout
- android:layout_width="0dp"
+ <TextView
+ android:id="@+id/daiShenPi"
+ android:layout_width="wrap_content"
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"
- android:layout_height="wrap_content"
- android:text="瀹屾垚鏍囧噯锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
- <TextView
- android:id="@+id/xiangMuJianCheng"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:text="@{data.completeCriteria}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
-
-
+ android:text="@{data.deadLine}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
</LinearLayout>
@@ -175,31 +131,53 @@
android:gravity="center_vertical"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
+
+ <TextView
+
+ android:layout_width="100dp"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingRight="5dp">
+ android:gravity="right"
+ android:text="瀹屾垚鏍囧噯锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="浠诲姟鍐呭锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
+ <TextView
+ android:id="@+id/xiangMuJianCheng"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.completeCriteria}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
+ </LinearLayout>
- <TextView
- android:id="@+id/xiangMuType"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:maxLines="1"
- android:text="@{data.taskContent}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
- </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="100dp"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:text="浠诲姟鍐呭锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
+
+ <TextView
+ android:id="@+id/xiangMuType"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:text="@{data.taskContent}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
</LinearLayout>
@@ -207,75 +185,28 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
+ android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp"
android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
+
+ <TextView
+ android:layout_width="100dp"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:layout_weight="2"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:gravity="right"
+ android:text="娲惧崟鏃堕棿锛�"
+ android:textColor="@color/item_name_text_color"
+ android:textSize="@dimen/manage_item_text_size" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:text="娲惧崟鏃堕棿锛�"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
- <TextView
- android:id="@+id/startTime"
- android:layout_width="wrap_content"
- 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"
+ <TextView
+ android:id="@+id/startTime"
+ android:layout_width="match_parent"
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">
+ android:text="@{data.dispatchTime}"
+ android:textColor="@color/manage_item_text"
+ android:textSize="@dimen/manage_item_text_size" />
- <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