添加抄表月

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 21
         //noinspection OldTargetApi
         targetSdkVersion 29
-        versionCode 90
-        versionName "9.0"
+        versionCode 91
+        versionName "9.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'arm64-v8a'
@@ -48,7 +48,7 @@ android {
     }
 
     greendao {
-        schemaVersion 13 //数据库版本号
+        schemaVersion 14 //数据库版本号
         daoPackage 'com.tofly.yxpc.greenDao'
         // 设置DaoMaster、DaoSession、Dao 包名
         targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录,请注意，这里路径用/不要用.

app/src/main/java/com/tofly/yxpc/entity/WaterMeterEntity.java

@@ -44,6 +44,14 @@ public class WaterMeterEntity {
     private String type;
 
     private String recentMark;
+    /**
+     * 最新最近止码
+     */
+    private String recent_mark;
+    /**
+     * 抄表月份
+     */
+    private String cb_month;
     private String checkUser;
     private String navigationId;
     /**
@@ -114,19 +122,20 @@ public class WaterMeterEntity {
     private List<FileBean> bpAroundFileList;
 
 
-    @Generated(hash = 1382631774)
+    @Generated(hash = 134026873)
     public WaterMeterEntity(Long id, String batch, String userNum, String userName,
                             String waterMeterNum, String waterMeterCaliber, String useWaterProperties,
                             String qbNum, String userAddr, String createTime, String createUser,
                             String longitude, String latitude, String internetIdCard, String installPosition,
                             Long taskId, String brand, String installTime, String type, String recentMark,
-                            String checkUser, String navigationId, int state, String detailsState,
-                            List<FileBean> bpFileList, List<FileBean> exceptionFileList,
-                            List<FileBean> wfbdFileList, KbdDescribesBean kbdDescribes,
-                            KbdDescribesBean wfDescribes, String addressDetails, String waterMeterXh,
-                            String meterNum, String waterMeterRange, String regionName, String regionCode,
-                            String houseNumber, List<WaterDetailsBean> yxswWaterTaskDetails, int taskState,
-                            Long detailsId, boolean isOnline, String mapLocation, String recentMarkOld,
+                            String recent_mark, String cb_month, String checkUser, String navigationId,
+                            int state, String detailsState, List<FileBean> bpFileList,
+                            List<FileBean> exceptionFileList, List<FileBean> wfbdFileList,
+                            KbdDescribesBean kbdDescribes, KbdDescribesBean wfDescribes,
+                            String addressDetails, String waterMeterXh, String meterNum,
+                            String waterMeterRange, String regionName, String regionCode, String houseNumber,
+                            List<WaterDetailsBean> yxswWaterTaskDetails, int taskState, Long detailsId,
+                            boolean isOnline, String mapLocation, String recentMarkOld,
                             List<FileBean> bpAroundFileList) {
         this.id = id;
         this.batch = batch;
@@ -148,6 +157,8 @@ public class WaterMeterEntity {
         this.installTime = installTime;
         this.type = type;
         this.recentMark = recentMark;
+        this.recent_mark = recent_mark;
+        this.cb_month = cb_month;
         this.checkUser = checkUser;
         this.navigationId = navigationId;
         this.state = state;
@@ -530,4 +541,20 @@ public class WaterMeterEntity {
         this.bpAroundFileList = bpAroundFileList;
     }
 
+    public String getRecent_mark() {
+        return recent_mark;
+    }
+
+    public void setRecent_mark(String recent_mark) {
+        this.recent_mark = recent_mark;
+    }
+
+    public String getCb_month() {
+        return cb_month;
+    }
+
+    public void setCb_month(String cb_month) {
+        this.cb_month = cb_month;
+    }
+
 }

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

@@ -779,10 +779,6 @@ public class UnRegisterActivity extends PhotoActivity {
             onMessage("请添加表盘照片");
             return false;
         }
-        if (bpzbPhotoList.isEmpty()) {
-            onMessage("请添加表盘周边");
-            return false;
-        }
         return true;
     }
 

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

@@ -576,6 +576,9 @@ public class UnCalibrateFragment extends PhotoFragment {
         if (photoList.isEmpty()) {
             onMessage("请添加异常照片");
             return false;
+        } else if (dictEntities.isEmpty()) {
+            onMessage("请选择情况类型");
+            return false;
         }
         return true;
     }

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

@@ -650,6 +650,7 @@ public class WaterCheckFragment extends PhotoFragment {
             }
             binding.tvOldRecentMark.setText(waterMeterEntity.getRecentMarkOld() == null ? "" : waterMeterEntity.getRecentMarkOld());
             binding.edRecentMark.setText(waterMeterEntity.getRecentMark() == null ? "" : waterMeterEntity.getRecentMark());
+            binding.tvLastRecentRemark.setText(waterMeterEntity.getRecent_mark() == null ? "" : waterMeterEntity.getRecent_mark() + "（" + (waterMeterEntity.getCb_month() == null ? "" : waterMeterEntity.getCb_month()) + "）");
             binding.edRemark.setText(waterMeterEntity.getAddressDetails() == null ? "" : waterMeterEntity.getAddressDetails());
             if (waterMeterEntity != null && waterMeterEntity.getBpFileList() != null) {
                 bpPhotoList.addAll(waterMeterEntity.getBpFileList());
@@ -1073,9 +1074,6 @@ public class WaterCheckFragment extends PhotoFragment {
             if (bpPhotoList.isEmpty()) {
                 onMessage("请添加表盘照片");
                 return false;
-            } else if (bpzbPhotoList.isEmpty()) {
-                onMessage("请添加表盘周边");
-                return false;
             }
         }
         if (TextUtils.isEmpty(binding.edDescribe.getText()) && waterMeterEntity.getKbdDescribes() != null && waterMeterEntity.getKbdDescribes().getExceptionType() == null) {

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

@@ -924,13 +924,6 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="*"
-                        android:textColor="@color/red"
-                        android:textSize="@dimen/sp_16" />
-
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

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

@@ -991,6 +991,44 @@
 
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginEnd="@dimen/dp_10"
+                    android:background="@color/line_gray" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_14"
+                    android:layout_marginEnd="@dimen/dp_10"
+                    android:layout_marginBottom="@dimen/dp_13"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="最近抄表"
+                        android:textColor="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
+
+                    <TextView
+                        android:id="@+id/tv_last_recent_remark"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_20"
+                        android:enabled="false"
+                        android:gravity="end"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16"
+                        tools:text="1" />
+                </RelativeLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
@@ -1097,13 +1135,6 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="*"
-                        android:textColor="@color/red"
-                        android:textSize="@dimen/sp_16" />
-
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"