通过水表表身号进行非在册登记

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 21
         //noinspection OldTargetApi
         targetSdkVersion 29
-        versionCode 86
-        versionName "8.6"
+        versionCode 87
+        versionName "8.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'arm64-v8a'

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

@@ -74,6 +74,7 @@ public class UnRegisterActivity extends PhotoActivity {
     private final List<String> natureIdList = new ArrayList<>();
     private final List<String> bwbhList = Arrays.asList("-", "-附", "空");
     private String bwbh;
+    private String sbbsh;
 
     @Override
     public void onTakePhotoSuccess(String pathFile) {
@@ -125,6 +126,7 @@ public class UnRegisterActivity extends PhotoActivity {
     public void initView() {
         long id = getIntent().getLongExtra("Id", 0);
         smbh = getIntent().getStringExtra("idCard");
+        sbbsh = getIntent().getStringExtra("sbbsh");
         setType("2");
         sbdjEntity = DaoUtilsStore.getInstance().getSbdjEntityDbUtils().queryById(id);
         baseUpdataEntity = DaoUtilsStore.getInstance().getBaseUpdataEntityDbUtils().queryById(id);
@@ -476,16 +478,22 @@ public class UnRegisterActivity extends PhotoActivity {
 
             if (!TextUtils.isEmpty(smbh)) {
                 binding.llUnregisterWater.edInternetIdCard.setText(smbh);
+                binding.llUnregisterWater.edInternetIdCard.setEnabled(false);
+                binding.llUnregisterWater.edUserNum.setText(smbh);
+                binding.llUnregisterWater.edUserNum.setEnabled(false);
             } else {
                 binding.llUnregisterWater.edInternetIdCard.setText(sbdjEntity.getInternetIdCard() == null ? "" : sbdjEntity.getInternetIdCard());
+                binding.llUnregisterWater.edUserNum.setText(sbdjEntity.getUserNum() == null ? "" : sbdjEntity.getUserNum());
             }
-
-            binding.llUnregisterWater.edUserNum.setText(sbdjEntity.getUserNum() == null ? "" : sbdjEntity.getUserNum());
             binding.llUnregisterWater.edUserName.setText(sbdjEntity.getUserName() == null ? "" : sbdjEntity.getUserName());
             binding.llUnregisterWater.edQbNum.setText(sbdjEntity.getQbNum() == null ? "" : sbdjEntity.getQbNum());
             binding.llUnregisterWater.tvInstallTime.setText(sbdjEntity.getInstallTime() == null ? "" : sbdjEntity.getInstallTime());
-
-            binding.edWaterMeterNum.setText(sbdjEntity.getWaterMeterNum() == null ? "" : sbdjEntity.getWaterMeterNum());
+            if (!TextUtils.isEmpty(sbbsh)) {
+                binding.edWaterMeterNum.setText(sbbsh);
+                binding.edWaterMeterNum.setEnabled(false);
+            } else {
+                binding.edWaterMeterNum.setText(sbdjEntity.getWaterMeterNum() == null ? "" : sbdjEntity.getWaterMeterNum());
+            }
             if (!TextUtils.isEmpty(sbdjEntity.getBrand())) {
                 int index = brandIdList.indexOf(sbdjEntity.getBrand());
                 binding.spinnerBrand.setSelection(index);
@@ -639,8 +647,13 @@ public class UnRegisterActivity extends PhotoActivity {
             sbdjEntity.setUserName(binding.llUnregisterWater.edUserName.getText().toString());
             sbdjEntity.setQbNum(binding.llUnregisterWater.edQbNum.getText().toString());
         } else {
-            sbdjEntity.setInternetIdCard(null);
-            sbdjEntity.setUserNum(null);
+            if (!TextUtils.isEmpty(smbh)) {
+                sbdjEntity.setInternetIdCard(smbh);
+                sbdjEntity.setUserNum(smbh);
+            } else {
+                sbdjEntity.setInternetIdCard(null);
+                sbdjEntity.setUserNum(null);
+            }
             sbdjEntity.setUserName(null);
             sbdjEntity.setQbNum(null);
         }

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

@@ -444,32 +444,36 @@ public class IndexFragment extends LatteDelegate {
                 waterMeter.setUserAddr(smBhTaskBean.getUser_addr());
                 waterMeter.setCheckUser(smBhTaskBean.getInspect_user_name());
                 waterMeter.setCreateTime(smBhTaskBean.getInspect_time());
-                if ("31001".equals(baseResponse.getCode())) {
-                    DialogUtils.showDialog(requireContext(), "提示", "该水表不存在，是否进行非在册用水登记？", false, (dialog, which) -> {
-                        long count = DaoUtilsStore.getInstance().getDictEntityDbUtils().queryCountByQueryBuilder(DictEntityDao.Properties.DictCode.eq("noregistered_type"));
-                        if (count > 0) {
-                            Intent intent = new Intent(requireActivity(), UnRegisterActivity.class);
-                            intent.putExtra("idCard", smBhTaskBean.getUser_num());
-                            startActivity(intent);
+            }
+            if ("31001".equals(baseResponse.getCode())) {
+                DialogUtils.showDialog(requireContext(), "提示", "该水表不存在，是否进行非在册用水登记？", false, (dialog, which) -> {
+                    long count = DaoUtilsStore.getInstance().getDictEntityDbUtils().queryCountByQueryBuilder(DictEntityDao.Properties.DictCode.eq("noregistered_type"));
+                    if (count > 0) {
+                        Intent intent = new Intent(requireActivity(), UnRegisterActivity.class);
+                        if (type == 0) {
+                            intent.putExtra("idCard", smbh);
                         } else {
-                            onMessage("基础数据加载失败");
+                            intent.putExtra("sbbsh", smbh);
                         }
-                    });
-                } else if ("31002".equals(baseResponse.getCode())) {
-                    DialogUtils.YhInfoDialog(requireContext(), false, waterMeter, smBhTaskBean == null ? "" : smBhTaskBean.getCommitType(), yhbh ->
-                            DialogUtils.showDialog(requireContext(), "提示", "该水表未下发核查任务，是否添加到您的临时任务中？", false, (dialog, which) ->
-                                    download(baseResponse.getCode(), smBhTaskBean.getUser_num())));
-                } else if ("31003".equals(baseResponse.getCode())) {
-                    DialogUtils.YhInfoDialog(requireContext(), false, waterMeter, smBhTaskBean == null ? "" : smBhTaskBean.getCommitType(), yhbh ->
-                            DialogUtils.showDialog(requireContext(), "提示", "该水表已下发给" + (smBhTaskBean == null ? "" : smBhTaskBean.getInspect_user_name()) + "核查，是否要转派到您的临时任务中？", false, (dialog, which) ->
-                                    download(baseResponse.getCode(), smBhTaskBean.getUser_num())));
-                } else if ("31004".equals(baseResponse.getCode())) {
-                    DialogUtils.YhInfoDialog(requireContext(), false, waterMeter, smBhTaskBean == null ? "" : smBhTaskBean.getCommitType(), yhbh ->
-                            DialogUtils.showDialog(requireContext(), "提示", "该水表" + (smBhTaskBean == null ? "" : smBhTaskBean.getInspect_user_name()) + "已核查完毕，是否要继续核查？", false, (dialog, which) ->
-                                    download(baseResponse.getCode(), smBhTaskBean.getUser_num())));
-                } else {
-                    onMessage(baseResponse.getMessage());
-                }
+                        startActivity(intent);
+                    } else {
+                        onMessage("基础数据加载失败");
+                    }
+                });
+            } else if ("31002".equals(baseResponse.getCode())) {
+                DialogUtils.YhInfoDialog(requireContext(), false, waterMeter, smBhTaskBean == null ? "" : smBhTaskBean.getCommitType(), yhbh ->
+                        DialogUtils.showDialog(requireContext(), "提示", "该水表未下发核查任务，是否添加到您的临时任务中？", false, (dialog, which) ->
+                                download(baseResponse.getCode(), smBhTaskBean.getUser_num())));
+            } else if ("31003".equals(baseResponse.getCode())) {
+                DialogUtils.YhInfoDialog(requireContext(), false, waterMeter, smBhTaskBean == null ? "" : smBhTaskBean.getCommitType(), yhbh ->
+                        DialogUtils.showDialog(requireContext(), "提示", "该水表已下发给" + (smBhTaskBean == null ? "" : smBhTaskBean.getInspect_user_name()) + "核查，是否要转派到您的临时任务中？", false, (dialog, which) ->
+                                download(baseResponse.getCode(), smBhTaskBean.getUser_num())));
+            } else if ("31004".equals(baseResponse.getCode())) {
+                DialogUtils.YhInfoDialog(requireContext(), false, waterMeter, smBhTaskBean == null ? "" : smBhTaskBean.getCommitType(), yhbh ->
+                        DialogUtils.showDialog(requireContext(), "提示", "该水表" + (smBhTaskBean == null ? "" : smBhTaskBean.getInspect_user_name()) + "已核查完毕，是否要继续核查？", false, (dialog, which) ->
+                                download(baseResponse.getCode(), smBhTaskBean.getUser_num())));
+            } else {
+                onMessage(baseResponse.getMessage());
             }
         }
     }