Browse Source

调整有户无表,添加水表位置信息显示,异常信息重复保存异常处理

ychk 5 months ago
parent
commit
52d1037cdf
1 changed files with 27 additions and 10 deletions
  1. 27 10
      app/src/main/java/com/tofly/yxpc/ui/fragment/WaterCheckFragment.java

+ 27 - 10
app/src/main/java/com/tofly/yxpc/ui/fragment/WaterCheckFragment.java

@@ -460,6 +460,7 @@ public class WaterCheckFragment extends PhotoFragment {
                 }
                 checkBox.setText(dictEntity.getItemText());
                 if (ides != null && ides.contains(dictEntity.getId())) {
+                    dictEntities.add(dictEntity);
                     checkBox.setChecked(true);
                 }
                 checkBox.setOnCheckedChangeListener((buttonView, isChecked1) -> {
@@ -468,9 +469,25 @@ public class WaterCheckFragment extends PhotoFragment {
                     } else {
                         dictEntities.remove(dictEntity);
                     }
+                    if (dictEntities.isEmpty()) {
+                        binding.llErrorPhoto.setVisibility(View.GONE);
+                        binding.rvListPhoto.setVisibility(View.GONE);
+                        photoList.clear();
+                    } else {
+                        binding.llErrorPhoto.setVisibility(View.VISIBLE);
+                        binding.rvListPhoto.setVisibility(View.VISIBLE);
+                    }
                 });
                 binding.llAbnormalView.addView(checkBox, dictEntityList.indexOf(dictEntity));
             }
+            if (dictEntities.isEmpty()) {
+                binding.llErrorPhoto.setVisibility(View.GONE);
+                binding.rvListPhoto.setVisibility(View.GONE);
+                photoList.clear();
+            } else {
+                binding.llErrorPhoto.setVisibility(View.VISIBLE);
+                binding.rvListPhoto.setVisibility(View.VISIBLE);
+            }
         }
 
     }
@@ -900,11 +917,6 @@ public class WaterCheckFragment extends PhotoFragment {
                 waterMeterEntity.setMeterNum("");
             }
 
-            if (waterMeterEntity.getKbdDescribes() == null) {
-                waterMeterEntity.setTaskState(0);
-            } else {
-                waterMeterEntity.setTaskState(1);
-            }
             if (!dictEntities.isEmpty()) {
                 StringBuilder stringBuilder = new StringBuilder();
                 if (waterMeterEntity.getKbdDescribes() == null) {
@@ -922,6 +934,11 @@ public class WaterCheckFragment extends PhotoFragment {
             } else {
                 waterMeterEntity.setKbdDescribes(null);
             }
+            if (waterMeterEntity.getKbdDescribes() == null) {
+                waterMeterEntity.setTaskState(0);
+            } else {
+                waterMeterEntity.setTaskState(1);
+            }
             waterMeterEntity.setWfDescribes(null);
             waterMeterEntity.setWfbdFileList(null);
             if (!TextUtils.isEmpty(binding.edDescribe.getText().toString())) {
@@ -957,11 +974,6 @@ public class WaterCheckFragment extends PhotoFragment {
                 waterMeterEntity.setMeterNum("");
             }
 
-            if (waterMeterEntity.getKbdDescribes() == null) {
-                waterMeterEntity.setTaskState(0);
-            } else {
-                waterMeterEntity.setTaskState(1);
-            }
             if (!dictEntities.isEmpty()) {
                 StringBuilder stringBuilder = new StringBuilder();
                 if (waterMeterEntity.getKbdDescribes() == null) {
@@ -977,6 +989,11 @@ public class WaterCheckFragment extends PhotoFragment {
                 }
                 waterMeterEntity.getKbdDescribes().setExceptionType(stringBuilder.toString());
             }
+            if (waterMeterEntity.getKbdDescribes() == null) {
+                waterMeterEntity.setTaskState(0);
+            } else {
+                waterMeterEntity.setTaskState(1);
+            }
             waterMeterEntity.setWfDescribes(null);
             waterMeterEntity.setWfbdFileList(null);
             if (!TextUtils.isEmpty(binding.edDescribe.getText().toString())) {