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/adapter/ProblemPromiseListAdapter.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java
index 22ffe0e..faab7d4 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/ProblemPromiseListAdapter.java
@@ -1,7 +1,7 @@
package cn.flightfeather.thirdapp.adapter;
+import android.app.Activity;
import android.app.DatePickerDialog;
-import android.content.Context;
import android.content.Intent;
import android.os.Environment;
import android.support.v7.widget.RecyclerView;
@@ -31,9 +31,9 @@
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity;
import cn.flightfeather.thirdapp.activity.PromiseActivity;
import cn.flightfeather.thirdapp.activity.SignActivity;
-import cn.flightfeather.thirdapp.bean.AllBoolean;
-import cn.flightfeather.thirdapp.bean.Inspection;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.vo.AllBoolean;
+import cn.flightfeather.thirdapp.bean.entity.Inspection;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.httpservice.InspectionService;
import cn.flightfeather.thirdapp.task.DownloadAndSetImageTask;
@@ -46,7 +46,7 @@
public class ProblemPromiseListAdapter extends RecyclerView.Adapter<ProblemPromiseListAdapter.ProblemPromiseListHolder>{
private List<ProblemlistVo> problemlistVoList;
- private Context context;
+ private Activity activity;
private LayoutInflater layoutInflater;
private ProblemlistVo problemlistVoCurrent;
private MediafileDao mediafileDao;
@@ -61,10 +61,10 @@
private AllBoolean allBoolean;
- public ProblemPromiseListAdapter(List<ProblemlistVo> problemlistVoList, Context context, CommonApplication application,PromiseActivity promiseActivity,List<Mediafile> signMediaFileList, AllBoolean allBoolean) {
+ public ProblemPromiseListAdapter(List<ProblemlistVo> problemlistVoList, Activity activity, CommonApplication application, PromiseActivity promiseActivity, List<Mediafile> signMediaFileList, AllBoolean allBoolean) {
this.problemlistVoList = problemlistVoList;
- this.context = context;
- layoutInflater = LayoutInflater.from(context);
+ this.activity = activity;
+ layoutInflater = LayoutInflater.from(activity);
mediafileDao = application.getDaoSession().getMediafileDao();
this.application =application;
this.promiseActivity = promiseActivity;
@@ -175,10 +175,10 @@
private void setImage(Mediafile mediafile,ImageView imageView){
File file = new File(Environment.getExternalStorageDirectory(), (mediafile.getPath() + mediafile.getDescription()));
if (file.exists()){
- SetImageTask task1 = new SetImageTask(file,imageView);
+ SetImageTask task1 = new SetImageTask(file, imageView, activity);
task1.execute();
}else {
- DownloadAndSetImageTask task2 = new DownloadAndSetImageTask(mediafile,imageView,context);
+ DownloadAndSetImageTask task2 = new DownloadAndSetImageTask(mediafile,imageView, activity);
task2.execute();
}
}
--
Gitblit v1.9.3