From b6f46408cb3dc8b01051953e5c68de6c9195db60 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 23 一月 2025 10:15:46 +0800
Subject: [PATCH] 1.修复分水房点击屏幕不变蓝bug。 2.处理工单添加处理时间弹窗。
---
app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
index 091139a..df93212 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java
@@ -19,15 +19,18 @@
import com.dayu.pipirrapp.MyApplication;
import com.dayu.pipirrapp.R;
import com.dayu.pipirrapp.adapter.ImageAdapter;
+import com.dayu.pipirrapp.bean.ImageBean;
import com.dayu.pipirrapp.bean.net.DealDetailResult;
import com.dayu.pipirrapp.bean.net.ImageResult;
import com.dayu.pipirrapp.bean.net.OrderDetailResult;
+import com.dayu.pipirrapp.bean.net.UplodFileState;
import com.dayu.pipirrapp.databinding.ActivityOrderDetailBinding;
import com.dayu.pipirrapp.fragment.OrderFragment;
import com.dayu.pipirrapp.net.ApiManager;
import com.dayu.pipirrapp.net.BaseResponse;
import com.dayu.pipirrapp.net.Constants;
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
+import com.dayu.pipirrapp.tool.BigimageUtils;
import com.dayu.pipirrapp.tool.FullyGridLayoutManager;
import com.dayu.pipirrapp.utils.CommonKeyName;
import com.dayu.pipirrapp.utils.ToastUtil;
@@ -43,6 +46,8 @@
import java.util.Map;
import cc.shinichi.library.ImagePreview;
+import cc.shinichi.library.bean.ImageInfo;
+import cc.shinichi.library.bean.Type;
/**
* OrderDetailActivity -
@@ -57,9 +62,9 @@
String workOrderId;
String proResultId;
ImageAdapter mAdapter;
- List<ImageResult> images = new ArrayList<>();
+ List<ImageBean> images = new ArrayList<>();
RecyclerView mRecyclerView;
- final List<String> imageInfoList = new ArrayList<>();
+ List<ImageInfo> imageInfoList = new ArrayList<>();
int ProResultStateId;
private ActivityResultLauncher<Intent> activityResultLauncher =
registerForActivityResult(
@@ -120,7 +125,7 @@
// 娣诲姞闂磋窛瑁呴グ锛岀‘淇濆浘鐗囨湁鍚堥�傜殑闂撮殧
mRecyclerView.addItemDecoration(new GridSpacingItemDecoration(4, DensityUtil.dip2px(this, 8), false));
mAdapter = new ImageAdapter(this, images, (v, position) -> {
- ImagePreview.getInstance().setContext(OrderDetailActivity.this).setImageList(imageInfoList).start();
+ BigimageUtils.showImages(this, position, imageInfoList);
});
mRecyclerView.setAdapter(mAdapter);
@@ -218,9 +223,40 @@
if (t.getContent() != null) {
binding.orderDealLL.setVisibility(View.VISIBLE);
binding.setDealData(t.getContent());
- images.addAll(t.getContent().getImages());
- for (ImageResult imageResult : images) {
- imageInfoList.add(imageResult.getWebPath());
+
+ if (!t.getContent().getImages().isEmpty()){
+ for (ImageResult imageResult:t.getContent().getImages()){
+ ImageBean imageBean = new ImageBean();
+ imageBean.setId(imageResult.getId());
+ imageBean.setWebPath(imageResult.getWebPathZip());
+ imageBean.setType(UplodFileState.IMG_TYPE);
+ images.add(imageBean);
+ ImageInfo info = new ImageInfo();
+ info.setOriginUrl(imageResult.getWebPath());
+ info.setType(Type.IMAGE);
+ if (imageResult.getWebPathZip()!=null){
+ info.setThumbnailUrl(imageResult.getWebPathZip());
+ }
+
+ imageInfoList.add(info);
+ }
+ }
+ if (!t.getContent().getVideos().isEmpty()){
+ for (ImageResult imageResult:t.getContent().getVideos()){
+ ImageBean imageBean = new ImageBean();
+ imageBean.setId(imageResult.getId());
+ imageBean.setWebPath(imageResult.getWebPathZip());
+ imageBean.setType(UplodFileState.VIDEO_TYPE);
+ images.add(imageBean);
+ ImageInfo info = new ImageInfo();
+ info.setOriginUrl(imageResult.getWebPath());
+ info.setThumbnailUrl(imageResult.getWebPath());
+ if (imageResult.getWebPathZip()!=null){
+ info.setThumbnailUrl(imageResult.getWebPathZip());
+ }
+ info.setType(Type.VIDEO);
+ imageInfoList.add(info);
+ }
}
mAdapter.notifyDataSetChanged();
} else {
--
Gitblit v1.8.0