From a5d862051462a5fcc2717b405896a6d424002e54 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 22 十二月 2020 15:43:06 +0800
Subject: [PATCH] 1. 调整了数控实体的存储位置； 2. 新增数据表“媒体文件类型别名表”； 3. 修改任意拍模块，将图片分类改为根据场景类型动态生成，同时新增修改分类别名功能； 4. 优化子任务选择界面的任务排序方式，按照“待开始”、“执行中”、“未执行”的顺序进行排序；
---
app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java
index 05e108a..9a3717e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java
@@ -25,7 +25,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.MediaFileListAdapter;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.task.CompressPhotoTask;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
@@ -122,10 +122,11 @@
pb_uploading.setMax(photoTotal);
pb_uploading.setProgress(photoUploaded);
tv_status.setText("鍘嬬缉涓�...");
- uploadingDialog2 = uploadingDialog.show();
-
-
-
+ if (uploadingDialog2 != null && !uploadingDialog2.isShowing()) {
+ uploadingDialog2.show();
+ } else {
+ uploadingDialog2 = uploadingDialog.show();
+ }
}
//寮�濮嬩笂浼�
public void startUplaod(List<File> outputFileList){
--
Gitblit v1.9.3