From 5aa4aff7a2ea7953283cffccf3b1835931295d55 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 23 十二月 2024 15:35:25 +0800
Subject: [PATCH] 1.优化工单提醒功能，添加强制震动，防止同一个工单id重复提醒。
---
app/src/main/res/layout/item_order.xml | 90 +++++++--------------------------------------
1 files changed, 14 insertions(+), 76 deletions(-)
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index 43adade..67769ca 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -8,7 +8,7 @@
<variable
name="data"
- type="com.dayu.pipirrapp.bean.net.OrderListResult.Data" />
+ type="com.dayu.pipirrapp.bean.net.OrderDetailResult" />
</data>
<LinearLayout
@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:background="@drawable/ic_choose_gray_edge"
- android:onClick="@{()->itemclidk.startDetail(data.workOrderId)}"
+ android:onClick="@{()->itemclidk.startDetail(data.workOrderId,data.proResultId)}"
android:orientation="vertical"
android:padding="10dp">
@@ -58,11 +58,12 @@
android:layout_centerVertical="true"
android:background="@drawable/ic_edt_gray_bg"
android:gravity="center"
+ android:textColor="@color/black"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingRight="10dp"
android:paddingBottom="5dp"
- android:text="@{data.state}"
+ android:text="@{data.processingState}"
android:textSize="@dimen/manage_item_text_state_size" />
@@ -74,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"
@@ -94,7 +92,7 @@
android:text="@{data.workOrderId}"
android:textColor="@color/manage_item_text"
android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
+
</LinearLayout>
@@ -105,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"
@@ -128,7 +123,7 @@
</LinearLayout>
- </LinearLayout>
+
<LinearLayout
android:layout_width="match_parent"
@@ -137,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
@@ -165,7 +154,7 @@
</LinearLayout>
- </LinearLayout>
+
<LinearLayout
@@ -175,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"
@@ -199,7 +181,7 @@
android:text="@{data.taskContent}"
android:textColor="@color/manage_item_text"
android:textSize="@dimen/manage_item_text_size" />
- </LinearLayout>
+
</LinearLayout>
@@ -207,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"
@@ -228,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