数据查看

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 21
         //noinspection OldTargetApi
         targetSdkVersion 29
-        versionCode 76
-        versionName "7.6"
+        versionCode 77
+        versionName "7.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'arm64-v8a'

app/src/main/java/com/tofly/yxpc/base/Api.java

@@ -18,18 +18,18 @@ import java.util.List;
 import java.util.Map;
 
 import io.reactivex.Observable;
-import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
+import retrofit2.http.DELETE;
 import retrofit2.http.FieldMap;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.GET;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
 import retrofit2.http.PUT;
-import retrofit2.http.Part;
 import retrofit2.http.PartMap;
 import retrofit2.http.Query;
+import retrofit2.http.QueryMap;
 
 /**
  * @author ychk
@@ -50,19 +50,19 @@ public interface Api {
 
     @Multipart
     @POST("yt/yxswWaterNotInspect")
-    Observable<BaseResponse> uploadWaterNotInspect(@Part List<MultipartBody.Part> file, @Part List<MultipartBody.Part> bpfilelist, @PartMap Map<String, RequestBody> yxswWaterNotInspect);
+    Observable<BaseResponse> uploadWaterNotInspect(@PartMap Map<String, RequestBody> map);
 
     @Multipart
-    @POST("yt/yxswWaterNotInspect")
-    Observable<BaseResponse> uploadWaterNotInspect(@Part List<MultipartBody.Part> file, @PartMap Map<String, RequestBody> yxswWaterNotInspect);
+    @PUT("yt/yxswWaterNotInspect")
+    Observable<BaseResponse> UpdateWaterNotInspect(@PartMap Map<String, RequestBody> map);
 
     @Multipart
     @POST("yt/yxswWaterTwNavigation")
-    Observable<BaseResponse> uploadWaterTwNavigation(@PartMap Map<String, RequestBody> yxswWaterTwNavigation, @Part List<MultipartBody.Part> mapfilelist, @Part List<MultipartBody.Part> file);
+    Observable<BaseResponse> uploadWaterTwNavigation(@PartMap Map<String, RequestBody> map);
 
     @Multipart
     @POST("yt/yxswWaterMeterInspect/updateBatchByCus")
-    Observable<BaseResponse> updateBatchByCus(@PartMap Map<String, RequestBody> yxswWaterMeterInspectUpload, @Part List<MultipartBody.Part> bpFileList, @Part List<MultipartBody.Part> exceptionFileList, @Part List<MultipartBody.Part> wfbdFileList);
+    Observable<BaseResponse> updateBatchByCus(@PartMap Map<String, RequestBody> map);
 
     @POST("yt/yxswWaterTwNavigation/list")
     Observable<BaseResponse<List<TwdhEntity>>> getWaterTwNavigation(@Body RequestBody body);
@@ -131,4 +131,10 @@ public interface Api {
      */
     @POST("yt/yxswWaterNotInspect/page")
     Observable<PageInfo<SbdjEntity>> getUnregisterSubmitList(@Body RequestBody body);
+
+    /**
+     * 删除非在册数据
+     */
+    @DELETE("yt/yxswWaterNotInspect/deleteByIds")
+    Observable<BaseResponse> deleteUnRegister(@QueryMap Map<String, Object> map);
 }

app/src/main/java/com/tofly/yxpc/ui/activity/ImageTextNavitActivity.java

@@ -7,7 +7,6 @@ import android.view.View;
 import androidx.annotation.Nullable;
 
 import com.tofly.latte_core.base.LatteContract;
-import com.tofly.latte_core.net.bean.BaseResponse;
 import com.tofly.latte_core.utils.NetworkUtil;
 import com.tofly.yxpc.databinding.ActivityImgTextNavitBinding;
 import com.tofly.yxpc.entity.FileBean;
@@ -178,7 +177,9 @@ public class ImageTextNavitActivity extends PhotoActivity {
                                 files.add(file);
                             }
                         }
-                        map.put("file", files);
+                        if (!files.isEmpty()) {
+                            map.put("file", files);
+                        }
                         List<File> dtFiles = new ArrayList<>();
                         for (FileBean fileBean : dtPhoneList) {
                             File file = new File(fileBean.getFilePath());
@@ -186,7 +187,9 @@ public class ImageTextNavitActivity extends PhotoActivity {
                                 dtFiles.add(file);
                             }
                         }
