From 17eb1d06e104bc1cd93498fe3a3eaecf14c9d734 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 12 十一月 2020 13:57:35 +0800
Subject: [PATCH] 1. 修复现场整改时，问题状态是‘问题审核通过’而不是“整改未审核”的问题； 2. 修改任意拍照界面的多图片展示方式为Glide，减少内存溢出的可能性； 3. 新增图片类型枚举类，罗列原有的图片类型，并新增“铭牌”和“监测设备”； 4. 修复导航功能可能导致空指针的问题； 5. 任意拍界面新增按分类拍摄功能； 6. 修复现场整改界面打开崩溃问题；
---
app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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..a4d5a50 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/adapter/PhotoListAdapter.java
@@ -42,23 +42,30 @@
@Override
public void onBindViewHolder(PhotoListHolder holder, int position) {
Mediafile mediafile = mediafileList.get(position);
+
+ if (mediafile.getGuid() == null) {
+ Glide.with(context)
+ .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(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");
+ }
}
}
--
Gitblit v1.9.3