优化

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

@@ -62,7 +62,6 @@ public class UnRegisterActivity extends PhotoActivity {
     private final List<FileBean> bpPhotoList = new ArrayList<>();
     private int photoType;
     private String smbh = null;
-    private boolean isFirst = true;
     private String headName;
     private String shortName;
     private String areaCode;
@@ -740,7 +739,6 @@ public class UnRegisterActivity extends PhotoActivity {
         super.initMapView();
         aMap.setOnMapTouchListener(motionEvent -> {
             binding.llMap.mapView.requestDisallowInterceptTouchEvent(motionEvent.getAction() != MotionEvent.ACTION_UP);
-            isFirst = false;
         });
         aMap.setOnCameraChangeListener(mapCameraChangeListener);
         binding.llMap.imDrag.setVisibility(View.VISIBLE);
@@ -783,14 +781,12 @@ public class UnRegisterActivity extends PhotoActivity {
     @Override
     public void initMapListener(LocationUtil_xu.CoordinateClass info, String headName, String shortName, String areaCode) {
         super.initMapListener(info, headName, shortName, areaCode);
-        if (!isFirst) {
-            locationUtilXuNew = info;
-            binding.tvLat.setText("经度:" + locationUtilXuNew.Longtitude + " 纬度:" + locationUtilXuNew.Latitude);
-            binding.tvAddr.setText(locationUtilXuNew.addr == null ? "" : locationUtilXuNew.addr);
-            this.headName = headName;
-            this.shortName = shortName;
-            this.areaCode = areaCode;
-        }
+        locationUtilXuNew = info;
+        binding.tvLat.setText("经度:" + locationUtilXuNew.Longtitude + " 纬度:" + locationUtilXuNew.Latitude);
+        binding.tvAddr.setText(locationUtilXuNew.addr == null ? "" : locationUtilXuNew.addr);
+        this.headName = headName;
+        this.shortName = shortName;
+        this.areaCode = areaCode;
     }
 
     @Override

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

@@ -68,7 +68,6 @@ public class UnCalibrateFragment extends PhotoFragment {
     private String areaCode;
     private final List<String> bwbhList = Arrays.asList("-", "-附", "空");
     private String bwbh;
-    private boolean isFirst = true;
     private LocationUtil_xu.CoordinateClass locationUtilXuNew = null;
     public int qcType = 0;
 
@@ -617,7 +616,6 @@ public class UnCalibrateFragment extends PhotoFragment {
         super.initMapView();
         aMap.setOnMapTouchListener(motionEvent -> {
             binding.llMap.mapView.requestDisallowInterceptTouchEvent(motionEvent.getAction() != MotionEvent.ACTION_UP);
-            isFirst = false;
         });
         aMap.setOnCameraChangeListener(mapCameraChangeListener);
         binding.llMap.imDrag.setVisibility(View.VISIBLE);
@@ -662,14 +660,12 @@ public class UnCalibrateFragment extends PhotoFragment {
     @Override
     public void initMapListener(LocationUtil_xu.CoordinateClass info, String headName, String shortName, String areaCode) {
         super.initMapListener(info, headName, shortName, areaCode);
-        if (!isFirst) {
-            locationUtilXuNew = info;
-            binding.tvLat.setText("经度:" + locationUtilXuNew.Longtitude + " 纬度:" + locationUtilXuNew.Latitude);
-            binding.tvAddr.setText(locationUtilXuNew.addr == null ? "" : locationUtilXuNew.addr);
-            this.headName = headName;
-            this.shortName = shortName;
-            this.areaCode = areaCode;
-        }
+        locationUtilXuNew = info;
+        binding.tvLat.setText("经度:" + locationUtilXuNew.Longtitude + " 纬度:" + locationUtilXuNew.Latitude);
+        binding.tvAddr.setText(locationUtilXuNew.addr == null ? "" : locationUtilXuNew.addr);
+        this.headName = headName;
+        this.shortName = shortName;
+        this.areaCode = areaCode;
     }
 
     @Override

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

@@ -73,7 +73,6 @@ public class WaterCheckFragment extends PhotoFragment {
     private final List<DictEntity> dictEntities = new ArrayList<>();
     private Long navitId = null;
     private String idCard = null;
-    private boolean isFirst = true;
     private String headName;
     private String shortName;
     private String areaCode;
@@ -430,9 +429,13 @@ public class WaterCheckFragment extends PhotoFragment {
     private void setNullTable(boolean isChecked) {
         initRecyclerView();
         binding.cbDetail.setVisibility(isChecked ? View.GONE : View.VISIBLE);
+        binding.cbDetail.setChecked(!isChecked);
         binding.llDetail.setVisibility(isChecked ? View.GONE : View.VISIBLE);
         binding.cbSbwz.setVisibility(isChecked ? View.GONE : View.VISIBLE);
+        binding.cbSbwz.setChecked(!isChecked);
+        binding.llSbwz.setVisibility(View.VISIBLE);
         binding.cbAbnormal.setVisibility(isChecked ? View.GONE : View.VISIBLE);
+        binding.cbAbnormal.setChecked(!isChecked);
         binding.llErrorPhoto.setVisibility(isChecked ? View.GONE : View.VISIBLE);
         binding.rvListPhoto.setVisibility(isChecked ? View.GONE : View.VISIBLE);
         binding.llAbnormalView.setVisibility(isChecked ? View.GONE : View.VISIBLE);
@@ -1089,7 +1092,6 @@ public class WaterCheckFragment extends PhotoFragment {
         super.initMapView();
         aMap.setOnMapTouchListener(motionEvent -> {
             binding.llMap.mapView.requestDisallowInterceptTouchEvent(motionEvent.getAction() != MotionEvent.ACTION_UP);
-            isFirst = false;
         });
         aMap.setOnCameraChangeListener(mapCameraChangeListener);
         binding.llMap.imDrag.setVisibility(View.VISIBLE);
@@ -1132,14 +1134,12 @@ public class WaterCheckFragment extends PhotoFragment {
     @Override
     public void initMapListener(LocationUtil_xu.CoordinateClass info, String headName, String shortName, String areaCode) {
         super.initMapListener(info, headName, shortName, areaCode);
-        if (!isFirst) {
-            locationUtilXuNew = info;
-            binding.tvLat.setText("经度:" + locationUtilXuNew.Longtitude + " 纬度:" + locationUtilXuNew.Latitude);
-            binding.tvAddr.setText(locationUtilXuNew.addr == null ? "" : locationUtilXuNew.addr);
-            this.headName = headName;
-            this.shortName = shortName;
-            this.areaCode = areaCode;
-        }
+        locationUtilXuNew = info;
+        binding.tvLat.setText("经度:" + locationUtilXuNew.Longtitude + " 纬度:" + locationUtilXuNew.Latitude);
+        binding.tvAddr.setText(locationUtilXuNew.addr == null ? "" : locationUtilXuNew.addr);
+        this.headName = headName;
+        this.shortName = shortName;
+        this.areaCode = areaCode;
     }
 
     @Override

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

@@ -20,7 +20,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="@dimen/dp_10">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -154,7 +155,7 @@
                 android:background="@color/line_gray" />
 
             <CheckBox
-                android:id="@+id/cb_detail"
+                android:id="@+id/cb_sbwz"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_10"
@@ -168,25 +169,44 @@
                 android:minHeight="@dimen/dp_40"
                 android:paddingStart="@dimen/dp_10"
                 android:paddingEnd="@dimen/dp_13"
-                android:text="水表信息"
+                android:text="水表位置"
                 android:textColor="@color/color_333"
                 android:textSize="@dimen/sp_20" />
 
             <LinearLayout
-                android:id="@+id/ll_detail"
+                android:id="@+id/ll_sbwz"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_10"
                 android:orientation="vertical">
 
-                <LinearLayout
+                <include
+                    android:id="@+id/ll_map"
+                    layout="@layout/view_map"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/dp_180"
                     android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_14"
+                    android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_13"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
+                    android:layout_marginBottom="@dimen/dp_18" />
+
+                <TextView
+                    android:id="@+id/tv_addr"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white80"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:textColor="@color/color_555"
+                    android:textIsSelectable="true"
+                    android:textSize="@dimen/sp_16"
+                    tools:text="成都市青羊区" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_10"
+                    android:orientation="horizontal"
+                    android:paddingVertical="@dimen/dp_10">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -198,31 +218,24 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="水表表身号"
+                        android:text="水表位置"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/ed_water_meter_num"
+                    <TextView
+                        android:id="@+id/tv_lat"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_5"
                         android:background="@null"
-                        android:drawableEnd="@mipmap/icon_edit"
-                        android:drawablePadding="@dimen/dp_10"
+                        android:enabled="false"
                         android:gravity="end"
+                        android:hint="请选择位置"
                         android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_999"
                         android:textSize="@dimen/sp_16" />
                 </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" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -243,70 +256,30 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="水表品牌"
+                        android:text="行政区"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/dp_1"
-                        android:layout_weight="1" />
-
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_brand"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </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" />
-
-                <LinearLayout
-                    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:gravity="center_vertical"
-                    android:orientation="horizontal">
-
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:id="@+id/tv_xzq"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="*"
-                        android:textColor="@color/red"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
+                        android:drawableEnd="@mipmap/icon_arrow_up_gray"
+                        android:drawablePadding="@dimen/dp_8"
+                        android:gravity="end"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <TextView
+                    <ImageView
+                        android:id="@+id/img_achieve"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="水表口径"
-                        android:textColor="@color/color_333"
-                        android:textSize="@dimen/sp_16" />
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/dp_1"
-                        android:layout_weight="1" />
+                        android:paddingStart="@dimen/dp_10"
+                        android:src="@mipmap/icon_achieve" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_water_caliber"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
                 </LinearLayout>
 
                 <View
@@ -329,67 +302,30 @@
                     <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"
-                        android:text="水表种类"
+                        android:text="用户地址"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <View
+                    <EditText
+                        android:id="@+id/et_user_addr"
                         android:layout_width="0dp"
-                        android:layout_height="@dimen/dp_1"
-                        android:layout_weight="1" />
-
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_water_type"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </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:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:gravity="end"
                         android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_sblc"
+                    <ImageView
+                        android:id="@+id/img_achieve_address"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:layout_alignParentEnd="true"
-                        android:background="@null"
-                        android:gravity="right"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                        android:layout_height="wrap_content"
+                        android:paddingStart="@dimen/dp_10"
+                        android:src="@mipmap/icon_achieve" />
+
+                </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -411,23 +347,28 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="用水性质"
+                        android:text="门牌号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <View
+                    <EditText
+                        android:id="@+id/ed_mph"
                         android:layout_width="0dp"
-                        android:layout_height="@dimen/dp_1"
-                        android:layout_weight="1" />
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:gravity="end"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_use_water_properties"
+                    <ImageView
+                        android:id="@+id/img_copy"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
+                        android:layout_height="wrap_content"
+                        android:paddingStart="@dimen/dp_10"
+                        android:src="@mipmap/icon_copy" />
                 </LinearLayout>
 
                 <View
@@ -450,24 +391,29 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="最近止码"
+                        android:text="水表箱号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                     <EditText
-                        android:id="@+id/ed_recent_mark"
-                        android:layout_width="match_parent"
+                        android:id="@+id/ed_sbxh"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
                         android:background="@null"
-                        android:drawableEnd="@mipmap/icon_edit"
-                        android:drawablePadding="@dimen/dp_10"
                         android:gravity="end"
-                        android:inputType="number"
+                        android:inputType="numberDecimal"
                         android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_999"
+                        android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
+                    <ImageView
+                        android:id="@+id/tv_sao_sbxh"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="@dimen/dp_10"
+                        android:src="@mipmap/icon_scan" />
                 </LinearLayout>
 
                 <View
@@ -490,87 +436,68 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="备注"
+                        android:text="表位编号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                     <EditText
-                        android:id="@+id/ed_remark"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:background="@null"
-                        android:drawableEnd="@mipmap/icon_edit"
-                        android:drawablePadding="@dimen/dp_10"
-                        android:gravity="end"
+                        android:id="@+id/ed_bwbh1"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/dp_38"
+                        android:layout_marginStart="@dimen/dp_40"
+                        android:layout_weight="1"
+                        android:background="@drawable/frame_gray_4"
+                        android:gravity="center"
                         android:textColor="@color/color_333"
                         android:textColorHint="@color/color_333"
-                        android:textSize="@dimen/sp_16" />
-
-                </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" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_13"
-                    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" />
+                        android:textSize="@dimen/sp_16"
+                        tools:text="8" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="表盘照片"
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_bwbh"
+                        android:layout_width="@dimen/dp_56"
+                        android:layout_height="@dimen/dp_38"
+                        android:layout_marginStart="@dimen/dp_5"
+                        android:layout_marginTop="@dimen/dp_6"
+                        android:layout_marginBottom="@dimen/dp_6"
+                        android:background="@drawable/frame_gray_4"
+                        android:paddingEnd="@dimen/dp_5"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text=" (支持上传多张)"
-                        android:textColor="@color/color_999"
-                        android:textSize="@dimen/sp_16" />
-
-                    <View
+                    <EditText
+                        android:id="@+id/ed_bwbh2"
                         android:layout_width="0dp"
-                        android:layout_height="@dimen/dp_1"
-                        android:layout_weight="1" />
+                        android:layout_height="38dp"
+                        android:layout_marginStart="@dimen/dp_5"
+                        android:layout_weight="1"
+                        android:background="@drawable/frame_gray_4"
+                        android:gravity="center"
+                        android:inputType="number"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16"
+                        tools:text="5" />
 
                     <ImageView
-                        android:id="@+id/img_bp_photo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingStart="@dimen/dp_10"
-                        android:paddingTop="@dimen/dp_10"
-                        android:paddingBottom="@dimen/dp_15"
-                        android:src="@mipmap/icon_camera" />
+                        android:layout_marginStart="@dimen/dp_7"
+                        android:src="@mipmap/icon_edit" />
+
                 </LinearLayout>
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_list_bp"
+                <View
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:nestedScrollingEnabled="false" />
+                    android:layout_height="@dimen/dp_1"
+                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginEnd="@dimen/dp_10"
+                    android:background="@color/line_gray" />
 
             </LinearLayout>
 
             <CheckBox
-                android:id="@+id/cb_sbwz"
+                android:id="@+id/cb_detail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_10"
@@ -584,44 +511,25 @@
                 android:minHeight="@dimen/dp_40"
                 android:paddingStart="@dimen/dp_10"
                 android:paddingEnd="@dimen/dp_13"
-                android:text="水表位置"
+                android:text="水表信息"
                 android:textColor="@color/color_333"
                 android:textSize="@dimen/sp_20" />
 
             <LinearLayout
-                android:id="@+id/ll_sbwz"
+                android:id="@+id/ll_detail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/dp_10"
                 android:orientation="vertical">
 
-                <include
-                    android:id="@+id/ll_map"
-                    layout="@layout/view_map"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_180"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_18" />
-
-                <TextView
-                    android:id="@+id/tv_addr"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/white80"
-                    android:paddingHorizontal="@dimen/dp_10"
-                    android:textColor="@color/color_555"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/sp_16"
-                    tools:text="成都市青羊区" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/dp_10"
-                    android:orientation="horizontal"
-                    android:paddingVertical="@dimen/dp_10">
+                    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:gravity="center_vertical"
+                    android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -633,24 +541,31 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="水表位置"
+                        android:text="水表表身号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <TextView
-                        android:id="@+id/tv_lat"
+                    <EditText
+                        android:id="@+id/ed_water_meter_num"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_5"
                         android:background="@null"
-                        android:enabled="false"
+                        android:drawableEnd="@mipmap/icon_edit"
+                        android:drawablePadding="@dimen/dp_10"
                         android:gravity="end"
-                        android:hint="请选择位置"
                         android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_999"
                         android:textSize="@dimen/sp_16" />
                 </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" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -671,30 +586,70 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="行政区"
+                        android:layout_centerVertical="true"
+                        android:text="水表品牌"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <TextView
-                        android:id="@+id/tv_xzq"
+                    <View
                         android:layout_width="0dp"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_weight="1" />
+
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_brand"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:background="@null"
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
+                </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" />
+
+                <LinearLayout
+                    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:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:layout_weight="1"
-                        android:drawableEnd="@mipmap/icon_arrow_up_gray"
-                        android:drawablePadding="@dimen/dp_8"
-                        android:gravity="end"
-                        android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
+                        android:text="*"
+                        android:textColor="@color/red"
                         android:textSize="@dimen/sp_16" />
 
-                    <ImageView
-                        android:id="@+id/img_achieve"
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingStart="@dimen/dp_10"
-                        android:src="@mipmap/icon_achieve" />
+                        android:text="水表口径"
+                        android:textColor="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
 
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_weight="1" />
+
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_water_caliber"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:background="@null"
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
                 </LinearLayout>
 
                 <View
@@ -717,29 +672,105 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="用户地址"
+                        android:text="*"
+                        android:textColor="@color/red"
+                        android:textSize="@dimen/sp_16" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="水表种类"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/et_user_addr"
+                    <View
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:layout_weight="1"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_weight="1" />
+
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_water_type"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
                         android:background="@null"
-                        android:gravity="end"
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
+                </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:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <ImageView
-                        android:id="@+id/img_achieve_address"
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_sblc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_alignParentEnd="true"
+                        android:background="@null"
+                        android:gravity="right"
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
+                </RelativeLayout>
+
+                <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" />
+
+                <LinearLayout
+                    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:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingStart="@dimen/dp_10"
-                        android:src="@mipmap/icon_achieve" />
+                        android:text="用水性质"
+                        android:textColor="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
 
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_weight="1" />
+
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_use_water_properties"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:background="@null"
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
                 </LinearLayout>
 
                 <View
@@ -762,28 +793,24 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="门牌号"
+                        android:text="最近止码"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                     <EditText
-                        android:id="@+id/ed_mph"
-                        android:layout_width="0dp"
+                        android:id="@+id/ed_recent_mark"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_weight="1"
                         android:background="@null"
+                        android:drawableEnd="@mipmap/icon_edit"
+                        android:drawablePadding="@dimen/dp_10"
                         android:gravity="end"
+                        android:inputType="number"
                         android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
+                        android:textColorHint="@color/color_999"
                         android:textSize="@dimen/sp_16" />
 
-                    <ImageView
-                        android:id="@+id/img_copy"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingStart="@dimen/dp_10"
-                        android:src="@mipmap/icon_copy" />
                 </LinearLayout>
 
                 <View
@@ -806,29 +833,23 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="水表箱号"
+                        android:text="备注"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                     <EditText
-                        android:id="@+id/ed_sbxh"
-                        android:layout_width="0dp"
+                        android:id="@+id/ed_remark"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_weight="1"
                         android:background="@null"
+                        android:drawableEnd="@mipmap/icon_edit"
+                        android:drawablePadding="@dimen/dp_10"
                         android:gravity="end"
-                        android:inputType="numberDecimal"
                         android:textColor="@color/color_333"
                         android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <ImageView
-                        android:id="@+id/tv_sao_sbxh"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingStart="@dimen/dp_10"
-                        android:src="@mipmap/icon_scan" />
                 </LinearLayout>
 
                 <View
@@ -842,7 +863,6 @@
                     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:gravity="center_vertical"
@@ -851,64 +871,52 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="表位编号"
-                        android:textColor="@color/color_333"
+                        android:text="*"
+                        android:textColor="@color/red"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/ed_bwbh1"
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/dp_38"
-                        android:layout_marginStart="@dimen/dp_40"
-                        android:layout_weight="1"
-                        android:background="@drawable/frame_gray_4"
-                        android:gravity="center"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="表盘照片"
                         android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
-                        android:textSize="@dimen/sp_16"
-                        tools:text="8" />
+                        android:textSize="@dimen/sp_16" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_bwbh"
-                        android:layout_width="@dimen/dp_56"
-                        android:layout_height="@dimen/dp_38"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginTop="@dimen/dp_6"
-                        android:layout_marginBottom="@dimen/dp_6"
-                        android:background="@drawable/frame_gray_4"
-                        android:paddingEnd="@dimen/dp_5"
-                        android:textColor="@color/color_333"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=" (支持上传多张)"
+                        android:textColor="@color/color_999"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/ed_bwbh2"
+                    <View
                         android:layout_width="0dp"
-                        android:layout_height="38dp"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_weight="1"
-                        android:background="@drawable/frame_gray_4"
-                        android:gravity="center"
-                        android:inputType="number"
-                        android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
-                        android:textSize="@dimen/sp_16"
-                        tools:text="5" />
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_weight="1" />
 
                     <ImageView
+                        android:id="@+id/img_bp_photo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_7"
-                        android:src="@mipmap/icon_edit" />
-
+                        android:paddingStart="@dimen/dp_10"
+                        android:paddingTop="@dimen/dp_10"
+                        android:paddingBottom="@dimen/dp_15"
+                        android:src="@mipmap/icon_camera" />
                 </LinearLayout>
 
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_list_bp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false" />
+
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_10"
+                    android:layout_height="@dimen/dp_1"
                     android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
-
             </LinearLayout>
 
             <include

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

@@ -379,7 +379,7 @@
                 android:background="@color/line_gray" />
 
             <CheckBox
-                android:id="@+id/cb_detail"
+                android:id="@+id/cb_sbwz"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_10"
@@ -393,46 +393,63 @@
                 android:minHeight="@dimen/dp_40"
                 android:paddingStart="@dimen/dp_10"
                 android:paddingEnd="@dimen/dp_13"
-                android:text="水表信息"
+                android:text="水表位置"
                 android:textColor="@color/color_333"
                 android:textSize="@dimen/sp_20" />
 
             <LinearLayout
-                android:id="@+id/ll_detail"
+                android:id="@+id/ll_sbwz"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
+                <include
+                    android:id="@+id/ll_map"
+                    layout="@layout/view_map"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_180"
+                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginEnd="@dimen/dp_10"
+                    android:layout_marginBottom="@dimen/dp_18" />
+
+                <TextView
+                    android:id="@+id/tv_addr"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:textColor="@color/color_555"
+                    android:textIsSelectable="true"
+                    android:textSize="@dimen/sp_16"
+                    tools:text="成都市青羊区" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_14"
+                    android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_13"
+                    android:layout_marginBottom="@dimen/dp_10"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
+                        android:id="@+id/tv_lat_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="水表表身号"
+                        android:text="水表位置"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/ed_water_meter_num"
+                    <TextView
+                        android:id="@+id/tv_lat"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_20"
-                        android:background="@null"
-                        android:enabled="false"
                         android:gravity="end"
+                        android:hint="请选择位置"
                         android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
-
                 </LinearLayout>
 
                 <View
@@ -442,33 +459,35 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <RelativeLayout
+                <LinearLayout
                     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:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="水表品牌"
+                        android:text="行政区"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_brand"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:layout_alignParentEnd="true"
-                        android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                    <TextView
+                        android:id="@+id/tv_xzq"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
+
+                </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -477,33 +496,37 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <RelativeLayout
+                <LinearLayout
                     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:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="水表口径"
+                        android:text="用户地址"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_water_caliber"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:layout_alignParentEnd="true"
+                    <EditText
+                        android:id="@+id/et_user_addr"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
                         android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                        android:enabled="false"
+                        android:gravity="end"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
+
+                </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -512,34 +535,37 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <RelativeLayout
+                <LinearLayout
                     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:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="水表种类"
+                        android:text="门牌号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_water_type"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
+                    <EditText
+                        android:id="@+id/ed_mph"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
                         android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                        android:enabled="false"
+                        android:gravity="end"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
+
+                </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -548,33 +574,38 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <RelativeLayout
+                <LinearLayout
                     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:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="水表量程"
+                        android:text="水表箱号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_sblc"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:layout_alignParentEnd="true"
+                    <EditText
+                        android:id="@+id/ed_sbxh"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
                         android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                        android:enabled="false"
+                        android:gravity="end"
+                        android:inputType="numberDecimal"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
+
+                </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -583,41 +614,64 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <RelativeLayout
+                <LinearLayout
                     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:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="用水性质"
+                        android:text="表位编号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_use_water_properties"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
-                        android:layout_alignParentEnd="true"
-                        android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                    <TextView
+                        android:id="@+id/tv_bwbh"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_38"
+                        android:gravity="end|center_vertical"
+                        android:textColor="@color/color_333"
+                        android:textSize="@dimen/sp_16"
+                        tools:text="8" />
 
-                <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" />
+                </LinearLayout>
+            </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" />
+
+            <CheckBox
+                android:id="@+id/cb_detail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_15"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:background="#1a0671DD"
+                android:button="@null"
+                android:checked="true"
+                android:drawableEnd="@drawable/select_checkbox"
+                android:drawablePadding="@dimen/dp_10"
+                android:minHeight="@dimen/dp_40"
+                android:paddingStart="@dimen/dp_10"
+                android:paddingEnd="@dimen/dp_13"
+                android:text="水表信息"
+                android:textColor="@color/color_333"
+                android:textSize="@dimen/sp_20" />
+
+            <LinearLayout
+                android:id="@+id/ll_detail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -632,37 +686,21 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="最近止码"
+                        android:text="水表表身号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/dp_1"
-                        android:layout_weight="1" />
-
-                    <TextView
-                        android:id="@+id/tv_old_recent_mark"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:textColor="@color/color_333"
-                        android:textSize="@dimen/sp_16"
-                        tools:text="0" />
-
                     <EditText
-                        android:id="@+id/ed_recent_mark"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/ed_water_meter_num"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
                         android:layout_marginEnd="@dimen/dp_20"
                         android:background="@null"
                         android:enabled="false"
                         android:gravity="end"
-                        android:inputType="number"
-                        android:minWidth="@dimen/dp_100"
                         android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_999"
+                        android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                 </LinearLayout>
@@ -674,36 +712,33 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <LinearLayout
+                <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:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="备注"
+                        android:layout_centerVertical="true"
+                        android:text="水表品牌"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/ed_remark"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_brand"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_alignParentEnd="true"
                         android:background="@null"
-                        android:enabled="false"
-                        android:gravity="end"
-                        android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
-                        android:textSize="@dimen/sp_16" />
-
-                </LinearLayout>
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
+                </RelativeLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -712,118 +747,69 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_14"
                     android:layout_marginEnd="@dimen/dp_10"
                     android:layout_marginBottom="@dimen/dp_13"
-                    android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="表盘照片"
+                        android:layout_centerVertical="true"
+                        android:text="水表口径"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <TextView
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_water_caliber"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text=" (支持上传多张)"
-                        android:textColor="@color/color_999"
-                        android:textSize="@dimen/sp_16" />
-
-                    <View
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/dp_1"
-                        android:layout_weight="1" />
-
-                </LinearLayout>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_list_bp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:nestedScrollingEnabled="false" />
-
-            </LinearLayout>
-
-            <CheckBox
-                android:id="@+id/cb_sbwz"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_15"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:background="#1a0671DD"
-                android:button="@null"
-                android:checked="true"
-                android:drawableEnd="@drawable/select_checkbox"
-                android:drawablePadding="@dimen/dp_10"
-                android:minHeight="@dimen/dp_40"
-                android:paddingStart="@dimen/dp_10"
-                android:paddingEnd="@dimen/dp_13"
-                android:text="水表位置"
-                android:textColor="@color/color_333"
-                android:textSize="@dimen/sp_20" />
-
-            <LinearLayout
-                android:id="@+id/ll_sbwz"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_alignParentEnd="true"
+                        android:background="@null"
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
+                </RelativeLayout>
 
-                <include
-                    android:id="@+id/ll_map"
-                    layout="@layout/view_map"
+                <View
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_180"
+                    android:layout_height="@dimen/dp_1"
                     android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_18" />
-
-                <TextView
-                    android:id="@+id/tv_addr"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_10"
-                    android:textColor="@color/color_555"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/sp_16"
-                    tools:text="成都市青羊区" />
+                    android:background="@color/line_gray" />
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_14"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:gravity="center_vertical"
+                    android:layout_marginBottom="@dimen/dp_13"
                     android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/tv_lat_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="水表位置"
+                        android:layout_centerVertical="true"
+                        android:text="水表种类"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <TextView
-                        android:id="@+id/tv_lat"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:gravity="end"
-                        android:hint="请选择位置"
-                        android:textColor="@color/color_333"
-                        android:textSize="@dimen/sp_16" />
-                </LinearLayout>
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_water_type"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:background="@null"
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
+                </RelativeLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -832,35 +818,33 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <LinearLayout
+                <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:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="行政区"
-                        android:textColor="@color/color_333"
-                        android:textSize="@dimen/sp_16" />
-
-                    <TextView
-                        android:id="@+id/tv_xzq"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:layout_weight="1"
-                        android:gravity="end"
+                        android:layout_centerVertical="true"
+                        android:text="水表量程"
                         android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                </LinearLayout>
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_sblc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_alignParentEnd="true"
+                        android:background="@null"
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
+                </RelativeLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -869,7 +853,7 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
@@ -882,24 +866,21 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="用户地址"
+                        android:layout_centerVertical="true"
+                        android:text="用水性质"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/et_user_addr"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:layout_weight="1"
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_use_water_properties"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_alignParentEnd="true"
                         android:background="@null"
-                        android:enabled="false"
-                        android:gravity="end"
-                        android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
-                        android:textSize="@dimen/sp_16" />
-
-                </LinearLayout>
+                        android:minWidth="@dimen/dp_150"
+                        android:paddingHorizontal="@dimen/dp_20"
+                        android:spinnerMode="dropdown" />
+                </RelativeLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -921,21 +902,37 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="门牌号"
+                        android:text="最近止码"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/ed_mph"
+                    <View
                         android:layout_width="0dp"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_weight="1" />
+
+                    <TextView
+                        android:id="@+id/tv_old_recent_mark"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_weight="1"
+                        android:textColor="@color/color_333"
+                        android:textSize="@dimen/sp_16"
+                        tools:text="0" />
+
+                    <EditText
+                        android:id="@+id/ed_recent_mark"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_marginEnd="@dimen/dp_20"
                         android:background="@null"
                         android:enabled="false"
                         android:gravity="end"
+                        android:inputType="number"
+                        android:minWidth="@dimen/dp_100"
                         android:textColor="@color/color_333"
-                        android:textColorHint="@color/color_333"
+                        android:textColorHint="@color/color_999"
                         android:textSize="@dimen/sp_16" />
 
                 </LinearLayout>
@@ -960,20 +957,18 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="水表箱号"
+                        android:text="备注"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                     <EditText
-                        android:id="@+id/ed_sbxh"
-                        android:layout_width="0dp"
+                        android:id="@+id/ed_remark"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_weight="1"
                         android:background="@null"
                         android:enabled="false"
                         android:gravity="end"
-                        android:inputType="numberDecimal"
                         android:textColor="@color/color_333"
                         android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
@@ -991,27 +986,39 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_10"
+                    android:layout_marginBottom="@dimen/dp_13"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="表位编号"
+                        android:text="表盘照片"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                     <TextView
-                        android:id="@+id/tv_bwbh"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_38"
-                        android:gravity="end|center_vertical"
-                        android:textColor="@color/color_333"
-                        android:textSize="@dimen/sp_16"
-                        tools:text="8" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=" (支持上传多张)"
+                        android:textColor="@color/color_999"
+                        android:textSize="@dimen/sp_16" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_weight="1" />
 
                 </LinearLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_list_bp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false" />
+
             </LinearLayout>
 
             <View

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

@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/dp_10">
+    android:paddingBottom="@dimen/dp_10"
+    android:visibility="gone">
 
     <LinearLayout
         android:id="@+id/ll_sbbd"