From 596d0bcbacd8dde70f0bbcfdf07db5cf694220ef Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 08 一月 2025 09:33:20 +0800
Subject: [PATCH] 1.修复上传文件取消上传还会上传bug 2.添加上传视频功能 3.添加关闭activity时关闭上传功能。
---
app/src/main/res/layout/item_order.xml | 171 +++++++++++++++++++++++++++-----------------------------
1 files changed, 82 insertions(+), 89 deletions(-)
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index f7db4db..8a62a37 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
@@ -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
@@ -58,12 +59,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.processingState}"
+ android:textColor="@color/black"
android:textSize="@dimen/manage_item_text_state_size" />
@@ -76,23 +77,23 @@
android:orientation="horizontal">
+ <TextView
+ android:id="@+id/jinduTag"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ 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" />
-
+ <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>
@@ -104,25 +105,23 @@
android:orientation="horizontal">
+ <TextView
+ android:id="@+id/daiShenPiTag"
+ 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/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>
-
-
+ <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
@@ -133,28 +132,25 @@
android:orientation="horizontal">
+ <TextView
- <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" />
- 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/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>
<LinearLayout
@@ -165,23 +161,23 @@
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/manage_item_text_size" />
+ <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" />
-
+ <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>
@@ -190,28 +186,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp"
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: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="match_parent"
- android:layout_height="wrap_content"
- android:text="@{data.dispatchTime}"
- android:textColor="@color/manage_item_text"
- android:textSize="@dimen/manage_item_text_size" />
-
-
-
+ <TextView
+ android:id="@+id/startTime"
+ 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>
--
Gitblit v1.8.0