1.修复分水房点击屏幕不变蓝bug。 2.处理工单添加处理时间弹窗。

zuoxiao

2025-01-23 b6f46408cb3dc8b01051953e5c68de6c9195db60

 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());
        }
        //获取在PictureSelector的相册时取消选中的图片
        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》》》path:" + path);
                }
            } catch (Exception e) {
                e.printStackTrace();
            }
            uplodFileStates.remove(path);
        }
    }
}