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/OrderDealActivity.java | 123 +++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 64 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
index aa18d33..0d707c0 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/OrderDealActivity.java
@@ -23,12 +23,14 @@
import com.dayu.pipirrapp.bean.net.AddProcessingRequest;
import com.dayu.pipirrapp.bean.net.InsectionResult;
import com.dayu.pipirrapp.bean.net.UplodFileState;
+import com.dayu.pipirrapp.dao.DaoSingleton;
import com.dayu.pipirrapp.databinding.ActivityOrderDealBinding;
import com.dayu.pipirrapp.fragment.OrderFragment;
import com.dayu.pipirrapp.net.ApiManager;
import com.dayu.pipirrapp.net.BaseResponse;
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
import com.dayu.pipirrapp.net.upload.UploadFileListener;
+import com.dayu.pipirrapp.tool.FileUploadUtils;
import com.dayu.pipirrapp.tool.FullyGridLayoutManager;
import com.dayu.pipirrapp.tool.GlideEngine;
import com.dayu.pipirrapp.tool.ImageFileCompressEngine;
@@ -38,6 +40,8 @@
import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.view.TitleBar;
import com.jeremyliao.liveeventbus.LiveEventBus;
+import com.loper7.date_time_picker.DateTimeConfig;
+import com.loper7.date_time_picker.dialog.CardDatePickerDialog;
import com.luck.picture.lib.basic.PictureSelectionModel;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureMimeType;
@@ -79,8 +83,8 @@
private final List<LocalMedia> mData = new ArrayList<>();
private ActivityResultLauncher<Intent> launcherResult;
private ImageEngine imageEngine;
-// List<UplodFileState> uplodFileStates = new ArrayList<>();
-Map<String, UplodFileState> uplodFileStates = new HashMap<>();
+ // List<UplodFileState> uplodFileStates = new ArrayList<>();
+ Map<String, UplodFileState> uplodFileStates = new HashMap<>();
String workOrderId;
LatLonBean latLonBean;
@@ -109,6 +113,27 @@
void initView() {
new TitleBar(this).setTitleText("澶勭悊宸ュ崟").setLeftIco().setLeftIcoListening(v -> OrderDealActivity.this.finish());
+ binding.timeLL.setOnClickListener(v -> {
+ long time = System.currentTimeMillis();
+ List<Integer> list = new ArrayList<>();
+ list.add(DateTimeConfig.YEAR);
+ list.add(DateTimeConfig.MONTH);
+ list.add(DateTimeConfig.DAY);
+ list.add(DateTimeConfig.HOUR);
+ list.add(DateTimeConfig.MIN);
+ new CardDatePickerDialog.Builder(this)
+ .setTitle("閫夋嫨澶勭悊鏃堕棿")
+ .setOnChoose("纭畾", aLong -> {
+ //aLong = millisecond
+
+ return null;
+ })
+ .showBackNow(true)
+ .setDefaultTime(time)
+ .setMaxTime(time)
+ .setDisplayType(list)
+ .build().show();
+ });
mRecyclerView = binding.recycler;
FullyGridLayoutManager manager = new FullyGridLayoutManager(this,
4, GridLayoutManager.VERTICAL, false);
@@ -143,6 +168,11 @@
@Override
public void onDeleteClick(int position) {
deleteItem(position);
+ }
+
+ @Override
+ public void onReUpload(UplodFileState uplodFileState) {
+ FileUploadUtils.uploadFile(OrderDealActivity.this, uplodFileState, uplodFileStates, mAdapter);
}
});
binding.dealButton.setOnClickListener(v -> {
@@ -228,13 +258,6 @@
* @param result
*/
private void analyticalSelectResults(ArrayList<LocalMedia> result) {
- //鑾峰彇褰撳墠uplodFileStates鎵�鏈夌殑鍥剧墖鍦板潃
- Set<String> existingPaths = new HashSet<>();
- for (UplodFileState uplodData : uplodFileStates.values()) {
- existingPaths.add(uplodData.getFilePath());
- }
- //鑾峰彇鍦≒ictureSelector鐨勭浉鍐屾椂鍙栨秷閫変腑鐨勫浘鐗�
- Set<String> resultPaths = new HashSet<>();
for (LocalMedia media : result) {
if (media.getWidth() == 0 || media.getHeight() == 0) {
if (PictureMimeType.isHasImage(media.getMimeType())) {
@@ -263,57 +286,16 @@
Log.i(TAG, "瑁佸壀瀹介珮: " + media.getCropImageWidth() + "x" + media.getCropImageHeight());
Log.i(TAG, "鏂囦欢澶у皬: " + PictureFileUtils.formatAccurateUnitFileSize(media.getSize()));
Log.i(TAG, "鏂囦欢鏃堕暱: " + media.getDuration());
- String compressPath = media.getCompressPath();
- //鍒ゆ柇鏄惁鏈夎繖涓矾寰勶紝娌℃湁鐨勮瘽涓婁紶璇ュ浘鐗�
- if (!existingPaths.contains(compressPath)) {
- UplodFileState uplodFileState = new UplodFileState();
- uplodFileState.setFilePath(compressPath);
- uplodFileStates.put(compressPath, uplodFileState);
- // 鎵ц涓婁紶鍥剧墖鐨勬搷浣�
- uplodeImg(uplodFileState);
- }
-
- resultPaths.add(media.getCompressPath());
+ Log.i(TAG, "鎵╁睍鍚�: " + media.getMimeType());
+ FileUploadUtils.creatAndUploadFile(this, media, uplodFileStates, mAdapter);
}
- //澶勭悊浠庣浉鍐岃繑鍥炴椂鍙栨秷鐨勫浘鐗囧鐞�
- existingPaths.removeAll(resultPaths);
- if (!existingPaths.isEmpty()) {
- List<UplodFileState> toRemove = new ArrayList<>();
- for (String path : existingPaths) {
- for (UplodFileState uplodFileState : uplodFileStates.values()) {
- if (path.equals(uplodFileState.getFilePath())) {
- uplodFileState.getThisCall().cancel();
- toRemove.add(uplodFileState);
- }
- }
- }
- for (UplodFileState removeFile : toRemove) {
- uplodFileStates.remove(removeFile.getFilePath());
- }
- }
- runOnUiThread(() -> {
- boolean isMaxSize = result.size() == mAdapter.getSelectMax();
- int oldSize = mAdapter.getData().size();
- mAdapter.notifyItemRangeRemoved(0, isMaxSize ? oldSize + 1 : oldSize);
- mAdapter.getData().clear();
-
- mAdapter.getData().addAll(result);
- mAdapter.notifyItemRangeInserted(0, result.size());
-
- });
+ // 鑾峰彇 result 涓病鏈夎�� uplodFileStates 涓湁鐨勫湴鍧�
+ FileUploadUtils.cancelRemovedUploads(result, uplodFileStates);
+ // 鏇存柊UI
+ FileUploadUtils.updateUI(result, mAdapter);
}
- //涓婁紶鍥剧墖
- private void uplodeImg(UplodFileState uplodFileState) {
- ApiManager.getInstance().uploadFile(this, uplodFileState, new UploadFileListener() {
- @Override
- public void onBack(UplodFileState state) {
- uplodFileStates.replace(state.getFilePath(), state);
- mAdapter.updateProgress(uplodFileState);
- }
- }, mAdapter);
- }
/**
* 涓婃姤澶勭悊缁撴灉
@@ -363,20 +345,33 @@
protected void onDestroy() {
super.onDestroy();
LiveEventBus.get(CommonKeyName.locationData).removeObserver(locationObserver);
+ FileUploadUtils.cancelAllCall(uplodFileStates);
}
/**
* 棰勮鍜屽浘鐗囧垪琛ㄥ垹闄ゅ浘鐗囨椂澶勭悊鍒犻櫎浜嬩欢
*/
private void deleteItem(int position) {
- try {
- Call<BaseResponse> mCall = uplodFileStates.get(position).getThisCall();
- if (mCall != null) {
- mCall.cancel();
- }
- } catch (Exception e) {
- e.printStackTrace();
+ LocalMedia localMedia = mAdapter.getData().get(position);
+ String path;
+ UplodFileState uplodFileState;
+ if (TextUtils.isEmpty(localMedia.getCompressPath())) {
+ uplodFileState = uplodFileStates.get(localMedia.getRealPath());
+ } else {
+ uplodFileState = uplodFileStates.get(localMedia.getCompressPath());
}
- uplodFileStates.remove(position);
+ if (uplodFileState != null) {
+ path = uplodFileState.getFilePath();
+ try {
+ Call mCall = uplodFileStates.get(path).getThisCall();
+ if (mCall != null) {
+ mCall.cancel();
+ MyLog.d("progressRequestBody>>>" + "cancel銆嬨�嬨�媝ath:" + path);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ uplodFileStates.remove(path);
+ }
}
}
--
Gitblit v1.8.0