android/pipIrrApp.git

			@@ -19,9 +19,11 @@
			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;
			@@ -43,6 +45,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 +61,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 +124,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();
			ImagePreview.getInstance().with(OrderDetailActivity.this).setIndex(position).setMediaInfoList(imageInfoList).start();

			});
			mRecyclerView.setAdapter(mAdapter);
			@@ -218,9 +222,32 @@
			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.getWebPath());
			imageBean.setType(UplodFileState.IMG_TYPE);
			images.add(imageBean);
			ImageInfo info=new ImageInfo();
			info.setOriginUrl(imageResult.getWebPath());
			info.setType(Type.IMAGE);
			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.getWebPath());
			imageBean.setType(UplodFileState.VIDEO_TYPE);
			images.add(imageBean);
			ImageInfo info=new ImageInfo();
			info.setOriginUrl(imageResult.getWebPath());
			info.setType(Type.VIDEO);
			imageInfoList.add(info);
			}
			}
			mAdapter.notifyDataSetChanged();
			} else {