Browse Source

调整已提交时间

ychk 5 months ago
parent
commit
60ff63d5a8

+ 1 - 1
app/build.gradle

@@ -48,7 +48,7 @@ android {
     }
 
     greendao {
-        schemaVersion 9 //数据库版本号
+        schemaVersion 10 //数据库版本号
         daoPackage 'com.tofly.yxpc.greenDao'
         // 设置DaoMaster、DaoSession、Dao 包名
         targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录,请注意,这里路径用/不要用.

+ 12 - 12
app/src/main/java/com/tofly/yxpc/entity/SbdjEntity.java

@@ -56,7 +56,7 @@ public class SbdjEntity {
     /**
      * 稽查时间
      */
-    private String inspect_time;
+    private String inspectTime;
     /**
      * 稽查人员
      */
@@ -98,7 +98,7 @@ public class SbdjEntity {
     @JSONField(serialize = false)
     private boolean isOnline;
 
-    @Generated(hash = 1625315922)
+    @Generated(hash = 1077158174)
     public SbdjEntity(Long id, String type, String describe, String position,
             String longitude, String latitude, String batch, String userNum,
             String userName, String waterMeterNum, String waterMeterCaliber,
@@ -106,7 +106,7 @@ public class SbdjEntity {
             String createTime, String waterType, String createUser,
             String internetIdCard, String installPosition, String brand,
             String installTime, String recentMark, String checkUser,
-            String inspect_time, String inspect_user, String checkId,
+            String inspectTime, String inspect_user, String checkId,
             List<FileBean> fileList, List<FileBean> bpFileList,
             String addressDetails, String waterMeterXh, String meterNum,
             String waterMeterRange, String regionName, String regionCode,
@@ -134,7 +134,7 @@ public class SbdjEntity {
         this.installTime = installTime;
         this.recentMark = recentMark;
         this.checkUser = checkUser;
-        this.inspect_time = inspect_time;
+        this.inspectTime = inspectTime;
         this.inspect_user = inspect_user;
         this.checkId = checkId;
         this.fileList = fileList;
@@ -337,14 +337,6 @@ public class SbdjEntity {
         this.checkUser = checkUser;
     }
 
-    public String getInspect_time() {
-        return this.inspect_time;
-    }
-
-    public void setInspect_time(String inspect_time) {
-        this.inspect_time = inspect_time;
-    }
-
     public String getInspect_user() {
         return this.inspect_user;
     }
@@ -448,4 +440,12 @@ public class SbdjEntity {
     public void setIsOnline(boolean isOnline) {
         this.isOnline = isOnline;
     }
+
+    public String getInspectTime() {
+        return this.inspectTime;
+    }
+
+    public void setInspectTime(String inspectTime) {
+        this.inspectTime = inspectTime;
+    }
 }

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

@@ -83,9 +83,9 @@ public class UnRegisterActivity extends PhotoActivity {
             bpPhotoList.add(fileBean);
             bpPictureAdapter.notifyDataSetChanged();
             if (bpPhotoList.isEmpty()) {
-                binding.llUnregisterWater.rvListBp.setVisibility(View.GONE);
+                binding.rvListBp.setVisibility(View.GONE);
             } else {
-                binding.llUnregisterWater.rvListBp.setVisibility(View.VISIBLE);
+                binding.rvListBp.setVisibility(View.VISIBLE);
             }
         } else {
             phoneList.add(fileBean);
@@ -197,8 +197,8 @@ public class UnRegisterActivity extends PhotoActivity {
             brandList.add(entity.getItemText());
             brandIdList.add(entity.getId());
         }
-        SpinnerUtils.initSpinner(this, binding.llUnregisterWater.spinnerBrand, brandList);
-        binding.llUnregisterWater.spinnerBrand.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        SpinnerUtils.initSpinner(this, binding.spinnerBrand, brandList);
+        binding.spinnerBrand.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long aaa) {
                 if (sbdjEntity != null) {
@@ -219,8 +219,8 @@ public class UnRegisterActivity extends PhotoActivity {
             calibarList.add(entity.getItemText());
             calibarIdList.add(entity.getId());
         }
-        SpinnerUtils.initSpinner(this, binding.llUnregisterWater.spinnerWaterCaliber, calibarList);
-        binding.llUnregisterWater.spinnerWaterCaliber.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        SpinnerUtils.initSpinner(this, binding.spinnerWaterCaliber, calibarList);
+        binding.spinnerWaterCaliber.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long aaa) {
                 if (sbdjEntity != null) {
@@ -241,8 +241,8 @@ public class UnRegisterActivity extends PhotoActivity {
             typeList.add(entity.getItemText());
             typeIdList.add(entity.getId());
         }
-        SpinnerUtils.initSpinner(this, binding.llUnregisterWater.spinnerWaterType, typeList);
-        binding.llUnregisterWater.spinnerWaterType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        SpinnerUtils.initSpinner(this, binding.spinnerWaterType, typeList);
+        binding.spinnerWaterType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long aaa) {
                 if (sbdjEntity != null) {
@@ -265,8 +265,8 @@ public class UnRegisterActivity extends PhotoActivity {
                 sblcIdList.add(entity.getId());
             }
         }
-        SpinnerUtils.initSpinner(this, binding.llUnregisterWater.spinnerSblc, sblcList);
-        binding.llUnregisterWater.spinnerSblc.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        SpinnerUtils.initSpinner(this, binding.spinnerSblc, sblcList);
+        binding.spinnerSblc.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long aaa) {
                 if (sbdjEntity != null) {
@@ -288,8 +288,8 @@ public class UnRegisterActivity extends PhotoActivity {
             natureList.add(entity.getItemText());
             natureIdList.add(entity.getId());
         }
-        SpinnerUtils.initSpinner(this, binding.llUnregisterWater.spinnerUseWaterProperties, natureList);
-        binding.llUnregisterWater.spinnerUseWaterProperties.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        SpinnerUtils.initSpinner(this, binding.spinnerUseWaterProperties, natureList);
+        binding.spinnerUseWaterProperties.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long aaa) {
                 if (sbdjEntity != null) {
@@ -312,7 +312,7 @@ public class UnRegisterActivity extends PhotoActivity {
         bpPictureAdapter = new BigPictureAdapter(bpPhotoList, true, size -> {
 
         });
-        RecyclerViewUtils.initGrid(this, binding.llUnregisterWater.rvListBp, 3, bpPictureAdapter);
+        RecyclerViewUtils.initGrid(this, binding.rvListBp, 3, bpPictureAdapter);
 
         phoneList.clear();
         adapter = new BigPictureAdapter(phoneList, true, filePathBean -> {
@@ -343,7 +343,7 @@ public class UnRegisterActivity extends PhotoActivity {
                 onMessage("图片数量超过限制");
             }
         });
-        binding.llUnregisterWater.imgBpPhoto.setOnClickListener(v -> {
+        binding.imgBpPhoto.setOnClickListener(v -> {
             if (bpPhotoList.size() < 9) {
                 photoType = 0;
                 showPhoto(false);
@@ -387,7 +387,7 @@ public class UnRegisterActivity extends PhotoActivity {
 
         binding.cbSbwz.setOnClickListener(v -> binding.llSbwz.setVisibility(binding.cbSbwz.isChecked() ? View.VISIBLE : View.GONE));
         binding.llUnregisterWater.cbBase.setOnClickListener(v -> binding.llUnregisterWater.llBase.setVisibility(binding.llUnregisterWater.cbBase.isChecked() ? View.VISIBLE : View.GONE));
-        binding.llUnregisterWater.cbDetail.setOnClickListener(v -> binding.llUnregisterWater.llDetail.setVisibility(binding.llUnregisterWater.cbDetail.isChecked() ? View.VISIBLE : View.GONE));
+        binding.cbDetail.setOnClickListener(v -> binding.llDetail.setVisibility(binding.cbDetail.isChecked() ? View.VISIBLE : View.GONE));
 
         binding.llUnregisterWater.tvSao.setOnClickListener(view -> {
             qcType = 0;
@@ -484,36 +484,36 @@ public class UnRegisterActivity extends PhotoActivity {
             binding.llUnregisterWater.edQbNum.setText(sbdjEntity.getQbNum() == null ? "" : sbdjEntity.getQbNum());
             binding.llUnregisterWater.tvInstallTime.setText(sbdjEntity.getInstallTime() == null ? "" : sbdjEntity.getInstallTime());
 
-            binding.llUnregisterWater.edWaterMeterNum.setText(sbdjEntity.getWaterMeterNum() == null ? "" : sbdjEntity.getWaterMeterNum());
+            binding.edWaterMeterNum.setText(sbdjEntity.getWaterMeterNum() == null ? "" : sbdjEntity.getWaterMeterNum());
             if (!TextUtils.isEmpty(sbdjEntity.getBrand())) {
                 int index = brandIdList.indexOf(sbdjEntity.getBrand());
-                binding.llUnregisterWater.spinnerBrand.setSelection(index);
+                binding.spinnerBrand.setSelection(index);
             }
             if (!TextUtils.isEmpty(sbdjEntity.getWaterMeterCaliber())) {
                 int index = calibarIdList.indexOf(sbdjEntity.getWaterMeterCaliber());
-                binding.llUnregisterWater.spinnerWaterCaliber.setSelection(index);
+                binding.spinnerWaterCaliber.setSelection(index);
             }
             if (!TextUtils.isEmpty(sbdjEntity.getWaterType())) {
                 int index = typeIdList.indexOf(sbdjEntity.getWaterType());
-                binding.llUnregisterWater.spinnerWaterType.setSelection(index);
+                binding.spinnerWaterType.setSelection(index);
             }
             if (!TextUtils.isEmpty(sbdjEntity.getWaterMeterRange())) {
                 int index = sblcIdList.indexOf(sbdjEntity.getWaterMeterRange());
-                binding.llUnregisterWater.spinnerSblc.setSelection(index);
+                binding.spinnerSblc.setSelection(index);
             }
             if (!TextUtils.isEmpty(sbdjEntity.getUseWaterProperties())) {
                 int index = natureIdList.indexOf(sbdjEntity.getUseWaterProperties()) + 1;
-                binding.llUnregisterWater.spinnerUseWaterProperties.setSelection(index);
+                binding.spinnerUseWaterProperties.setSelection(index);
             }
-            binding.llUnregisterWater.edRecentMark.setText(String.valueOf(sbdjEntity.getRecentMark() == null || "".equals(sbdjEntity.getRecentMark()) ? 0 : sbdjEntity.getRecentMark()));
-            binding.llUnregisterWater.edRemark.setText(sbdjEntity.getAddressDetails() == null ? "" : sbdjEntity.getAddressDetails());
+            binding.edRecentMark.setText(String.valueOf(sbdjEntity.getRecentMark() == null || "".equals(sbdjEntity.getRecentMark()) ? 0 : sbdjEntity.getRecentMark()));
+            binding.edRemark.setText(sbdjEntity.getAddressDetails() == null ? "" : sbdjEntity.getAddressDetails());
             if (sbdjEntity.getBpFileList() != null) {
                 bpPhotoList.addAll(sbdjEntity.getBpFileList());
                 bpPictureAdapter.setNewData(bpPhotoList);
                 if (bpPhotoList.isEmpty()) {
-                    binding.llUnregisterWater.rvListBp.setVisibility(View.GONE);
+                    binding.rvListBp.setVisibility(View.GONE);
                 } else {
-                    binding.llUnregisterWater.rvListBp.setVisibility(View.VISIBLE);
+                    binding.rvListBp.setVisibility(View.VISIBLE);
                 }
             }
 
@@ -628,14 +628,14 @@ public class UnRegisterActivity extends PhotoActivity {
             sbdjEntity.setInternetIdCard(binding.llUnregisterWater.edInternetIdCard.getText().toString());
             sbdjEntity.setUserNum(binding.llUnregisterWater.edUserNum.getText().toString());
             sbdjEntity.setUserName(binding.llUnregisterWater.edUserName.getText().toString());
-            sbdjEntity.setWaterMeterNum(binding.llUnregisterWater.edWaterMeterNum.getText().toString());
-            sbdjEntity.setRecentMark(binding.llUnregisterWater.edRecentMark.getText().toString());
+            sbdjEntity.setWaterMeterNum(binding.edWaterMeterNum.getText().toString());
+            sbdjEntity.setRecentMark(binding.edRecentMark.getText().toString());
             sbdjEntity.setQbNum(binding.llUnregisterWater.edQbNum.getText().toString());
             sbdjEntity.setBpFileList(bpPhotoList);
-            if (!TextUtils.isEmpty(binding.llUnregisterWater.edRecentMark.getText())) {
-                sbdjEntity.setRecentMark(binding.llUnregisterWater.edRecentMark.getText().toString());
+            if (!TextUtils.isEmpty(binding.edRecentMark.getText())) {
+                sbdjEntity.setRecentMark(binding.edRecentMark.getText().toString());
             }
-            sbdjEntity.setAddressDetails(binding.llUnregisterWater.edRemark.getText().toString());
+            sbdjEntity.setAddressDetails(binding.edRemark.getText().toString());
         } else {
             sbdjEntity.setInternetIdCard(null);
             sbdjEntity.setUserNum(null);
@@ -700,7 +700,7 @@ public class UnRegisterActivity extends PhotoActivity {
             onMessage("请添加照片信息");
             return false;
         }
-        if (baseUpdataEntity.getUserName().contains("非在册水表") && TextUtils.isEmpty(binding.llUnregisterWater.edWaterMeterNum.getText())) {
+        if (TextUtils.isEmpty(binding.edWaterMeterNum.getText())) {
             onMessage("请输入水表表身号");
             return false;
         }

+ 11 - 3
app/src/main/java/com/tofly/yxpc/ui/adapter/DataCheckSubmitAdapter.java

@@ -1,5 +1,7 @@
 package com.tofly.yxpc.ui.adapter;
 
+import android.text.TextUtils;
+
 import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -8,6 +10,7 @@ import com.tofly.yxpc.R;
 import com.tofly.yxpc.entity.WaterMeterEntity;
 
 import java.util.List;
+import java.util.Set;
 
 public class DataCheckSubmitAdapter extends BaseQuickAdapter<WaterMeterEntity, BaseViewHolder> {
 
@@ -31,7 +34,7 @@ public class DataCheckSubmitAdapter extends BaseQuickAdapter<WaterMeterEntity, B
                 helper.setText(R.id.tv_tvname2, "用户地址:");
                 helper.setText(R.id.tv_tvname1, "异常类型:");
                 helper.setGone(R.id.ll, true);
-           //     helper.setText(R.id.tv_electronic_identity, item.getExceptionType() == null ? "" : item.getExceptionType());
+                //     helper.setText(R.id.tv_electronic_identity, item.getExceptionType() == null ? "" : item.getExceptionType());
                 helper.setText(R.id.tv_table_number, item.getWaterMeterNum() == null ? "" : item.getWaterMeterNum());
                 break;
             case 2:
@@ -39,7 +42,7 @@ public class DataCheckSubmitAdapter extends BaseQuickAdapter<WaterMeterEntity, B
                 helper.setText(R.id.tv_tvname1, "情况类型:");
                 helper.setText(R.id.tv_tvname2, "用户地址:");
                 helper.setGone(R.id.ll, true);
-             //   helper.setText(R.id.tv_electronic_identity, item.getExceptionType());
+                //   helper.setText(R.id.tv_electronic_identity, item.getExceptionType());
                 helper.setText(R.id.tv_table_number, item.getWaterMeterNum() == null ? "" : item.getWaterMeterNum());
                 break;
             default:
@@ -47,7 +50,12 @@ public class DataCheckSubmitAdapter extends BaseQuickAdapter<WaterMeterEntity, B
         }
         helper.setText(R.id.tv_title, item.getUserName() == null ? "" : item.getUserName());
         helper.setText(R.id.tv_object_type, item.getUserAddr() == null ? "" : item.getUserAddr());
-        helper.setText(R.id.tv_time, item.getInstallTime() == null ? "" : item.getInstallTime().subSequence(5, item.getInstallTime().length() - 3));
+        if (item.getYxswWaterTaskDetails() != null && !item.getYxswWaterTaskDetails().isEmpty() && !TextUtils.isEmpty(item.getYxswWaterTaskDetails().get(0).getInspectTime())) {
+            String time = item.getYxswWaterTaskDetails().get(0).getInspectTime();
+            helper.setText(R.id.tv_time, time == null ? "" : time.subSequence(5, time.length() - 3));
+        } else {
+            helper.setText(R.id.tv_time, item.getCreateTime() == null ? "" : item.getCreateTime().subSequence(5, item.getCreateTime().length() - 3));
+        }
         helper.setBackgroundRes(R.id.img_state, R.mipmap.icon_submit);
     }
 }

+ 1 - 1
app/src/main/java/com/tofly/yxpc/ui/fragment/DataUnregisterSubmitAdapter.java

@@ -26,7 +26,7 @@ public class DataUnregisterSubmitAdapter extends BaseQuickAdapter<SbdjEntity, Ba
 
         helper.setText(R.id.tv_title, item.getUserName() == null ? "" : item.getUserName());
         helper.setText(R.id.tv_object_type, item.getUserAddr() == null ? "" : item.getUserAddr());
-        helper.setText(R.id.tv_time, item.getInstallTime() == null ? "" : item.getInstallTime().subSequence(5, item.getInstallTime().length() - 3));
+        helper.setText(R.id.tv_time, item.getInspectTime() == null ? "" : item.getInspectTime().subSequence(5, item.getInspectTime().length() - 3));
         helper.setBackgroundRes(R.id.img_state, R.mipmap.icon_submit);
 
     }

+ 418 - 2
app/src/main/res/layout/activity_unregister.xml

@@ -153,6 +153,422 @@
                 android:layout_marginTop="@dimen/dp_17"
                 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"
+                    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/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_water_meter_num"
+                        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_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"
+                    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/red"
+                        android:textSize="@dimen/sp_16" />
+
+                    <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" />
+
+                    <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: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" />
+
+                    <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
+                    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/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" />
+
+                    <View
+                        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: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"
+                        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: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
+                    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_333"
+                        android:textSize="@dimen/sp_16" />
+
+                    <EditText
+                        android:id="@+id/ed_recent_mark"
+                        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_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"
+                    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" />
+
+                    <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: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" />
+
+                    <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: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" />
+
+                    <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="wrap_content"
+                    android:nestedScrollingEnabled="false" />
+
+            </LinearLayout>
+
             <CheckBox
                 android:id="@+id/cb_sbwz"
                 android:layout_width="match_parent"
@@ -176,6 +592,7 @@
                 android:id="@+id/ll_sbwz"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_10"
                 android:orientation="vertical">
 
                 <include
@@ -496,8 +913,7 @@
 
             <include
                 android:id="@+id/ll_unregister_water"
-                layout="@layout/layout_unregister_water"
-                android:visibility="visible" />
+                layout="@layout/layout_unregister_water" />
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>

+ 1 - 418
app/src/main/res/layout/layout_unregister_water.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ll_unregister_water"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -11,7 +10,7 @@
         android:id="@+id/ll_sbbd"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_17"
+        android:layout_marginTop="@dimen/dp_10"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -255,420 +254,4 @@
             android:background="@color/line_gray" />
     </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: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_water_meter_num"
-                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_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"
-            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/red"
-                android:textSize="@dimen/sp_16" />
-
-            <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" />
-
-            <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: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" />
-
-            <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
-            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/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" />
-
-            <View
-                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: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"
-                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: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
-            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_333"
-                android:textSize="@dimen/sp_16" />
-
-            <EditText
-                android:id="@+id/ed_recent_mark"
-                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_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"
-            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" />
-
-            <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: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" />
-
-            <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: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" />
-
-            <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="wrap_content"
-            android:nestedScrollingEnabled="false" />
-
-    </LinearLayout>
-
 </LinearLayout>