From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
app/src/main/java/com/dayu/pipirrapp/activity/OrderDetailActivity.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 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..ff99220 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;
@@ -42,7 +45,8 @@
import java.util.List;
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();
+ BigimageUtils.showImages(this, position, imageInfoList);
});
mRecyclerView.setAdapter(mAdapter);
@@ -148,13 +152,13 @@
case 0://鏈笂鎶�
binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.black, null));
binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_no_bg, null));
- binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color, null));
+ binding.dealButton.setBackground(getResources().getDrawable(R.drawable.bottom_butten_blue_ripple, null));
binding.dealButton.setVisibility(View.VISIBLE);
break;
case 1://宸蹭笂鎶�
binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_wait_bg, null));
- binding.dealButton.setBackgroundColor(getResources().getColor(R.color.delete_color, null));
+ binding.dealButton.setBackground(getResources().getDrawable(R.drawable.bottom_butten_red_ripple, null));
binding.dealButton.setVisibility(View.VISIBLE);
binding.dealButton.setText("鍒犻櫎澶勭悊缁撴灉");
break;
@@ -166,7 +170,7 @@
case 3://琚┏鍥�
binding.stateText.setTextColor(OrderDetailActivity.this.getResources().getColor(R.color.white, null));
binding.stateText.setBackground(ResourcesCompat.getDrawable(OrderDetailActivity.this.getResources(), R.drawable.order_state_reject_bg, null));
- binding.dealButton.setBackgroundColor(getResources().getColor(R.color.title_color));
+ binding.dealButton.setBackground(getResources().getDrawable(R.drawable.bottom_butten_blue_ripple, null));
binding.dealButton.setVisibility(View.VISIBLE);
break;
@@ -218,9 +222,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