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/activity_order_deal.xml | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/app/src/main/res/layout/activity_order_deal.xml b/app/src/main/res/layout/activity_order_deal.xml
index 1465137..2163ab0 100644
--- a/app/src/main/res/layout/activity_order_deal.xml
+++ b/app/src/main/res/layout/activity_order_deal.xml
@@ -10,7 +10,7 @@
<variable
name="data"
- type="com.dayu.pipirrapp.bean.net.OrderListResult.Data" />
+ type="com.dayu.pipirrapp.bean.net.OrderDetailResult" />
</data>
<RelativeLayout
@@ -33,36 +33,68 @@
android:orientation="vertical"
android:padding="20dp">
- <TextView
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="鍙嶉鍐呭锛�"
- android:textColor="@color/black"
- android:textSize="@dimen/order_detail_button_size" />
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="* "
+ android:textColor="@color/base_red"
+ android:textSize="@dimen/order_detail_button_size" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍙嶉鍐呭锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/order_detail_button_size" />
+ </LinearLayout>
<EditText
+ android:id="@+id/contentET"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/edittext_backgroud"
- android:minHeight="100dp" />
+ android:gravity="start"
+ android:maxHeight="200dp"
+ android:minHeight="100dp"
+ android:text="" />
- <TextView
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="鎻愪氦鍥剧墖锛�"
android:layout_marginTop="10dp"
- android:textColor="@color/black"
- android:textSize="@dimen/order_detail_button_size" />
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="* "
+ android:textColor="@color/base_red"
+ android:textSize="@dimen/order_detail_button_size" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+
+ android:text="鎻愪氦鍥剧墖锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/order_detail_button_size" />
+ </LinearLayout>
+
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="5dp"
- android:background="@color/white"
android:layout_marginTop="10dp"
- android:overScrollMode="never" />
+ android:background="@color/white"
+ android:overScrollMode="never"
+ android:padding="5dp" />
</LinearLayout>
--
Gitblit v1.8.0