From 979d9cff22806f213b420452ab4a68fcbaf021b6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 31 五月 2021 17:43:49 +0800
Subject: [PATCH] 1. 修复多项可能引起空指针崩溃的bug； 2. 新建子任务时默认执行人员从全体人员改为当前用户； 3. 新建子任务时默认执行时间强制固定为总任务对应的时段内，确保子任务执行时间不会超出总任务范围。
---
app/src/main/java/cn/flightfeather/thirdapp/activity/UploadMediaFilesActivity.java | 12 +++++++-----
1 files changed, 7 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..b6a2899 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;
@@ -112,6 +112,7 @@
mediaFileListCurrent.removeAll(mediaFileListCurrent);
mediaFileListCurrent.addAll(mediaFileList2);
photoTotal = mediaFileListCurrent.size();
+ photoUploaded = 0;
adapter.notifyDataSetChanged();
}
}
@@ -122,10 +123,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