feat： 变更用户、单位、车辆信息更改

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java

@@ -49,8 +49,8 @@ public class MyRetrofit {
      * 回显地址：222.85.144.89:19002/xxxxxx
      */
 //    private final String BaseUrl = "http://58.16.58.161:19002/ifzt/api/";
-//    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
-    private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/"; //VPN访问请求地址
+    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
+//    private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/"; //VPN访问请求地址
 
     private final String FileUrl = "http://222.85.144.89:19003/ifzt/api/"; //文件服务
     private final String appId = "admin001";

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java

@@ -165,6 +165,6 @@ public class IFCode {
 
     public static final String IFCODE151 = "151";  //通过证件号 + 证件类型查询用户信息
     public static final String IFCODE520 = "520"; //个人用户信息变更
-    public static final String IFCODE33 = "23"; //单位信息变更
+    public static final String IFCODE33 = "33"; //单位信息变更
     public static final String IFCODE34 = "34";   //车辆信息变更
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java

@@ -271,6 +271,7 @@ public class ResultBean<T> {
         public String exTime; //出口站时间
         public String customerPosImgUrl; //开户人正面图片地址、营业执照
         public String customerNegImgUrl; //开户人反面图片地址
+        public String agentPosImgUrl; //经办人证面图片地址
         public String agentNegImgUrl; //经办人反面图片地址
         public String customerAddress; //开户人地址
         public String customerVid; //用户证件过期时间
@@ -290,6 +291,10 @@ public class ResultBean<T> {
         public String useCharacter; //车辆使用性质
         public String vin; //车辆识别代号
         public String engineNum; //发动机识别代号
+        public String ownerIdNum; //车主证件号码
+        public String ownerIdType; //车主证件类型
+        public String ownerPosImgUrl; //车主证件类型
+        public String ownerNegImgUrl; //车主证件类型
 
         private String appId = "52030131";
         private String openId = (String) MyShared.getInstance().get(MyShared.OPENID,"");
@@ -397,7 +402,6 @@ public class ResultBean<T> {
         private String aentTel;
         private String agentTel;
         private String agentIdVld;
-        private String agentPosImgUrl;
         private String proxyUrl;
         private String ownerName;
         private String ownerIdnum;

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/EditCarInfoStep2Activity.java

@@ -62,9 +62,8 @@ public class EditCarInfoStep2Activity extends AppActivity {
     //车辆图片
     private String carImg1;
     private String carImg2;
-    private String carImg3;
-    //车辆用户类型
-    private String carUserType;
+    //用户证件类型
+    private String userIdType;
     //车辆编号
     private String curVehicleId;
 
@@ -82,14 +81,9 @@ public class EditCarInfoStep2Activity extends AppActivity {
             curBizContent = JSON.parseObject(json, ResultBean.BizContent.class);
         }
 
-        binding.ivHome.setOnClickListener(this::onImage);
-        binding.ivSecondaryPage.setOnClickListener(this::onImage);
-        binding.ivLocomotive.setOnClickListener(this::onImage);
-
-        binding.et17.setOnClickListener(this::initClick);
-        binding.et9.setOnClickListener(this::initClick);
-        binding.et10.setOnClickListener(this::initClick);
-        binding.et18.setOnClickListener(this::initClick);
+        binding.ivHome.setOnClickListener(this::initClick);
+        binding.ivSecondaryPage.setOnClickListener(this::initClick);
+        binding.et19.setOnClickListener(this::initClick);
         binding.btnNext.setOnClickListener(this::initClick);
 
         if (curBizContent == null) return;
@@ -97,9 +91,8 @@ public class EditCarInfoStep2Activity extends AppActivity {
     }
 
     private void setDataToView() {
-        carImg1 = curBizContent.vehPosImgUrl;
-        carImg2 = curBizContent.vehNegImgUrl;
-        carImg3 = curBizContent.vehBodyUrl;
+        carImg1 = curBizContent.ownerPosImgUrl;
+        carImg2 = curBizContent.ownerNegImgUrl;
 
         if (!FunHelper.isEmpty(carImg1)) {
             GlideApp.with(getActivity()).load(carImg1).into(binding.ivHome);
@@ -109,78 +102,37 @@ public class EditCarInfoStep2Activity extends AppActivity {
             GlideApp.with(getActivity()).load(carImg2).into(binding.ivSecondaryPage);
         }
 
-        if (!FunHelper.isEmpty(carImg3)) {
-            GlideApp.with(getActivity()).load(carImg3).into(binding.ivLocomotive);
-        }
-
-        binding.et1.setText(FunHelper.isEmpty(curBizContent.getVehiclePlate()) ? "" : curBizContent.getVehiclePlate());
         binding.et2.setText(FunHelper.isEmpty(curBizContent.getOwnerName()) ? "" : curBizContent.getOwnerName());
-        binding.et3.setText(FunHelper.isEmpty(curBizContent.getVehicleType()) ? "" : curBizContent.getVehicleType());
-        binding.et4.setText(FunHelper.isEmpty(curBizContent.ownerAddress) ? "" : curBizContent.ownerAddress);
-        binding.et5.setText(FunHelper.isEmpty(curBizContent.useCharacter) ? "" : curBizContent.useCharacter); //TODO 没有枚举值
-        binding.et6.setText(FunHelper.isEmpty(curBizContent.getVehicleModel()) ? "" : curBizContent.getVehicleModel());
-        binding.et7.setText(FunHelper.isEmpty(curBizContent.vin) ? "" : curBizContent.vin);
-        binding.et8.setText(FunHelper.isEmpty(curBizContent.engineNum) ? "" : curBizContent.engineNum);
-        binding.et9.setText(FunHelper.isEmpty(curBizContent.registerDate) ? "" : curBizContent.registerDate);
-        binding.et10.setText(FunHelper.isEmpty(curBizContent.getIssueDate()) ? "" : curBizContent.getIssueDate());
-        binding.et11.setText(FunHelper.isEmpty(curBizContent.getApprovedCount()) ? "" : curBizContent.getApprovedCount());
-        binding.et12.setText(FunHelper.isEmpty(curBizContent.maintenaceMass) ? "" : curBizContent.maintenaceMass);
-        binding.et13.setText(FunHelper.isEmpty(curBizContent.getVehicleDimensions()) ? "" : curBizContent.getVehicleDimensions());
-        binding.et14.setText(FunHelper.isEmpty(curBizContent.totalMass) ? "" : curBizContent.totalMass);
-        binding.et15.setText(FunHelper.isEmpty(curBizContent.permittedWeight) ? "" : curBizContent.permittedWeight);
-        binding.et16.setText(FunHelper.isEmpty(curBizContent.permittedTowWeight) ? "" : curBizContent.permittedTowWeight);
-        binding.et17.setText(FunHelper.isEmpty(curBizContent.axleCount) ? "" : curBizContent.axleCount);
-        binding.et18.setText(FunHelper.isEmpty(curBizContent.customerType) ? "" : EnumBean.backValue(curBizContent.customerType, EnumBean.ID_TYPE));
-    }
-
-    private void showDateDialog(TextView textView) {
-        new DateDialog.Builder(this)
-                .setTitle(getString(R.string.date_title))
-                .setConfirm(getString(R.string.common_confirm))
-                .setCancel(getString(R.string.common_cancel))
-                .setListener((dialog, year, month, day) -> {
-                    textView.setText(year + "-" + month + "-" + day);
-                }).show();
+        binding.et4.setText(FunHelper.isEmpty(curBizContent.ownerIdNum) ? "" : curBizContent.ownerIdNum);
+        binding.et19.setText(FunHelper.isEmpty(curBizContent.ownerIdType) ? "" : EnumBean.backValue(curBizContent.ownerIdType, EnumBean.ID_TYPE));
     }
 
     @SingleClick
     private void initClick(View view) {
-        if (view == binding.et17) {//车轴数
-            List<String> data = Arrays.asList("2", "3", "4", "5", "6");
-            new MenuDialog.Builder(this).setGravity(Gravity.CENTER)
-                    .setList(data).setListener((MenuDialog.OnListener<String>) (dialog, position, string) -> binding.
-                    et17.setText(string))
-                    .show();
-        } else if (view == binding.et10) {//发证日期
-            showDateDialog(binding.et10);
-        } else if (view == binding.et9){//注册日期
-            showDateDialog(binding.et9);
-        }else if (view == binding.et18) {//车辆用户类型
-            IDTypeDialog.showCarUserTypeDialog(this, new IDTypeDialog.OnUserTypeCallbcak() {
-                @Override
-                public void onUserType(String userType, String userTypeValue) {
-                    binding.et18.setText(userType);
-                    carUserType = userTypeValue;
-                }
-            });
-        } else if (view == binding.btnNext) {//提交
+       if (view == binding.btnNext) {//提交
             checkParams();
+        }else if (view == binding.et19){//车主证件类型
+           IDTypeDialog.showIDTypeDialog(this, new IDTypeDialog.OnUserTypeCallbcak() {
+               @Override
+               public void onUserType(String userType, String userTypeValue) {
+                   binding.et19.setText(userType);
+                   userIdType = userTypeValue;
+               }
+           });
+        }else if(view == binding.ivSecondaryPage){//国徽面
+            onOCRImg(2,binding.ivSecondaryPage);
+        }else if (view == binding.ivHome){//人像面
+           onOCRImg(1,binding.ivHome);
         }
     }
 
     private void checkParams(){
-        if (FunHelper.isEmpty(carImg1) || FunHelper.isEmpty(carImg2) || FunHelper.isEmpty(carImg3)){
-            toast("请上传车辆相关图片");
+        if (FunHelper.isEmpty(carImg1) || FunHelper.isEmpty(carImg2)){
+            toast("请上传车主相关证件照");
             return;
         }
 
-        //|| empty(binding.et5,"使用性质")
-        if (empty(binding.et1,"车牌号") || empty(binding.et2,"所有人") || empty(binding.et3,"车辆类型")
-                || empty(binding.et4,"地址")  || empty(binding.et6,"品牌型号")
-                || empty(binding.et7,"车辆识别代码") || empty(binding.et8,"发动机号码") || empty(binding.et9,"注册日期")
-                || empty(binding.et10,"发证日期") || empty(binding.et11,"核定载人数") || empty(binding.et12,"整备质量")
-                || empty(binding.et13,"外廓尺寸") || empty(binding.et4,"总质量") || empty(binding.et15,"核定载质量")
-                || empty(binding.et16,"准牵引总质量") || empty(binding.et17,"车轴数") || empty(binding.et18,"车辆用户类型")){
+        if (empty(binding.et2,"车主姓名") || empty(binding.et4,"车主证件号") || empty(binding.et19,"车主证件类型")){
             return;
         }
 
@@ -209,11 +161,15 @@ public class EditCarInfoStep2Activity extends AppActivity {
         }
     }
 
-    //TODO 只要一个车辆编号？
     private Map<String, String> getParams() {
         Map<String, String> params = new HashMap<>();
         params.put("customerId", curBizContent.getCustomerId());
         params.put("vehicleId", curVehicleId);
+        params.put("ownerName", FunHelper.getText(binding.et2));
+        params.put("ownerIdNum", FunHelper.getText(binding.et4));
+        params.put("ownerIdType",userIdType);
+        params.put("ownPosImgUrl",carImg1);
+        params.put("ownNegImgUrl",carImg2);
         params.put("openId", (String) MyShared.getInstance().get(MyShared.OPENID, ""));
         return params;
     }
@@ -238,119 +194,57 @@ public class EditCarInfoStep2Activity extends AppActivity {
     }
 
 
+    /**
+     * 需要识别的图片
+     *
+     * @param type      1-用户正面照  2-用户反面照
+     * @param imageView
+     */
     @SuppressLint({"NewApi", "LogNotTimber"})
     @SingleClick
-    public void onImage(View view) {
+    private void onOCRImg(int type, ImageView imageView) {
         ImageSelectActivity.start(this, data -> {
             file = new File(data.get(0));
-            if (view != binding.ivLocomotive) {
-                Luban.with(this).load(file).ignoreBy(100).setCompressListener(new OnCompressListener() {
-                    @Override
-                    public void onStart() {
-                    }
-
-                    @Override
-                    public void onSuccess(File file) {
-                        postDelayed(() -> OCRspot(QRCode.imageToBase64(file.getPath()), (ImageView) view, file.getPath(), file), 200);
-                    }
+            Luban.with(this).load(file).ignoreBy(100).setCompressListener(new OnCompressListener() {
+                @Override
+                public void onStart() {
+                }
 
-                    @Override
-                    public void onError(Throwable e) {
-                    }
-                }).launch();
-            } else {
-                FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
-                fatherBean.bizContent = new SendTheVerificationCodeBean();
-                fatherBean.setFilename("CSMSN_OCR_FILEUPLOAD_REQ_");
-                fatherBean.bizContent.setFileName(Math.random() + "_" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").toString());
-                fatherBean.bizContent.setFileBase64(QRCode.imageToBase64(data.get(0)));
-                destroy();
-                showDialog("图片文件上传中...");
-                RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE17, new Gson().toJson(fatherBean.bizContent));
-                new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>(true) {
-                    @Override
-                    protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
-                        ResultBean.ProductInfo decVehInfo = Gson().fromJson(String.valueOf(resultBean.getBizContent()), ResultBean.ProductInfo.class);
-                        hideDialog();
-                        GlideApp.with(getActivity()).load(data.get(0)).into((ImageView) view);
-                        if (!TextUtils.isEmpty(decVehInfo.data.getUrl())) {
-                            carImg3 = decVehInfo.data.getUrl();
-                        }
-                    }
+                @Override
+                public void onSuccess(File file) {
+                    postDelayed(() -> OCRspot(type, QRCode.imageToBase64(file.getPath()),
+                            imageView, file.getPath(), file), 200);
+                }
 
-                    @Override
-                    public void onError(String err, Response<Result> resp) {
-                        super.onError(err, resp);
-                        hideDialog();
-                    }
-                });
-            }
+                @Override
+                public void onError(Throwable e) {
+                }
+            }).launch();
         });
     }
 
     @SuppressLint({"LogNotTimber", "NewApi"})
-    public void OCRspot(String base64, ImageView imageView, String mAvatarUrl, File outputFile) {
+    public void OCRspot(int type, String base64, ImageView imageView, String mAvatarUrl, File outputFile) {
         FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
         fatherBean.bizContent = new SendTheVerificationCodeBean();
-        fatherBean.setFilename("CSMSN_OCR_VEHICLE_REQ_");
         fatherBean.bizContent.setSource("1");
         fatherBean.bizContent.setAgencyId("52010106004");
-        fatherBean.bizContent.setImageType(imageView == binding.ivHome ? "1" : "2"); //1正，2反
+        fatherBean.bizContent.setImageType(String.valueOf(type)); //1正，2反
         fatherBean.bizContent.setFileName(System.currentTimeMillis() + ".png");
         fatherBean.bizContent.setImageBase64(base64);
+        destroy();
         showDialog("证件信息识别中...");
-
-        RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE16, new Gson().toJson(fatherBean.bizContent));
+        RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE15, new Gson().toJson(fatherBean.bizContent));
         new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
             @Override
             protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
                 hideDialog();
                 GlideApp.with(getActivity()).load(mAvatarUrl).into(imageView);
-                if (imageView == binding.ivHome) {
-                    if (!TextUtils.isEmpty(bizContent1.getPlate_a())) {
-                        binding.et1.setText(bizContent1.getPlate_a()); //车牌号
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getVehicle())) {
-                        binding.et3.setText(bizContent1.getVehicle()); //车辆类型
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getMan())) {
-                        binding.et2.setText(bizContent1.getMan()); //所有人
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getModel())) {
-                        binding.et6.setText(bizContent1.getModel()); //品牌型号
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getVin())) {
-                        binding.et7.setText(bizContent1.getVin()); //车辆识别代码
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getEngine())) {
-                        binding.et8.setText(bizContent1.getEngine()); //发动机号码
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getRegister())) {
-                        binding.et10.setText(bizContent1.getRegister()); //发证日期
-                    }
+                if (type == 1) {//用户正面
                     carImg1 = bizContent1.getImageUrl();
-                }
-                if (imageView == binding.ivSecondaryPage) {
-                    if (!TextUtils.isEmpty(bizContent1.getApc())) {
-                        binding.et11.setText(bizContent1.getApc().replaceAll("人", "")); //核定载人数
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getGross())) {
-                        binding.et14.setText(bizContent1.getGross().replaceAll("kg", "")); //总质量
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getUnladen())) {
-                        binding.et12.setText(bizContent1.getUnladen().replaceAll("kg", "")); //整备质量
-                    }
-                    if (!TextUtils.isEmpty(bizContent1.getOverall())) {
-                        binding.et13.setText(bizContent1.getOverall().replaceAll("mm", "")); //尺寸
-                    }
-                    //大车专属
-                    if (!TextUtils.isEmpty(bizContent1.getAlc())) {
-                        binding.et15.setText(bizContent1.getAlc().replaceAll("kg", "")); //核定载质量
-                    }
-
-                    if (!TextUtils.isEmpty(bizContent1.getTowing())) {
-                        binding.et16.setText(bizContent1.getTowing().replaceAll("kg", "")); //准牵引总质量
-                    }
+                    binding.et2.setText(bizContent1.getName());
+                    binding.et4.setText(bizContent1.getIdno());
+                } else if (type == 2) {//用户反面-过期时间
                     carImg2 = bizContent1.getImageUrl();
                 }
                 if (outputFile != null) {
@@ -377,14 +271,6 @@ public class EditCarInfoStep2Activity extends AppActivity {
         });
     }
 
-    @Override
-    protected void onDestroy() {
-        if (file != null && file.exists()) {
-            file.delete();
-        }
-        super.onDestroy();
-    }
-
     @Override
     protected void initData() {
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/EditUserInfoStep1Activity.java

@@ -42,7 +42,7 @@ public class EditUserInfoStep1Activity extends AppActivity {
         binding.btnCheck.setOnClickListener(this::initClick);
 
         //TODO 测试
-        binding.etSearch.setText("522225198805108157");
+        //binding.etSearch.setText("522225198805108157");
     }
 
     private void getUserInfoById() {

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/EditUserInfoStep2Activity.java

@@ -121,8 +121,8 @@ public class EditUserInfoStep2Activity extends AppActivity {
         else {
             binding.tvTitle.setText("单位信息更改");
             binding.LLUnitInfo.setVisibility(View.VISIBLE);
-            if (!FunHelper.isEmpty(curBizContent.customerPosImgUrl)) {
-                unitImg1 = curBizContent.customerPosImgUrl;
+            if (!FunHelper.isEmpty(curBizContent.agentPosImgUrl)) {
+                unitImg1 = curBizContent.agentPosImgUrl;
                 GlideApp.with(this).load(curBizContent.customerPosImgUrl).into(binding.ivUnit1);
             }
             if (!FunHelper.isEmpty(curBizContent.agentNegImgUrl)) {
@@ -174,7 +174,13 @@ public class EditUserInfoStep2Activity extends AppActivity {
         }
         if (empty(binding.etUserName, "用户姓名") || empty(binding.etUserIDCard, "身份证号") ||
                 empty(binding.etAddr, "地址") || empty(binding.tvUserIdTime, "证件有效期")
-                || empty(binding.etUserPhone, "联系方式") || empty(binding.etUserCode, "验证码")) {
+                || empty(binding.etUserPhone, "联系方式")) {
+            return true;
+        }
+
+        //更换手机号才需要发送验证码
+        if (!curBizContent.getCustomerTel().equals(FunHelper.getText(binding.etUserPhone)) && FunHelper.isEmpty(FunHelper.getText(binding.etUserCode))){
+            toast("您更换了手机号，请输入验证码！");
             return true;
         }
         return false;
@@ -191,7 +197,13 @@ public class EditUserInfoStep2Activity extends AppActivity {
         if (empty(binding.etUnitName, "公司名称") || empty(binding.etUnitType, "etUnitType") ||
                 empty(binding.etUnitNumber, "公司证件号码") || empty(binding.etUnitUserName, "经办人名称")
                 || empty(binding.etUnitUserType, "经办人证件类型") || empty(binding.etUnitUserIds, "经办人证件号")
-                || empty(binding.etUnitUserPhone, "经办人手机号") || empty(binding.etUnitCode, "验证码")) {
+                || empty(binding.etUnitUserPhone, "经办人手机号")) {
+            return true;
+        }
+
+        //更换手机号才需要发送验证码
+        if (!curBizContent.getCustomerTel().equals(FunHelper.getText(binding.etUnitUserPhone)) && FunHelper.isEmpty(FunHelper.getText(binding.etUnitCode))){
+            toast("您更换了手机号，请输入验证码！");
             return true;
         }
 
@@ -443,15 +455,17 @@ public class EditUserInfoStep2Activity extends AppActivity {
                         binding.tvUserIdTime.setText(bizContent1.getEnddate().substring(0, 4) + "-" + bizContent1.getEnddate().substring(4, 6)
                                 + "-" + bizContent1.getEnddate().substring(6, 8));
                     }
-                }else if (type == 3){//营业执照
+                }else if (type == 3){//营业执照\经办人正面
                     unitImg1 = bizContent1.getImageUrl();
-                    binding.etUnitName.setText(bizContent1.getName());
-                    binding.etUnitNumber.setText(bizContent1.getIdno());
-
-                }else if (type == 4) {//经办人正面
-                    unitImg2 = bizContent1.getImageUrl();
+                    /*binding.etUnitName.setText(bizContent1.getName());
+                    binding.etUnitNumber.setText(bizContent1.getIdno());*/
                     binding.etUnitUserName.setText(bizContent1.getName());
                     binding.etUnitUserIds.setText(bizContent1.getIdno());
+
+                }else if (type == 4) {//国徽面
+                    unitImg2 = bizContent1.getImageUrl();
+                   /* binding.etUnitUserName.setText(bizContent1.getName());
+                    binding.etUnitUserIds.setText(bizContent1.getIdno());*/
                 }
                 if (outputFile != null) {
                     postDelayed(() -> {

app/src/main/res/layout-v1/activity_edit_user_info_step2.xml

@@ -287,7 +287,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="1dp"
                         android:layout_marginHorizontal="@dimen/dp_10"
-                        android:visibility="gone"
+                        android:visibility="visible"
                         tools:ignore="TooManyViews" />
 
                     <LinearLayout
@@ -530,7 +530,7 @@
                 style="@style/MatchWrap.Vertical"
                 android:paddingHorizontal="@dimen/dp_15"
                 android:paddingTop="@dimen/dp_15"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -576,7 +576,7 @@
                                 android:layout_height="@dimen/dp_30"
                                 android:background="@drawable/home_unm_bg3"
                                 android:gravity="center"
-                                android:text="营业执照"
+                                android:text="人像面"
                                 android:textColor="#FFFFFF"
                                 android:textSize="@dimen/sp_12" />
 
@@ -609,7 +609,7 @@
                                 android:layout_height="@dimen/dp_30"
                                 android:background="@drawable/home_unm_bg3"
                                 android:gravity="center"
-                                android:text="证件人像面"
+                                android:text="国徽面"
                                 android:textColor="#FFFFFF"
                                 android:textSize="@dimen/sp_12" />
                         </LinearLayout>
@@ -734,7 +734,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_14"
                     android:layout_marginBottom="@dimen/dp_12"
-                    android:text="单位信息如下："
+                    android:text="单位及经办人信息如下："
                     android:textColor="#333333"
                     android:textSize="@dimen/sp_16" />
 
@@ -768,6 +768,7 @@
                             android:background="@color/white"
                             android:drawablePadding="@dimen/dp_15"
                             android:enabled="false"
+                            android:textColor="@color/color_999999"
                             android:hint="公司名称"
                             android:paddingHorizontal="@dimen/dp_20" />
                     </LinearLayout>
@@ -803,6 +804,7 @@
                             android:drawablePadding="@dimen/dp_15"
                             android:enabled="false"
                             android:hint="营业执照"
+                            android:textColor="@color/color_999999"
                             android:paddingHorizontal="@dimen/dp_20" />
                     </LinearLayout>
 
@@ -824,7 +826,7 @@
                             android:layout_height="match_parent"
                             android:drawableLeft="@mipmap/must"
                             android:gravity="center_vertical"
-                            android:text="证件号码"
+                            android:text="公司证件号码"
                             android:textSize="@dimen/sp_14"
                             tools:ignore="UseCompatTextViewDrawableXml" />
 
@@ -837,6 +839,7 @@
                             android:drawablePadding="@dimen/dp_15"
                             android:enabled="false"
                             android:hint="公司证件号码"
+                            android:textColor="@color/color_999999"
                             android:minHeight="@dimen/dp_45"
                             android:paddingHorizontal="@dimen/dp_20" />
 
@@ -859,7 +862,7 @@
                             android:layout_height="match_parent"
                             android:drawableLeft="@mipmap/must"
                             android:gravity="center_vertical"
-                            android:text="经办人名称"
+                            android:text="经办人姓名"
                             android:textSize="@dimen/sp_14"
                             tools:ignore="UseCompatTextViewDrawableXml" />