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/PhotoListAdapter.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java b/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java
index 9676ee4..9e6a2c8 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java
@@ -1,6 +1,6 @@
package cn.flightfeather.thirdapp.adapter;
-import android.content.Context;
+import android.app.Activity;
import android.os.Environment;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
@@ -15,7 +15,7 @@
import java.util.List;
import cn.flightfeather.thirdapp.R;
-import cn.flightfeather.thirdapp.bean.Mediafile;
+import cn.flightfeather.thirdapp.bean.entity.Mediafile;
import cn.flightfeather.thirdapp.task.DownloadAndSetImageTask;
/**
@@ -24,13 +24,13 @@
public class PhotoListAdapter extends RecyclerView.Adapter<PhotoListAdapter.PhotoListHolder> {
private List<Mediafile> mediafileList;
- private Context context;
+ private Activity activity;
private LayoutInflater layoutInflater;
- public PhotoListAdapter(List<Mediafile> mediafileList, Context context) {
+ public PhotoListAdapter(List<Mediafile> mediafileList, Activity activity) {
this.mediafileList = mediafileList;
- this.context = context;
- layoutInflater = LayoutInflater.from(context);
+ this.activity = activity;
+ layoutInflater = LayoutInflater.from(activity);
}
@Override
@@ -42,23 +42,30 @@
@Override
public void onBindViewHolder(PhotoListHolder holder, int position) {
Mediafile mediafile = mediafileList.get(position);
+
+ if (mediafile.getGuid() == null) {
+ Glide.with(activity)
+ .load(R.drawable.icon_add_photo)
+ .into(holder.iv_photo);
+ } else {
// String url = CommonApplication.getInstance().ROOT_URL_RELEASE_IMAGE + mediafile.getExtension1() + mediafile.getGuid() + ".jpg";
// Glide.with(context).asDrawable().load(url).override(100,100).skipMemoryCache(true).diskCacheStrategy(DiskCacheStrategy.ALL).into(holder.iv_photo);
- File file = new File(Environment.getExternalStorageDirectory(),mediafile.getPath()+mediafile.getDescription());
- if (file.exists()){
+ File file = new File(Environment.getExternalStorageDirectory(), mediafile.getPath() + mediafile.getDescription());
+ if (file.exists()) {
// SetImageTask task = new SetImageTask(file,holder.iv_photo);
// task.execute();
// String url = CommonApplication.getInstance().ROOT_URL_RELEASE_IMAGE + mediafile.getExtension1() + mediafile.getGuid() + ".jpg";
- Glide.with(context)
- .load(file)
- .placeholder(R.drawable.icon_add_photo_waite)
- .override(100,100)
- .into(holder.iv_photo);
- }else {
- DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediafile,holder.iv_photo,context);
- task.execute();
- Log.e("photolist",position+" no image found");
+ Glide.with(activity)
+ .load(file)
+ .placeholder(R.drawable.icon_add_photo_waite)
+ .override(100, 100)
+ .into(holder.iv_photo);
+ } else {
+ DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediafile, holder.iv_photo, activity);
+ task.execute();
+ Log.e("photolist", position + " no image found");
+ }
}
}
--
Gitblit v1.9.3