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_add_filter_image.xml | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/layout/item_add_filter_image.xml b/app/src/main/res/layout/item_add_filter_image.xml
index 929c680..e69b66b 100644
--- a/app/src/main/res/layout/item_add_filter_image.xml
+++ b/app/src/main/res/layout/item_add_filter_image.xml
@@ -11,18 +11,7 @@
android:layout_height="match_parent"
tools:src="@color/app_color_f6" />
- <ImageView
- android:id="@+id/iv_del"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignTop="@id/fiv"
- android:layout_alignRight="@id/fiv"
- android:paddingLeft="10dp"
- android:paddingBottom="10dp"
- android:scaleType="centerInside"
- android:src="@mipmap/ic_item_delete"
- android:visibility="gone"
- tools:visibility="visible" />
+
<TextView
android:id="@+id/tv_duration"
@@ -48,6 +37,7 @@
android:id="@+id/mask_layer_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:visibility="gone"
android:background="@color/mask_layer_bg">
<com.king.view.circleprogressview.CircleProgressView
@@ -56,6 +46,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
+ app:cpvLabelTextSize="15sp"
app:cpvShowTick="false"
app:cpvStrokeWidth="2dp" />
@@ -63,9 +54,20 @@
android:id="@+id/postError"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_margin="40dp"
+ android:padding="20dp"
android:src="@drawable/ic_error_picture" />
</RelativeLayout>
-
+ <ImageView
+ android:id="@+id/iv_del"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignTop="@id/fiv"
+ android:layout_alignRight="@id/fiv"
+ android:paddingLeft="10dp"
+ android:paddingBottom="10dp"
+ android:scaleType="centerInside"
+ android:src="@mipmap/ic_item_delete"
+ android:visibility="gone"
+ tools:visibility="visible" />
</com.luck.picture.lib.widget.SquareRelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0