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/ProblemDetailActivity.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java
index cc22e7c..9d963fc 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/ProblemDetailActivity.java
@@ -51,8 +51,8 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Mediafile;
-import cn.flightfeather.thirdapp.bean.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.model.event.ProblemEvent;
import cn.flightfeather.thirdapp.module.base.BaseTakePicActivity;
@@ -598,7 +598,7 @@
//宸叉暣鏀圭殑鍥剧墖
File file = getFileFromMediaFile(mediaFile);
if (file.exists()){
- SetImageTask task1 = new SetImageTask(file, imageViewChangeList.get(changeMediaFileList.size()));
+ SetImageTask task1 = new SetImageTask(file, imageViewChangeList.get(changeMediaFileList.size()), this);
task1.execute();
}else {
DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediaFile,imageViewChangeList.get(changeMediaFileList.size()),this);
@@ -610,7 +610,7 @@
File file = getFileFromMediaFile(mediaFile);
if (file.exists()){
//鏂囦欢鏈湴瀛樺湪鐩存帴璇诲彇鏄剧ず
- SetImageTask task1 = new SetImageTask(file, imageViewProblemList.get(problemMediaFileList.size()));
+ SetImageTask task1 = new SetImageTask(file, imageViewProblemList.get(problemMediaFileList.size()), this);
task1.execute();
}else {
DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediaFile, imageViewProblemList.get(problemMediaFileList.size()),this);
@@ -655,14 +655,14 @@
private void refreshPhotoAndClicker(boolean resetImage) {
for (int i = 0; i < problemMediaFileList.size(); i++) {
if (resetImage){
- SetImageTask task1 = new SetImageTask(getFileFromMediaFile(problemMediaFileList.get(i)), imageViewProblemList.get(i));
+ SetImageTask task1 = new SetImageTask(getFileFromMediaFile(problemMediaFileList.get(i)), imageViewProblemList.get(i), this);
task1.execute();
}
imageViewProblemList.get(i).setOnClickListener(showPhotoClicker(getFilesFromMediaFiles(problemMediaFileList),i,problemMediaFileList,VIEW_PROBLEM_PHOTO));
}
for (int i = 0; i < changeMediaFileList.size(); i++) {
if (resetImage){
- SetImageTask task1 = new SetImageTask(getFileFromMediaFile(changeMediaFileList.get(i)), imageViewChangeList.get(i));
+ SetImageTask task1 = new SetImageTask(getFileFromMediaFile(changeMediaFileList.get(i)), imageViewChangeList.get(i), this);
task1.execute();
}
imageViewChangeList.get(i).setOnClickListener(showPhotoClicker(getFilesFromMediaFiles(changeMediaFileList),i,changeMediaFileList,VIEW_CHANGE_PHOTO));
@@ -941,7 +941,7 @@
sw_change.setVisibility(View.GONE);
tv_problemChange.setText("宸叉暣鏀�");
problemlistVoCurrent.setIschanged(true);
- problemlistVoCurrent.setExtension3(Domain.PROBLEM_CHECK_PASS);
+ problemlistVoCurrent.setExtension3(Domain.CHANGE_UNCHECKED);
problemlistVoCurrent.setRemark(application.getCurrentUser().getAcountname());
} else if (type == InspectionDetailActivity.PROBLEM_RECHECK) {
sw_recheck.setVisibility(View.GONE);
--
Gitblit v1.9.3