app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/ProblemChangeDetailActivity.java
@@ -184,7 +184,12 @@
            if (data!=null){
                int position = data.getIntExtra("position",-1);
                if (position>-1){
                    mediafileDao.deleteByKey(mediafileListChange.get(position).getGuid());
                    this.mediafileListChange.remove(position);
                    //fixme 2020/11/12 由于删除单张图片是直接联网将服务器数据一并删除,因此当图片全部删除后,立即更新问题为未整改状态
                    if (mediafileListChange.isEmpty()) {
                        uploadProblem();
                    }
                    this.isEdited = !mediafileListChange.isEmpty();
                    initChangingPhoto(this.mediafileListChange, this.imageViewChangeList);
                    if (this.problemlistVo.getIschanged()) {
@@ -511,6 +516,13 @@
    //<editor-fold desc="点击事件">
    private void refreshProblemStatus() {
        //整改图片全删除后,问题退回未整改审核通过状态
        if (mediafileListChange.isEmpty()) {
            this.problemlistVo.setIschanged(false);//设置为未整改
            this.problemlistVo.setExtension3(Domain.PROBLEM_CHECK_PASS);
            this.problemlistVo.setChangedtime(null);
            this.problemlistVo.setChangecatalog(null);
        } else {
        this.problemlistVo.setIschanged(true);//设置为已整改
        this.problemlistVo.setExtension3(Domain.CHANGE_UNCHECKED);//设置为整改待审核
        this.problemlistVo.setChangedtime(new Date());//设置整改时间为当前时间
@@ -538,6 +550,7 @@
            this.problemlistVo.setChangecatalog(Domain.UNPROMISE_CHANGE);
        }
    }
    }
    //提交问题
    Dialog loadingDialog;
@@ -548,28 +561,7 @@
//        }
        if (this.isEdited){
             loadingDialog = DialogUtil.createLoadingDialog(this, "");
            refreshProblemStatus();
            Call<ResponseBody> updateProblemList = application.getRetrofit().create(ProblemListService.class).updateProblemList(this.problemlistVo);
            updateProblemList.enqueue(new Callback<ResponseBody>() {
                @Override
                public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
                    if (response.body()!=null){
                        Toast.makeText(application, R.string.submit_success, Toast.LENGTH_LONG).show();
                        //上传问题成功后,开始上传对应的整改图片
                        upLoadPic();
                    }else if (response.errorBody()!=null){
                        Toast.makeText(application, R.string.submit_unsuccess, Toast.LENGTH_LONG).show();
                        loadingDialog.dismiss();
                    }
                }
                @Override
                public void onFailure(Call<ResponseBody> call, Throwable t) {
                    Toast.makeText(application, R.string.network_error, Toast.LENGTH_LONG).show();
                    loadingDialog.dismiss();
                }
            });
        }else {
            Toast.makeText(application, R.string.take_one_change_photo_at_least, Toast.LENGTH_SHORT).show();
        }
@@ -603,21 +595,15 @@
        }
    }
    private void upLoadPic() {
        //筛选“未上传”的图片
        List<Mediafile> mediafiles = new ArrayList<>();
        for (Mediafile m : this.mediafileListChange) {
            if (m.getRemark().equals("未上传")) {
                mediafiles.add(m);
            }
        }
        PhotoUtil photoUtil = new PhotoUtil(mediafiles.size(), application, new OnUpLoadListener() {
    private void uploadProblem() {
        refreshProblemStatus();
        Call<ResponseBody> updateProblemList = application.getRetrofit().create(ProblemListService.class).updateProblemList(this.problemlistVo);
        updateProblemList.enqueue(new Callback<ResponseBody>() {
            @Override
            public void onSuccess() {
                Toast.makeText(application, "上传成功", Toast.LENGTH_SHORT).show();
            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
                if (response.body()!=null){
                    Toast.makeText(application, R.string.submit_success, Toast.LENGTH_LONG).show();
                if (loadingDialog != null && loadingDialog.isShowing()) {
                    loadingDialog.dismiss();
                }
@@ -633,21 +619,51 @@
                sendBroadcast(intent1);
                finish();
                }else if (response.errorBody()!=null){
                    Toast.makeText(application, R.string.submit_unsuccess, Toast.LENGTH_LONG).show();
                    loadingDialog.dismiss();
                }
            }
            @Override
            public void onFailure(Call<ResponseBody> call, Throwable t) {
                Toast.makeText(application, R.string.network_error, Toast.LENGTH_LONG).show();
                loadingDialog.dismiss();
            }
        });
    }
    private void upLoadPic() {
        //筛选“未上传”的图片
        List<Mediafile> mediafiles = new ArrayList<>();
        for (Mediafile m : this.mediafileListChange) {
            if (m.getRemark().equals("未上传")) {
                mediafiles.add(m);
            }
        }
        PhotoUtil photoUtil = new PhotoUtil(mediafiles.size(), application, new OnUpLoadListener() {
            @Override
            public void onSuccess() {
                uploadProblem();
            }
            @Override
            public void onFail() {
                Toast.makeText(application, "上传失败", Toast.LENGTH_SHORT).show();
                Toast.makeText(application, "上传失败,请重试", Toast.LENGTH_SHORT).show();
                loadingDialog.dismiss();
                AlertDialog.Builder dialog = new AlertDialog.Builder(application);
                dialog.setMessage("图片上传失败,请手动上传或联系我司!");
                dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
                    @Override
                    public void onClick(DialogInterface dialogInterface, int i) {
                        finish();
                    }
                });
                dialog.show();
//                AlertDialog.Builder dialog = new AlertDialog.Builder(application);
//                dialog.setMessage("图片上传失败,请重试");
//                dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
//                    @Override
//                    public void onClick(DialogInterface dialogInterface, int i) {
//                        finish();
//                    }
//                });
//                dialog.show();
            }
        });