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/util/photo/PhotoUtil.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java b/app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java
index fab953b..6251ddb 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/util/photo/PhotoUtil.java
@@ -1,7 +1,6 @@
package cn.flightfeather.thirdapp.util.photo;
import android.app.Activity;
-import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -27,7 +26,7 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.httpservice.UploadService;
import cn.flightfeather.thirdapp.module.common.CameraActivity;
import cn.flightfeather.thirdapp.task.CompressPhotoTask;
@@ -65,21 +64,21 @@
* 缁戝畾ImageView鍜屽浘鐗囷紝鏈湴鍔犺浇鎴栬仈缃戝姞杞芥樉绀�(閽堝鍥哄畾鏁伴噺鐨処mageView)
* @param mediaFiles
* @param imageViews
- * @param context
+ * @param activity
* @return 瀹為檯鍔犺浇鐨勫浘鐗囦釜鏁�
*/
- public static int loadImage(List<Mediafile> mediaFiles, List<ImageView> imageViews, Context context){
+ public static int loadImage(List<Mediafile> mediaFiles, List<ImageView> imageViews, Activity activity){
if (mediaFiles!=null){
- int count = mediaFiles.size() >= imageViews.size() ? imageViews.size() : mediaFiles.size();
+ int count = Math.min(mediaFiles.size(), imageViews.size());
for (int i = 0; i < count; i++) {
Mediafile mediaFileTmp = mediaFiles.get(i);
File file = FileUtil.getFileFromMediaFile(mediaFileTmp);
if (file.exists()) {
- SetImageTask task1 = new SetImageTask(file, imageViews.get(i), (Activity) context);
+ SetImageTask task1 = new SetImageTask(file, imageViews.get(i), (Activity) activity);
task1.execute();
} else {
- DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediaFileTmp, imageViews.get(i), context);
+ DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediaFileTmp, imageViews.get(i), activity);
task.execute();
}
}
--
Gitblit v1.9.3