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/GitDetailActivity.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java
index 89c6d9f..104b73a 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/GitDetailActivity.java
@@ -31,8 +31,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.GitlistVo;
 import cn.flightfeather.thirdapp.task.DownloadAndSetImageTask;
 import cn.flightfeather.thirdapp.task.SetImageTask;
@@ -117,7 +117,7 @@
                 Mediafile mediaFile = mediafileList.get(i);
                 File file =getFileFromMediaFile(mediaFile);
                 if (file.exists()){
-                    SetImageTask task1 = new SetImageTask(file, ivPhotoList.get(i));
+                    SetImageTask task1 = new SetImageTask(file, ivPhotoList.get(i), this);
                     task1.execute();
                 }else {
                     DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediaFile,ivPhotoList.get(i),this);
@@ -150,7 +150,7 @@
         }
         for (int i = 0;i<mediaFileList.size();i++){
             if (resetImage){
-                SetImageTask task1 = new SetImageTask(getFileFromMediaFile(mediaFileList.get(i)), ivPhotoList.get(i));
+                SetImageTask task1 = new SetImageTask(getFileFromMediaFile(mediaFileList.get(i)), ivPhotoList.get(i), this);
                 task1.execute();
             }
             ivPhotoList.get(i).setOnClickListener(showPhotoClicker(getFilesFromMediaFile(mediaFileList),i,mediaFileList));

--
Gitblit v1.9.3