From fafdeae594f79bad8133837e5cde239afca4da54 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 06 十二月 2024 16:13:02 +0800
Subject: [PATCH] 1.优化工单列表状态显示 2.接口添加token失效判断，失效后跳转到登录界面。
---
app/src/main/res/layout/activity_order_detail.xml | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml
index 613ac31..e42682f 100644
--- a/app/src/main/res/layout/activity_order_detail.xml
+++ b/app/src/main/res/layout/activity_order_detail.xml
@@ -11,6 +11,10 @@
<variable
name="data"
type="com.dayu.pipirrapp.bean.net.OrderDetailResult" />
+
+ <variable
+ name="dealData"
+ type="com.dayu.pipirrapp.bean.net.DealDetailResult" />
</data>
<RelativeLayout
@@ -27,7 +31,10 @@
android:id="@+id/ScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_below="@+id/title">
+ android:layout_above="@+id/deal_button"
+ android:layout_below="@+id/title"
+ android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp">
<LinearLayout
@@ -47,8 +54,8 @@
android:id="@+id/ic_project"
android:layout_width="20dp"
android:layout_height="20dp"
- android:layout_marginRight="15dp"
android:layout_centerVertical="true"
+ android:layout_marginRight="15dp"
android:src="@mipmap/icon_project" />
<TextView
@@ -79,7 +86,7 @@
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" />
@@ -278,7 +285,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:visibility="gone">
+ android:visibility="visible">
<TextView
android:layout_width="match_parent"
@@ -302,14 +309,40 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鍙嶉锛�"
+ android:text="鍙嶉璇︽儏锛�"
android:textColor="@color/manage_item_text"
android:textSize="@dimen/order_detail_text_size" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@{data.completeCriteria}"
+ android:text="@{dealData.content}"
+ 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="10dp"
+ 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:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@{dealData.reportTime}"
android:textColor="@color/manage_item_text"
android:textSize="@dimen/order_detail_text_size" />
@@ -352,8 +385,8 @@
android:layout_alignParentBottom="true"
android:background="@color/title_color"
android:gravity="center"
- android:text="澶勭悊宸ュ崟"
android:onClick="@{()->itemclidk.startDealActivity()}"
+ android:text="澶勭悊宸ュ崟"
android:textColor="@color/white"
android:textSize="@dimen/order_detail_button_size" />
--
Gitblit v1.8.0