水表详情修改

app/build.gradle

@@ -48,7 +48,7 @@ android {
     }
 
     greendao {
-        schemaVersion 3 //数据库版本号
+        schemaVersion 4 //数据库版本号
         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

@@ -50,8 +50,25 @@ public class WaterMeterEntity {
     @Convert(columnType = String.class, converter = KbdDescribesConverter.class)
     private KbdDescribesBean wfDescribes;
     @Transient
-    private boolean ischeck=false;
-    @Generated(hash = 1213077724)
+    private boolean ischeck = false;
+    /**
+     * 详细地址
+     */
+    private String addressDetails;
+    /**
+     * 水表箱号
+     */
+    private String waterMeterXh;
+    /**
+     * 表位编号
+     */
+    private String meterNum;
+    /**
+     * 水表量程
+     */
+    private String waterMeterRange;
+
+    @Generated(hash = 1032262020)
     public WaterMeterEntity(Long id, String batch, String userNum, String userName,
                             String waterMeterNum, int waterMeterCaliber, String useWaterProperties,
                             String qbNum, String userAddr, String createTime, String createUser,
@@ -60,7 +77,9 @@ public class WaterMeterEntity {
                             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) {
+                            KbdDescribesBean kbdDescribes, KbdDescribesBean wfDescribes,
+                            String addressDetails, String waterMeterXh, String meterNum,
+                            String waterMeterRange) {
         this.id = id;
         this.batch = batch;
         this.userNum = userNum;
@@ -90,185 +109,280 @@ public class WaterMeterEntity {
         this.wfbdFileList = wfbdFileList;
         this.kbdDescribes = kbdDescribes;
         this.wfDescribes = wfDescribes;
+        this.addressDetails = addressDetails;
+        this.waterMeterXh = waterMeterXh;
+        this.meterNum = meterNum;
+        this.waterMeterRange = waterMeterRange;
     }
+
     @Generated(hash = 1553180950)
     public WaterMeterEntity() {
     }
+
     public Long getId() {
         return this.id;
     }
+
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getBatch() {
         return this.batch;
     }
+
     public void setBatch(String batch) {
         this.batch = batch;
     }
+
     public String getUserNum() {
         return this.userNum;
     }
+
     public void setUserNum(String userNum) {
         this.userNum = userNum;
     }
+
     public String getUserName() {
         return this.userName;
     }
+
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
     public String getWaterMeterNum() {
         return this.waterMeterNum;
     }
+
     public void setWaterMeterNum(String waterMeterNum) {
         this.waterMeterNum = waterMeterNum;
     }
+
     public int getWaterMeterCaliber() {
         return this.waterMeterCaliber;
     }
+
     public void setWaterMeterCaliber(int waterMeterCaliber) {
         this.waterMeterCaliber = waterMeterCaliber;
     }
+
     public String getUseWaterProperties() {
         return this.useWaterProperties;
     }
+
     public void setUseWaterProperties(String useWaterProperties) {
         this.useWaterProperties = useWaterProperties;
     }
+
     public String getQbNum() {
         return this.qbNum;
     }
+
     public void setQbNum(String qbNum) {
         this.qbNum = qbNum;
     }
+
     public String getUserAddr() {
         return this.userAddr;
     }
+
     public void setUserAddr(String userAddr) {
         this.userAddr = userAddr;
     }
+
     public String getCreateTime() {
         return this.createTime;
     }
+
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
     public String getCreateUser() {
         return this.createUser;
     }
+
     public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
+
     public String getLongitude() {
         return this.longitude;
     }
+
     public void setLongitude(String longitude) {
         this.longitude = longitude;
     }
+
     public String getLatitude() {
         return this.latitude;
     }
+
     public void setLatitude(String latitude) {
         this.latitude = latitude;
     }
+
     public String getInternetIdCard() {
         return this.internetIdCard;
     }
+
     public void setInternetIdCard(String internetIdCard) {
         this.internetIdCard = internetIdCard;
     }
+
     public String getInstallPosition() {
         return this.installPosition;
     }
+
     public void setInstallPosition(String installPosition) {
         this.installPosition = installPosition;
     }
+
     public Long getTaskId() {
         return this.taskId;
     }
+
     public void setTaskId(Long taskId) {
         this.taskId = taskId;
     }
+
     public String getBrand() {
         return this.brand;
     }
+
     public void setBrand(String brand) {
         this.brand = brand;
     }
+
     public String getInstallTime() {
         return this.installTime;
     }
+
     public void setInstallTime(String installTime) {
         this.installTime = installTime;
     }
+
     public String getType() {
         return this.type;
     }
+
     public void setType(String type) {
         this.type = type;
     }
+
     public String getRecentMark() {
         return this.recentMark;
     }
+
     public void setRecentMark(String recentMark) {
         this.recentMark = recentMark;
     }
+
     public String getCheckUser() {
         return this.checkUser;
     }
+
     public void setCheckUser(String checkUser) {
         this.checkUser = checkUser;
     }
+
     public String getNavigationId() {
         return this.navigationId;
     }
+
     public void setNavigationId(String navigationId) {
         this.navigationId = navigationId;
     }
+
     public int getState() {
         return this.state;
     }
+
     public void setState(int state) {
         this.state = state;
     }
+
     public String getDetailsState() {
         return this.detailsState;
     }
+
     public void setDetailsState(String detailsState) {
         this.detailsState = detailsState;
     }
+
     public List<FileBean> getBpFileList() {
         return this.bpFileList;
     }
+
     public void setBpFileList(List<FileBean> bpFileList) {
         this.bpFileList = bpFileList;
     }
+
     public List<FileBean> getExceptionFileList() {
         return this.exceptionFileList;
     }
+
     public void setExceptionFileList(List<FileBean> exceptionFileList) {
         this.exceptionFileList = exceptionFileList;
     }
+
     public List<FileBean> getWfbdFileList() {
         return this.wfbdFileList;
     }
+
     public void setWfbdFileList(List<FileBean> wfbdFileList) {
         this.wfbdFileList = wfbdFileList;
     }
+
     public KbdDescribesBean getKbdDescribes() {
         return this.kbdDescribes;
     }
+
     public void setKbdDescribes(KbdDescribesBean kbdDescribes) {
         this.kbdDescribes = kbdDescribes;
     }
+
     public KbdDescribesBean getWfDescribes() {
         return this.wfDescribes;
     }
+
     public void setWfDescribes(KbdDescribesBean wfDescribes) {
         this.wfDescribes = wfDescribes;
     }
 
+    public String getAddressDetails() {
+        return this.addressDetails;
+    }
+
+    public void setAddressDetails(String addressDetails) {
+        this.addressDetails = addressDetails;
+    }
+
+    public String getWaterMeterXh() {
+        return this.waterMeterXh;
+    }
+
+    public void setWaterMeterXh(String waterMeterXh) {
+        this.waterMeterXh = waterMeterXh;
+    }
+
+    public String getMeterNum() {
+        return this.meterNum;
+    }
+
+    public void setMeterNum(String meterNum) {
+        this.meterNum = meterNum;
+    }
+
+    public String getWaterMeterRange() {
+        return this.waterMeterRange;
+    }
+
+    public void setWaterMeterRange(String waterMeterRange) {
+        this.waterMeterRange = waterMeterRange;
+    }
+
     public boolean isIscheck() {
         return ischeck;
     }

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

@@ -105,7 +105,7 @@ public class ImageTextNavitActivity extends PhotoActivity {
         dtAdapter = new BigPictureAdapter(dtPhoneList, isDelect, filePathBean -> {
         });
         RecyclerViewUtils.initGrid(this, binding.rvPictureDt, 3, dtAdapter);
-        if (dtPhoneList.size() == 0) {
+        if (dtPhoneList.isEmpty()) {
             binding.rvPictureDt.setVisibility(View.GONE);
         } else {
             binding.rvPictureDt.setVisibility(View.VISIBLE);

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

@@ -8,10 +8,12 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.CheckBox;
+import android.widget.DatePicker;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -48,6 +50,7 @@ import com.tofly.yxpc.utils.db.DaoUtilsStore;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -260,6 +263,7 @@ public class WaterCheckFragment extends PhotoFragment {
             }
         });
         binding.cbBase.setOnClickListener(v -> binding.llBase.setVisibility(binding.cbBase.isChecked() ? View.VISIBLE : View.GONE));
+        binding.cbSbwz.setOnClickListener(v -> binding.llSbwz.setVisibility(binding.cbSbwz.isChecked() ? View.VISIBLE : View.GONE));
         binding.cbDetail.setOnClickListener(v -> binding.llDetail.setVisibility(binding.cbDetail.isChecked() ? View.VISIBLE : View.GONE));
         binding.cbAbnormal.setOnClickListener(v -> binding.llAbnormal.setVisibility(binding.cbAbnormal.isChecked() ? View.VISIBLE : View.GONE));
         binding.cbNavit.setOnClickListener(v -> binding.llNavit.setVisibility(binding.cbNavit.isChecked() ? View.VISIBLE : View.GONE));
@@ -362,8 +366,8 @@ public class WaterCheckFragment extends PhotoFragment {
 
     private void loadData() {
         if (waterMeterEntity != null) {
-            binding.edInstallTime.setText(waterMeterEntity.getInstallTime() == null ? "" : waterMeterEntity.getInstallTime());
-          //  initNavit(waterMeterEntity.getId(), false);
+            binding.tvInstallTime.setText(waterMeterEntity.getInstallTime() == null ? "" : waterMeterEntity.getInstallTime());
+            //  initNavit(waterMeterEntity.getId(), false);
             binding.edInternetIdCard.setText(waterMeterEntity.getInternetIdCard() == null ? "" : waterMeterEntity.getInternetIdCard());
             binding.edInstallPosition.setText("经度:" + waterMeterEntity.getLongitude() + " 纬度:" + waterMeterEntity.getLatitude());
             if (!TextUtils.isEmpty(waterMeterEntity.getLongitude()) && !TextUtils.isEmpty(waterMeterEntity.getLatitude())) {
@@ -373,7 +377,7 @@ public class WaterCheckFragment extends PhotoFragment {
             binding.tvUserName.setText(waterMeterEntity.getUserName() == null ? "" : waterMeterEntity.getUserName());
             binding.edWaterMeterNum.setText(waterMeterEntity.getWaterMeterNum() == null ? "" : waterMeterEntity.getWaterMeterNum());
             binding.edQbNum.setText(waterMeterEntity.getQbNum() == null ? "" : waterMeterEntity.getQbNum());
-            binding.edUserAddr.setText(waterMeterEntity.getUserAddr() == null ? "" : waterMeterEntity.getUserAddr());
+            binding.tvUserAddr.setText(waterMeterEntity.getUserAddr() == null ? "" : waterMeterEntity.getUserAddr());
             binding.edRecentMark.setText(waterMeterEntity.getRecentMark() == null ? "" : waterMeterEntity.getRecentMark());
             binding.edWaterMeterCaliber.setText(String.valueOf(waterMeterEntity.getWaterMeterCaliber()));
             if (waterMeterEntity.getKbdDescribes() != null && waterMeterEntity.getKbdDescribes().getExceptionDescribe() != null) {
@@ -413,24 +417,53 @@ public class WaterCheckFragment extends PhotoFragment {
                 binding.llAbnormal.addView(checkBox, dictEntityList.indexOf(dictEntity));
             }
 
-            binding.edInstallTime.setOnTouchListener((view, motionEvent) -> {
+            binding.tvInstallTime.setOnClickListener(v -> {
                 if (MyApp.getInstance().isOverTime()) {
-                    DialogDateUtils.datePickerDialog(getContext(), binding.edInstallTime.getText().toString(), 2, date -> {
-                        binding.edInstallTime.setText(date);
-                        waterMeterEntity.setInstallTime(date);
-                        binding.edInstallTime.setSelection(date.length());
-                    });
+                    doDate(binding.tvInstallTime.getText().toString());
                 }
-                return false;
             });
             if (waterMeterEntity.getState() == 3) {
                 binding.layout.setVisibility(View.GONE);
             } else {
                 binding.layout.setVisibility(View.VISIBLE);
             }
+
+            binding.etDetailAddr.setText(waterMeterEntity.getAddressDetails() == null ? "" : waterMeterEntity.getAddressDetails());
+            binding.edSbxh.setText(waterMeterEntity.getWaterMeterXh() == null ? "" : waterMeterEntity.getWaterMeterXh());
+            binding.edBwbh.setText(waterMeterEntity.getMeterNum() == null ? "" : waterMeterEntity.getMeterNum());
+            binding.edSblc.setText(waterMeterEntity.getWaterMeterRange() == null ? "" : waterMeterEntity.getWaterMeterRange());
         }
     }
 
+    private void doDate(String date) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(requireContext());
+        View view = getLayoutInflater().inflate(R.layout.dialog_date, null);
+        DatePicker datePicker = view.findViewById(R.id.date_picker);
+        //设置日期简略显示 否则详细显示 包括:星期\周
+        datePicker.setCalendarViewShown(false);
+        //初始化当前日期
+        Calendar calendar = Calendar.getInstance();
+        if (!TextUtils.isEmpty(date)) {
+            calendar.setTimeInMillis(DateUtils.getStrTimeLong(date + " 00:00:00"));
+        } else {
+            calendar.setTimeInMillis(System.currentTimeMillis());
+        }
+        datePicker.init(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), null);
+        //设置date布局
+        builder.setView(view);
+        builder.setTitle("设置日期信息");
+        builder.setPositiveButton("确  定", (dialog, which) -> {
+            StringBuilder sb = new StringBuilder();
+            sb.append(String.format("%d-%02d-%02d", datePicker.getYear(), datePicker.getMonth() + 1, datePicker.getDayOfMonth()));
+            binding.tvInstallTime.setText(sb.toString());
+            waterMeterEntity.setInstallTime(sb.toString());
+            dialog.dismiss();
+        });
+
+        builder.setNegativeButton("取  消", (dialog, which) -> dialog.dismiss());
+        builder.create().show();
+    }
+
     private void initNavit(Long waterId, boolean isSave) {
         TwdhEntity navit = null;
         List<TwdhEntity> twdhEntityList = DaoUtilsStore.getInstance().getTwdhEntityDbUtils().queryAll();
@@ -516,7 +549,7 @@ public class WaterCheckFragment extends PhotoFragment {
     }
 
     private void updataWaterMeter() {
-      //  updateTwdh();
+        //  updateTwdh();
 
         Map map = JSONObject.parseObject(JSON.toJSONString(waterMeterEntity), HashMap.class);
         List<File> files1 = new ArrayList<>();
@@ -576,12 +609,16 @@ public class WaterCheckFragment extends PhotoFragment {
             waterMeterEntity.setLongitude(String.valueOf(locationUtilXuNew.Longtitude));
             waterMeterEntity.setLatitude(String.valueOf(locationUtilXuNew.Latitude));
         }
+        waterMeterEntity.setAddressDetails(binding.etDetailAddr.getText().toString());
+        waterMeterEntity.setWaterMeterXh(binding.edSbxh.getText().toString());
+        waterMeterEntity.setMeterNum(binding.edBwbh.getText().toString());
+        waterMeterEntity.setWaterMeterRange(binding.edSblc.getText().toString());
         waterMeterEntity.setInternetIdCard(binding.edInternetIdCard.getText().toString());
         waterMeterEntity.setInstallPosition(binding.edInstallPosition1.getText().toString());
         waterMeterEntity.setWaterMeterNum(binding.edWaterMeterNum.getText().toString());
         waterMeterEntity.setRecentMark(binding.edRecentMark.getText().toString());
         waterMeterEntity.setQbNum(binding.edQbNum.getText().toString());
-        waterMeterEntity.setUserAddr(binding.edUserAddr.getText().toString());
+        waterMeterEntity.setUserAddr(binding.tvUserAddr.getText().toString());
         waterMeterEntity.setBpFileList(bpPhotoList);
         waterMeterEntity.setNavigationId(navitId == null ? "" : String.valueOf(navitId));
         if (!TextUtils.isEmpty(binding.edWaterMeterCaliber.getText().toString())) {
@@ -630,10 +667,14 @@ public class WaterCheckFragment extends PhotoFragment {
             onMessage("请输入正确水表口径");
             return false;
         }
-        if (TextUtils.isEmpty(binding.edUserAddr.getText())) {
+        if (TextUtils.isEmpty(binding.tvUserAddr.getText())) {
             onMessage("请输入用户地址");
             return false;
         }
+        if (TextUtils.isEmpty(binding.etDetailAddr.getText())) {
+            onMessage("请输入详细地址");
+            return false;
+        }
         if (bpPhotoList.isEmpty()) {
             onMessage("请添加表盘照片");
             return false;
@@ -667,7 +708,7 @@ public class WaterCheckFragment extends PhotoFragment {
             if (MyApp.getInstance().isOverTime() && lo != null) {
                 moveOrigin(lo.Longtitude, lo.Latitude, aMap.getCameraPosition().zoom);
                 if (!TextUtils.isEmpty(lo.addr)) {
-                    binding.edUserAddr.setText(lo.addr);
+                    binding.tvUserAddr.setText(lo.addr);
                 }
             }
         });
@@ -679,7 +720,7 @@ public class WaterCheckFragment extends PhotoFragment {
                     , Double.parseDouble(waterMeterEntity.getLatitude()), waterMeterEntity.getUserAddr());
             moveOrigin(locationUtilXuNew.Longtitude, locationUtilXuNew.Latitude, 20);
             if (!TextUtils.isEmpty(locationUtilXuNew.addr)) {
-                binding.edUserAddr.setText(locationUtilXuNew.addr);
+                binding.tvUserAddr.setText(locationUtilXuNew.addr);
             }
         }
     }
@@ -699,7 +740,7 @@ public class WaterCheckFragment extends PhotoFragment {
         locationUtilXuNew = info;
         binding.edInstallPosition.setText("经度:" + locationUtilXuNew.Longtitude + " 纬度:" + locationUtilXuNew.Latitude);
         if (!TextUtils.isEmpty(locationUtilXuNew.addr)) {
-            binding.edUserAddr.setText(locationUtilXuNew.addr);
+            binding.tvUserAddr.setText(locationUtilXuNew.addr);
         }
     }
 
@@ -715,7 +756,7 @@ public class WaterCheckFragment extends PhotoFragment {
                     moveOrigin(locationUtilXuNew.Longtitude, locationUtilXuNew.Latitude, aMap.getCameraPosition().zoom);
                     binding.edInstallPosition.setText("经度:" + locationUtilXuNew.Longtitude + " 纬度:" + locationUtilXuNew.Latitude);
                     if (!TextUtils.isEmpty(locationUtilXuNew.addr)) {
-                        binding.edUserAddr.setText(locationUtilXuNew.addr);
+                        binding.tvUserAddr.setText(locationUtilXuNew.addr);
                     }
                 }
             }

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

@@ -93,7 +93,6 @@
                 android:layout_marginStart="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_20"
                 android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -128,86 +127,9 @@
             <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_10"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                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" />
-
-                <EditText
-                    android:id="@+id/ed_install_position"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    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" />
-
-            <include
-                android:id="@+id/ll_map"
-                layout="@layout/view_map"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_160"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_18" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_10"
+                android:layout_margin="@dimen/dp_10"
                 android:background="@color/line_gray" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_17"
-                android:layout_marginBottom="@dimen/dp_17"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <View
-                    android:layout_width="@dimen/dp_4"
-                    android:layout_height="@dimen/dp_20"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_6"
-                    android:background="@color/blue" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="水表稽查"
-                    android:textColor="@color/color_333"
-                    android:textSize="@dimen/sp_20" />
-            </LinearLayout>
-
             <CheckBox
                 android:id="@+id/cb_base"
                 android:layout_width="match_parent"
@@ -232,7 +154,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -275,7 +196,7 @@
                     android:layout_marginStart="@dimen/dp_10"
                     android:layout_marginTop="@dimen/dp_14"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_15"
+                    android:layout_marginBottom="@dimen/dp_13"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -298,32 +219,48 @@
                         tools:text="实验小学" />
                 </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" />
+                <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">
 
-            <LinearLayout
-                android:id="@+id/ll_detail"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                    <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" />
+
+                    <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>
+
+                <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"
@@ -338,12 +275,12 @@
                     <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"
+                        android:id="@+id/ed_qb_num"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
@@ -376,20 +313,19 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="水表口径(mm)"
+                        android:layout_centerVertical="true"
+                        android:text="立户时间"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <EditText
-                        android:id="@+id/ed_water_meter_caliber"
+                    <TextView
+                        android:id="@+id/tv_install_time"
                         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:inputType="number"
                         android:textColor="@color/color_333"
                         android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
@@ -402,70 +338,126 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:background="@color/line_gray" />
 
-                <RelativeLayout
+            </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">
+
+                <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/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" />
 
-                    <androidx.appcompat.widget.AppCompatSpinner
-                        android:id="@+id/spinner_water_type"
+                    <TextView
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_40"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                        android:layout_height="wrap_content"
+                        android:text=" (支持上传多张)"
+                        android:textColor="@color/color_999"
+                        android:textSize="@dimen/sp_16" />
 
-                <View
+                    <View
+                        android:layout_width="0dp"
+                        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: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="@dimen/dp_1"
+                    android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false" />
+
+                <include
+                    android:id="@+id/ll_map"
+                    layout="@layout/view_map"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_160"
                     android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:background="@color/line_gray" />
+                    android:layout_marginBottom="@dimen/dp_18" />
 
-                <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_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: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_40"
-                        android:layout_alignParentRight="true"
+                    <EditText
+                        android:id="@+id/ed_install_position"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_weight="1"
                         android:background="@null"
-                        android:gravity="right"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                        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"
@@ -474,7 +466,7 @@
                     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"
@@ -487,21 +479,29 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:text="用水性质"
+                        android:text="*"
+                        android:textColor="@color/red"
+                        android:textSize="@dimen/sp_16"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        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_40"
-                        android:layout_alignParentRight="true"
-                        android:background="@null"
-                        android:minWidth="@dimen/dp_150"
-                        android:paddingHorizontal="@dimen/dp_20"
-                        android:spinnerMode="dropdown" />
-                </RelativeLayout>
+                    <TextView
+                        android:id="@+id/tv_user_addr"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/dp_10"
+                        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"
@@ -510,25 +510,32 @@
                     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/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/ed_install_time"
+                        android:id="@+id/et_detail_addr"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
@@ -539,7 +546,8 @@
                         android:textColor="@color/color_333"
                         android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
-                </RelativeLayout>
+
+                </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -561,12 +569,12 @@
                     <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:id="@+id/ed_install_position1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
@@ -574,8 +582,6 @@
                         android:drawableEnd="@mipmap/icon_edit"
                         android:drawablePadding="@dimen/dp_10"
                         android:gravity="end"
-                        android:inputType="number"
-                        android:text="0"
                         android:textColor="@color/color_333"
                         android:textColorHint="@color/color_333"
                         android:textSize="@dimen/sp_16" />
@@ -602,12 +608,12 @@
                     <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_qb_num"
+                        android:id="@+id/ed_sbxh"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
@@ -615,6 +621,7 @@
                         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" />
@@ -641,19 +648,71 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="*"
-                        android:textColor="@color/red"
+                        android:text="表位编号"
+                        android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
+                    <EditText
+                        android:id="@+id/ed_bwbh"
+                        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:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <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"
+                    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:text="水表表身号"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                     <EditText
-                        android:id="@+id/ed_user_addr"
+                        android:id="@+id/ed_water_meter_num"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
@@ -674,25 +733,60 @@
                     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" />
+
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_brand"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_20"
+                        android:layout_alignParentRight="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" />
+
+                <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:text="水表口径(mm)"
                         android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
                     <EditText
-                        android:id="@+id/ed_install_position1"
+                        android:id="@+id/ed_water_meter_caliber"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
@@ -700,11 +794,47 @@
                         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:textSize="@dimen/sp_16" />
+                </RelativeLayout>
 
-                </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" />
+
+                    <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"
@@ -726,45 +856,66 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="*"
-                        android:textColor="@color/red"
+                        android:text="水表量程"
+                        android:textColor="@color/color_333"
                         android:textSize="@dimen/sp_16" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <EditText
+                        android:id="@+id/ed_sblc"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="表盘照片"
+                        android:layout_marginStart="@dimen/dp_10"
+                        android:background="@null"
+                        android:drawableEnd="@mipmap/icon_edit"
+                        android:drawablePadding="@dimen/dp_10"
+                        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"
+                    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:text=" (支持上传多张)"
-                        android:textColor="@color/color_999"
+                        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" />
-
-                    <ImageView
-                        android:id="@+id/img_bp_photo"
-                        android:layout_width="wrap_content"
+                    <EditText
+                        android:id="@+id/ed_recent_mark"
+                        android:layout_width="match_parent"
                         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_10"
+                        android:background="@null"
+                        android:drawableEnd="@mipmap/icon_edit"
+                        android:drawablePadding="@dimen/dp_10"
+                        android:gravity="end"
+                        android:inputType="number"
+                        android:text="0"
+                        android:textColor="@color/color_333"
+                        android:textColorHint="@color/color_333"
+                        android:textSize="@dimen/sp_16" />
 
                 </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
@@ -797,7 +948,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
                     android:layout_marginTop="@dimen/dp_20"
-                    android:text="描述"
+                    android:text="异常描述"
                     android:textColor="@color/color_333"
                     android:textSize="@dimen/sp_16" />
 
@@ -811,7 +962,7 @@
                     android:layout_marginBottom="@dimen/dp_10"
                     android:background="@drawable/frame_gray"
                     android:gravity="start"
-                    android:hint="请输入描述"
+                    android:hint="描述内容"
                     android:minHeight="@dimen/dp_78"
                     android:padding="@dimen/dp_8"
                     android:textColor="@color/color_888"
@@ -881,18 +1032,18 @@
                 android:minHeight="@dimen/dp_40"
                 android:paddingStart="@dimen/dp_10"
                 android:paddingEnd="@dimen/dp_13"
-                android:visibility="gone"
                 android:text="图文导航"
                 android:textColor="@color/color_333"
-                android:textSize="@dimen/sp_20" />
+                android:textSize="@dimen/sp_20"
+                android:visibility="gone" />
 
             <LinearLayout
                 android:id="@+id/ll_navit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone"
                 android:layout_marginBottom="@dimen/dp_20"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
                 <RelativeLayout
                     android:layout_width="match_parent"

graffiti/src/main/res/layout/dialog_date.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dip">
+
+    <DatePicker
+        android:id="@+id/date_picker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="5dip"
+        android:calendarViewShown="false"
+        android:datePickerMode="spinner"/>
+
+</LinearLayout>