-                        map.put("mapfilelist", dtFiles);
+                        if (!dtFiles.isEmpty()) {
+                            map.put("mapfilelist", dtFiles);
+                        }
                         mPresenter.getResultTwo(this, map);
                     } else {
                         onMessage("网络异常，先保存本地");
@@ -294,8 +297,7 @@ public class ImageTextNavitActivity extends PhotoActivity {
 
     @Override
     public <T> void getResultTwo(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        if (response != null) {
             onMessage("提交成功");
             save(null);
         } else {

app/src/main/java/com/tofly/yxpc/ui/activity/UnRegisterActivity.java

@@ -18,7 +18,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 import com.tofly.latte_core.base.LatteContract;
-import com.tofly.latte_core.net.bean.BaseResponse;
 import com.tofly.latte_core.utils.AccountManager;
 import com.tofly.latte_core.utils.NetworkUtil;
 import com.tofly.yxpc.R;
@@ -357,7 +356,9 @@ public class UnRegisterActivity extends PhotoActivity {
 
         binding.tvDelete.setOnClickListener(v -> {
             DialogUtils.showDialog(this, "提示", "是否确定删除", false, (dialog, which) -> {
-
+                Map<String, Object> map = new HashMap<>();
+                map.put("ids", sbdjEntity.getId());
+                mPresenter.getResultFour(this, map);
             });
         });
         binding.tvSave.setOnClickListener(v -> {
@@ -644,7 +645,10 @@ public class UnRegisterActivity extends PhotoActivity {
                 files.add(file);
             }
         }
-        map.put("file", files);
+        if (!files.isEmpty()) {
+            map.put("file", files);
+        }
+        map.remove("fileList");
         List<File> files1 = new ArrayList<>();
         if (sbdjEntity.getBpFileList() != null) {
             for (FileBean fileBean : sbdjEntity.getBpFileList()) {
@@ -653,9 +657,15 @@ public class UnRegisterActivity extends PhotoActivity {
                     files1.add(file);
                 }
             }
-            map.put("bpFileList", files1);
+            if (!files1.isEmpty()) {
+                map.put("bpFileList", files1);
+            }
+        }
+        if (binding.tvDelete.getVisibility() == View.VISIBLE) {
+            mPresenter.getResultFive(this, map);
+        } else {
+            mPresenter.getResultOne(this, map);
         }
-        mPresenter.getResultOne(this, map);
     }
 
     private boolean check() {
@@ -811,8 +821,7 @@ public class UnRegisterActivity extends PhotoActivity {
 
     @Override
     public <T> void getResultOne(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        if (response != null) {
             DaoUtilsStore.getInstance().getSbdjEntityDbUtils().delete(sbdjEntity);
             BaseUpdataEntity baseUpdata = DaoUtilsStore.getInstance().getBaseUpdataEntityDbUtils().queryById(sbdjEntity.getId());
             DaoUtilsStore.getInstance().getBaseUpdataEntityDbUtils().delete(baseUpdata);

app/src/main/java/com/tofly/yxpc/ui/fragment/DataUpdateFragment.java

@@ -9,7 +9,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.tofly.latte_core.base.LatteContract;
 import com.tofly.latte_core.base.LatteDelegate;
-import com.tofly.latte_core.net.bean.BaseResponse;
 import com.tofly.latte_core.utils.AccountManager;
 import com.tofly.latte_core.utils.NetworkUtil;
 import com.tofly.yxpc.base.MyApp;
@@ -182,7 +181,10 @@ public class DataUpdateFragment extends LatteDelegate {
                 files.add(file);
             }
         }
-        map.put("file", files);
+        if (!files.isEmpty()) {
+            map.put("file", files);
+        }
+        map.remove("fileList");
         List<File> files1 = new ArrayList<>();
         if (sbdjEntities.get(page).getBpFileList() != null) {
             for (FileBean fileBean : sbdjEntities.get(page).getBpFileList()) {
@@ -191,7 +193,9 @@ public class DataUpdateFragment extends LatteDelegate {
                     files1.add(file);
                 }
             }
-            map.put("bpFileList", files1);
+            if (!files1.isEmpty()) {
+                map.put("bpFileList", files1);
+            }
         }
         mPresenter.getResultOne(requireContext(), map);
     }
@@ -208,7 +212,9 @@ public class DataUpdateFragment extends LatteDelegate {
                 files.add(file);
             }
         }
-        map.put("file", files);
+        if (!files.isEmpty()) {
+            map.put("file", files);
+        }
         files.clear();
         for (FileBean fileBean : twdhEntities.get(page).getMapFileList()) {
             File file = new File(fileBean.getFilePath());
@@ -216,7 +222,9 @@ public class DataUpdateFragment extends LatteDelegate {
                 files.add(file);
             }
         }
-        map.put("mapfilelist", files);
+        if (!files.isEmpty()) {
+            map.put("mapfilelist", files);
+        }
         mPresenter.getResultTwo(getContext(), map);
     }
 
@@ -231,7 +239,9 @@ public class DataUpdateFragment extends LatteDelegate {
                 }
             }
         }
-        map.put("bpFileList", files1);
+        if (!files1.isEmpty()) {
+            map.put("bpFileList", files1);
+        }
         List<File> files2 = new ArrayList<>();
         if (waterMeterEntities.get(page).getExceptionFileList() != null) {
             for (FileBean fileBean : waterMeterEntities.get(page).getExceptionFileList()) {
@@ -241,7 +251,9 @@ public class DataUpdateFragment extends LatteDelegate {
                 }
             }
         }
-        map.put("exceptionFileList", files2);
+        if (!files2.isEmpty()) {
+            map.put("exceptionFileList", files2);
+        }
 
         List<File> files3 = new ArrayList<>();
         if (waterMeterEntities.get(page).getWfbdFileList() != null) {
@@ -252,14 +264,15 @@ public class DataUpdateFragment extends LatteDelegate {
                 }
             }
         }
-        map.put("wfbdFileList", files3);
+        if (!files3.isEmpty()) {
+            map.put("wfbdFileList", files3);
+        }
         mPresenter.getResultThree(requireContext(), map);
     }
 
     @Override
     public <T> void getResultOne(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        if (response != null) {
             DaoUtilsStore.getInstance().getSbdjEntityDbUtils().delete(sbdjEntities.get(page));
             for (BaseUpdataEntity entity : list) {
                 if (entity.getId().equals(sbdjEntities.get(page).getId())) {
@@ -281,15 +294,12 @@ public class DataUpdateFragment extends LatteDelegate {
                     onMessage("数据上传完毕");
                 }
             }
-        } else {
-            onMessage(baseResponse.getMessage());
         }
     }
 
     @Override
     public <T> void getResultTwo(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        if (response != null) {
             twdhEntities.get(page).setState(null);
             String[] id = twdhEntities.get(page).getWaterNavigationInspects().split(",");
             for (String str : id) {
@@ -319,15 +329,12 @@ public class DataUpdateFragment extends LatteDelegate {
                     onMessage("数据上传完毕");
                 }
             }
-        } else {
-            onMessage(baseResponse.getMessage());
         }
     }
 
     @Override
     public <T> void getResultThree(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        if (response != null) {
             waterMeterEntities.get(page).setState(3);
             DaoUtilsStore.getInstance().getWaterMeterEntityDbUtils().insertOrReplace(waterMeterEntities.get(page));
             for (BaseUpdataEntity entity : list) {
@@ -357,8 +364,6 @@ public class DataUpdateFragment extends LatteDelegate {
                 initList();
                 onMessage("数据上传完毕");
             }
-        } else {
-            onMessage(baseResponse.getMessage());
         }
     }
 }

app/src/main/java/com/tofly/yxpc/ui/fragment/UnCalibrateFragment.java

@@ -14,7 +14,6 @@ import androidx.annotation.Nullable;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.tofly.latte_core.base.LatteContract;
-import com.tofly.latte_core.net.bean.BaseResponse;
 import com.tofly.latte_core.utils.AccountManager;
 import com.tofly.latte_core.utils.NetworkUtil;
 import com.tofly.yxpc.R;
@@ -426,8 +425,7 @@ public class UnCalibrateFragment extends PhotoFragment {
 
     @Override
     public <T> void getResultTwo(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        if (response != null) {
             TwdhEntity twdhEntity = DaoUtilsStore.getInstance().getTwdhEntityDbUtils().queryById(Long.parseLong(waterMeterEntity.getNavigationId()));
             if (twdhEntity != null) {
                 twdhEntity.setState(null);
@@ -455,8 +453,7 @@ public class UnCalibrateFragment extends PhotoFragment {
 
     @Override
     public <T> void getResultThree(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        if (response != null) {
             onMessage("数据上传完毕");
             waterMeterEntity.setState(3);
             DaoUtilsStore.getInstance().getWaterMeterEntityDbUtils().insertOrReplace(waterMeterEntity);

app/src/main/java/com/tofly/yxpc/ui/fragment/WaterCheckFragment.java

@@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.tofly.latte_core.base.LatteContract;
-import com.tofly.latte_core.net.bean.BaseResponse;
 import com.tofly.latte_core.utils.AccountManager;
 import com.tofly.latte_core.utils.NetworkUtil;
 import com.tofly.yxpc.R;
@@ -1001,8 +1000,8 @@ public class WaterCheckFragment extends PhotoFragment {
 
     @Override
     public <T> void getResultTwo(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        super.getResultTwo(response);
+        if (response != null) {
             TwdhEntity twdhEntity = DaoUtilsStore.getInstance().getTwdhEntityDbUtils().queryById(Long.parseLong(waterMeterEntity.getNavigationId()));
             if (twdhEntity != null) {
                 twdhEntity.setState(null);
@@ -1030,8 +1029,7 @@ public class WaterCheckFragment extends PhotoFragment {
 
     @Override
     public <T> void getResultThree(T response) {
-        BaseResponse baseResponse = (BaseResponse) response;
-        if (baseResponse != null && "200".equals(baseResponse.getCode())) {
+        if (response != null) {
             waterMeterEntity.setState(3);
             DaoUtilsStore.getInstance().getWaterMeterEntityDbUtils().insertOrReplace(waterMeterEntity);
             BaseUpdataEntity baseUpdata = DaoUtilsStore.getInstance().getBaseUpdataEntityDbUtils().queryById(waterMeterEntity.getId());

app/src/main/java/com/tofly/yxpc/ui/impl/UpLoadImpl.java

@@ -4,6 +4,7 @@ import android.content.Context;
 
 import com.alibaba.fastjson.JSONObject;
 import com.tofly.latte_core.base.LattePresenterImpl;
+import com.tofly.latte_core.config.Constants;
 import com.tofly.latte_core.net.LatteNetWorkApi;
 import com.tofly.latte_core.net.bean.BaseResponse;
 import com.tofly.latte_core.net.helper.RxHelper;
@@ -12,13 +13,10 @@ import com.tofly.yxpc.base.Api;
 import com.tofly.yxpc.utils.RequestBodyUtils;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.reactivex.Observable;
-import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 public class UpLoadImpl extends LattePresenterImpl {
@@ -26,55 +24,47 @@ public class UpLoadImpl extends LattePresenterImpl {
     @Override
     public void getResultOne(Context context, Map<String, Object> map) {
         super.getResultOne(context, map);
-        List<MultipartBody.Part> parts1 = new ArrayList<>();
+        Map<String, RequestBody> params = new HashMap<>();
         List<File> list1 = (List<File>) map.get("file");
         if (list1 != null && !list1.isEmpty()) {
-            for (int i = 0; i < list1.size(); i++) {
-                MultipartBody.Part part = RequestBodyUtils.toMultiPartBodyFile("file", list1.get(i), context);
-                parts1.add(part);
+            for (File file : list1) {
+                params.put("file\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
             }
             map.remove("file");
-            map.remove("fileList");
         }
-        List<MultipartBody.Part> parts2 = new ArrayList<>();
         List<File> list2 = (List<File>) map.get("bpFileList");
         if (list2 != null && !list2.isEmpty()) {
-            parts2 = new ArrayList<>();
-            for (int i = 0; i < list2.size(); i++) {
-                MultipartBody.Part part = RequestBodyUtils.toMultiPartBodyFile("bpfilelist", list2.get(i), context);
-                parts2.add(part);
+            for (File file : list2) {
+                params.put("bpFileList\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
             }
             map.remove("bpFileList");
         }
-        Map<String, RequestBody> params = new HashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             String key = entry.getKey();
             Object value = entry.getValue();
             params.put(key, RequestBodyUtils.toRequestBodyString(value == null ? "" : value.toString()));
         }
-        Api api = LatteNetWorkApi.getApiService(Api.class);
-        Observable<BaseResponse> observable;
-        if (list2 == null || list2.isEmpty()) {
-            observable = api.uploadWaterNotInspect(parts1, params);
-        } else {
-            observable = api.uploadWaterNotInspect(parts1, parts2, params);
-        }
-        observable.compose(RxHelper.observableIO2Main(context))
+        LatteNetWorkApi.getApiService(Api.class)
+                .uploadWaterNotInspect(params)
+                .compose(RxHelper.observableIO2Main(context))
                 .subscribe(new MyObserver<BaseResponse>(context) {
                     @Override
                     public void onSuccess(BaseResponse demo) {
                         if (isViewAttached()) {
-                            getView().getResultOne(demo);
+                            if (Constants.SUCCESS.equals(demo.getCode())) {
+                                getView().getResultOne(demo);
+                            } else {
+                                getView().onMessage(demo.getMessage());
+                                getView().getResultOne(null);
+                            }
                         }
                     }
 
                     @Override
                     public void onFailure(Throwable e, String errorMsg) {
                         if (isViewAttached()) {
-                            BaseResponse baseResponse = new BaseResponse();
-                            baseResponse.setCode(null);
-                            baseResponse.setMessage(errorMsg);
-                            getView().getResultThree(baseResponse);
+                            getView().onMessage(errorMsg);
+                            getView().getResultOne(null);
                         }
                     }
                 });
@@ -83,40 +73,39 @@ public class UpLoadImpl extends LattePresenterImpl {
     @Override
     public void getResultTwo(Context context, Map<String, Object> map) {
         super.getResultTwo(context, map);
-
-        List<MultipartBody.Part> parts1 = new ArrayList<>();
+        Map<String, RequestBody> params = new HashMap<>();
         List<File> list1 = (List<File>) map.get("mapfilelist");
         if (list1 != null && !list1.isEmpty()) {
-            for (int i = 0; i < list1.size(); i++) {
-                MultipartBody.Part part = RequestBodyUtils.toMultiPartBodyFile("mapfilelist", list1.get(i), context);
-                parts1.add(part);
+            for (File file : list1) {
+                params.put("mapfilelist\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
             }
             map.remove("mapfilelist");
         }
-
-        List<MultipartBody.Part> parts2 = new ArrayList<>();
         List<File> list2 = (List<File>) map.get("file");
         if (list2 != null && !list2.isEmpty()) {
-            for (int i = 0; i < list2.size(); i++) {
-                MultipartBody.Part part = RequestBodyUtils.toMultiPartBodyFile("file", list2.get(i), context);
-                parts2.add(part);
+            for (File file : list2) {
+                params.put("file\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
             }
             map.remove("file");
         }
-        Map<String, RequestBody> params = new HashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             String key = entry.getKey();
             Object value = entry.getValue();
             params.put(key, RequestBodyUtils.toRequestBodyString(value.toString()));
         }
         LatteNetWorkApi.getApiService(Api.class)
-                .uploadWaterTwNavigation(params, parts1, parts2)
+                .uploadWaterTwNavigation(params)
                 .compose(RxHelper.observableIO2Main(context))
                 .subscribe(new MyObserver<BaseResponse>(context) {
                     @Override
                     public void onSuccess(BaseResponse demo) {
                         if (isViewAttached()) {
-                            getView().getResultTwo(demo);
+                            if (Constants.SUCCESS.equals(demo.getCode())) {
+                                getView().getResultTwo(demo);
+                            } else {
+                                getView().onMessage(demo.getMessage());
+                                getView().getResultTwo(null);
+                            }
                         }
                     }
 
@@ -124,6 +113,7 @@ public class UpLoadImpl extends LattePresenterImpl {
                     public void onFailure(Throwable e, String errorMsg) {
                         if (isViewAttached()) {
                             getView().onMessage(errorMsg);
+                            getView().getResultTwo(null);
                         }
                     }
                 });
@@ -132,38 +122,30 @@ public class UpLoadImpl extends LattePresenterImpl {
     @Override
     public void getResultThree(Context context, Map<String, Object> map) {
         super.getResultThree(context, map);
-
-        List<MultipartBody.Part> parts1 = new ArrayList<>();
+        Map<String, RequestBody> params = new HashMap<>();
         List<File> list1 = (List<File>) map.get("bpFileList");
         if (list1 != null && !list1.isEmpty()) {
-            for (int i = 0; i < list1.size(); i++) {
-                MultipartBody.Part part = RequestBodyUtils.toMultiPartBodyFile("bpFileList", list1.get(i), context);
-                parts1.add(part);
+            for (File file : list1) {
+                params.put("bpFileList\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
             }
             map.remove("bpFileList");
         }
 
-        List<MultipartBody.Part> parts2 = new ArrayList<>();
         List<File> list2 = (List<File>) map.get("exceptionFileList");
         if (list2 != null && !list2.isEmpty()) {
-            for (int i = 0; i < list2.size(); i++) {
-                MultipartBody.Part part = RequestBodyUtils.toMultiPartBodyFile("exceptionFileList", list2.get(i), context);
-                parts2.add(part);
+            for (File file : list2) {
+                params.put("exceptionFileList\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
             }
             map.remove("exceptionFileList");
         }
-
-        List<MultipartBody.Part> parts3 = new ArrayList<>();
         List<File> list3 = (List<File>) map.get("wfbdFileList");
         if (list3 != null && !list3.isEmpty()) {
-            for (int i = 0; i < list3.size(); i++) {
-                MultipartBody.Part part = RequestBodyUtils.toMultiPartBodyFile("wfbdFileList", list3.get(i), context);
-                parts3.add(part);
+            for (File file : list3) {
+                params.put("wfbdFileList\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
             }
             map.remove("wfbdFileList");
         }
 
-        Map<String, RequestBody> params = new HashMap<>();
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             String key = entry.getKey();
             if (key.equals("kbdDescribes") || key.equals("wfDescribes")) {
@@ -192,23 +174,104 @@ public class UpLoadImpl extends LattePresenterImpl {
             }
         }
         LatteNetWorkApi.getApiService(Api.class)
-                .updateBatchByCus(params, parts1, parts2, parts3)
+                .updateBatchByCus(params)
                 .compose(RxHelper.observableIO2Main(context))
                 .subscribe(new MyObserver<BaseResponse>(context) {
                     @Override
                     public void onSuccess(BaseResponse demo) {
                         if (isViewAttached()) {
-                            getView().getResultThree(demo);
+                            if (Constants.SUCCESS.equals(demo.getCode())) {
+                                getView().getResultThree(demo);
+                            } else {
+                                getView().onMessage(demo.getMessage());
+                                getView().getResultThree(null);
+                            }
                         }
                     }
 
                     @Override
                     public void onFailure(Throwable e, String errorMsg) {
                         if (isViewAttached()) {
-                            BaseResponse baseResponse = new BaseResponse();
-                            baseResponse.setCode(null);
-                            baseResponse.setMessage(errorMsg);
-                            getView().getResultThree(baseResponse);
+                            getView().onMessage(errorMsg);
+                            getView().getResultThree(null);
+                        }
+                    }
+                });
+    }
+
+    @Override
+    public void getResultFour(Context context, Map<String, Object> map) {
+        super.getResultFour(context, map);
+        LatteNetWorkApi.getApiService(Api.class)
+                .deleteUnRegister(map)
+                .compose(RxHelper.observableIO2Main(context))
+                .subscribe(new MyObserver<BaseResponse>(context) {
+                    @Override
+                    public void onSuccess(BaseResponse demo) {
+                        if (isViewAttached()) {
+                            if (Constants.SUCCESS.equals(demo.getCode())) {
+                                getView().getResultFour(demo);
+                            } else {
+                                getView().onMessage(demo.getMessage());
+                                getView().getResultFour(null);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Throwable e, String errorMsg) {
+                        if (isViewAttached()) {
+                            getView().onMessage(errorMsg);
+                            getView().getResultFour(null);
+                        }
+                    }
+                });
+    }
+
+    @Override
+    public void getResultFive(Context context, Map<String, Object> map) {
+        super.getResultFive(context, map);
+        Map<String, RequestBody> params = new HashMap<>();
+        List<File> list1 = (List<File>) map.get("file");
+        if (list1 != null && !list1.isEmpty()) {
+            for (File file : list1) {
+                params.put("file\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
+            }
+            map.remove("file");
+        }
+        List<File> list2 = (List<File>) map.get("bpFileList");
+        if (list2 != null && !list2.isEmpty()) {
+            for (File file : list2) {
+                params.put("bpFileList\";filename=\"" + file.getName(), RequestBodyUtils.toRequestBodyFile(file, context));
+            }
+            map.remove("bpFileList");
+        }
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            params.put(key, RequestBodyUtils.toRequestBodyString(value == null ? "" : value.toString()));
+        }
+        LatteNetWorkApi.getApiService(Api.class)
+                .UpdateWaterNotInspect(params)
+                .compose(RxHelper.observableIO2Main(context))
+                .subscribe(new MyObserver<BaseResponse>(context) {
+                    @Override
+                    public void onSuccess(BaseResponse demo) {
+                        if (isViewAttached()) {
+                            if (Constants.SUCCESS.equals(demo.getCode())) {
+                                getView().getResultFive(demo);
+                            } else {
+                                getView().onMessage(demo.getMessage());
+                                getView().getResultFive(null);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Throwable e, String errorMsg) {
+                        if (isViewAttached()) {
+                            getView().onMessage(errorMsg);
+                            getView().getResultFive(null);
                         }
                     }
                 });

app/src/main/java/com/tofly/yxpc/utils/RequestBodyUtils.java

@@ -7,7 +7,6 @@ import java.io.IOException;
 
 import id.zelory.compressor.Compressor;
 import okhttp3.MediaType;
-import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 /**
@@ -37,8 +36,7 @@ public class RequestBodyUtils {
                 double fileOrFilesSize = FileSizeUtils.getFileOrFilesSize(value.getPath(), 3);
                 //在判断是否需要压缩1M以上就默认压缩
                 if (fileOrFilesSize >= 1) {
-                    File file = new Compressor(context)
-                            .compressToFile(value);
+                    File file = new Compressor(context).compressToFile(value);
                     body = RequestBody.create(mediaType, file);
                 } else {
                     body = RequestBody.create(mediaType, value);
@@ -60,22 +58,4 @@ public class RequestBodyUtils {
         return RequestBody.create(mediaType, value);
     }
 
-    public static MultipartBody.Part toMultiPartBodyFile(String key, File value, Context context) {
-        MultipartBody.Part part = null;
-        RequestBody body = null;
-        //首先判断是不是图片文件
-        String name = value.getName();
-        MediaType mediaType = MediaType.parse("image/*");
-
-        if (name.endsWith(".png") || name.endsWith(".jpg") || name.endsWith(".jpeg")) {
-            body = RequestBody.create(mediaType, value);
-        } else {
-            body = RequestBody.create(mediaType, value);
-        }
-
-        if (body != null) {
-            part = MultipartBody.Part.createFormData(key, value.getName(), body);
-        }
-        return part;
-    }
 }

app/src/main/res/layout/activity_main.xml

@@ -46,8 +46,7 @@
             android:gravity="center"
             android:text="@string/main_data_check"
             android:textColor="@drawable/select_main_text"
-            android:textSize="@dimen/sp_14"
-            android:visibility="gone" />
+            android:textSize="@dimen/sp_14" />
 
         <RadioButton
             android:id="@+id/rbt_data_unregister"
@@ -60,8 +59,7 @@
             android:gravity="center"
             android:text="违章用水"
             android:textColor="@drawable/select_main_text"
-            android:textSize="@dimen/sp_14"
-            android:visibility="gone" />
+            android:textSize="@dimen/sp_14" />
 
         <RadioButton
             android:id="@+id/rbt_data_update"