From 5387cbaca4fea6bbf055e7b284821699546eb7e9 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期三, 22 一月 2025 14:56:53 +0800 Subject: [PATCH] 1.视频播放兼容高低版本手机 2.优化工单icon 3.修复修改经纬度因js中添加了减少调用频率的代码导致的修改经纬度bug 4.修复了切换界面webView白屏的bug --- app/src/main/java/com/dayu/pipirrapp/activity/IssueDetailActivity.java | 43 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 36 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/IssueDetailActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/IssueDetailActivity.java index ce34a36..c5c10fb 100644 --- a/app/src/main/java/com/dayu/pipirrapp/activity/IssueDetailActivity.java +++ b/app/src/main/java/com/dayu/pipirrapp/activity/IssueDetailActivity.java @@ -13,14 +13,17 @@ 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.ImageResult; import com.dayu.pipirrapp.bean.net.IssueResult; +import com.dayu.pipirrapp.bean.net.UplodFileState; import com.dayu.pipirrapp.databinding.ActivityIssueDetailBinding; 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.ToastUtil; import com.dayu.pipirrapp.view.ConfirmDialog; @@ -34,6 +37,8 @@ import java.util.Map; import cc.shinichi.library.ImagePreview; +import cc.shinichi.library.bean.ImageInfo; +import cc.shinichi.library.bean.Type; /** * IssueDetailActivity - 闂涓婃姤璇︽儏鐣岄潰 @@ -47,8 +52,8 @@ RecyclerView mRecyclerView; ActivityIssueDetailBinding binding; ImageAdapter mAdapter; - List<String> imageInfoList = new ArrayList<>(); - List<ImageResult> images = new ArrayList<>(); + List<ImageInfo> imageInfoList = new ArrayList<>(); + List<ImageBean> images = new ArrayList<>(); int state; String issueReportId; @@ -75,8 +80,7 @@ // 娣诲姞闂磋窛瑁呴グ锛岀‘淇濆浘鐗囨湁鍚堥�傜殑闂撮殧 mRecyclerView.addItemDecoration(new GridSpacingItemDecoration(4, DensityUtil.dip2px(this, 8), false)); mAdapter = new ImageAdapter(this, images, (v, position) -> { - ImagePreview.getInstance().setContext(IssueDetailActivity.this).setImageList(imageInfoList).start(); - + BigimageUtils.showImages(this, position, imageInfoList); }); mRecyclerView.setAdapter(mAdapter); } @@ -94,9 +98,34 @@ binding.setData(orderDetailResult); binding.setItemclidk(IssueDetailActivity.this); state = orderDetailResult.getStateId(); - 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); + 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()); + info.setThumbnailUrl(imageResult.getWebPathZip()); + info.setType(Type.VIDEO); + imageInfoList.add(info); + } } mAdapter.notifyDataSetChanged(); switch (state) { -- Gitblit v1.8.0