新增司机，车辆显示错乱修复

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/CarDelBean.java

@@ -66,6 +66,7 @@ public class CarDelBean {
         private String owner;
         private String roadLicense;
         private String roadLicensePhoto;
+        private String trailerLicenseId;
 
         private String policyPhotoUrl;
         private String insuranceCompany;
@@ -83,6 +84,14 @@ public class CarDelBean {
         private String carPlateColorValue;
         private String needUpQCPhoto;
 
+        public String getTrailerLicenseId() {
+            return trailerLicenseId;
+        }
+
+        public void setTrailerLicenseId(String trailerLicenseId) {
+            this.trailerLicenseId = trailerLicenseId;
+        }
+
         public String getNeedUpQCPhoto() {
             return needUpQCPhoto;
         }
@@ -299,6 +308,15 @@ public class CarDelBean {
             private String threeImage;
             private String type;
             private String vehicleNumber;
+            private String trailerLicenseId;
+
+            public String getTrailerLicenseId() {
+                return trailerLicenseId;
+            }
+
+            public void setTrailerLicenseId(String trailerLicenseId) {
+                this.trailerLicenseId = trailerLicenseId;
+            }
 
             public String getBackImage() {
                 return backImage == null ? "" : backImage;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRVehicleLicenseBean.java

@@ -62,6 +62,15 @@ public class OCRVehicleLicenseBean {
         private String type;
         private String url;
         private String vehicleNumber;
+        private String licenseId;
+
+        public String getLicenseId() {
+            return licenseId;
+        }
+
+        public void setLicenseId(String licenseId) {
+            this.licenseId = licenseId;
+        }
 
         private DataDto2 existCarInfo;
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java

@@ -357,9 +357,11 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
                 } else {
-                    //重复代码
+                    //重复代码?
-//                    initView(null);
+                    initView(null);
-//                    initData();
+                    if (!(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null || CacheGroup.cacheList.get(TYPE_NAME_BANK[3]) != null)) {
+                        initData();
+                    }
                     pathOrcRes();
                 }
                 break;
@@ -437,6 +439,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
 //                there_div.setVisibility(View.VISIBLE);
                 if (c_str != null && !c_str.equals("")) {
                     cdb = gson.fromJson(c_str, CarDelBean.class);
+                    oCrcarId = cdb.getData().getTrailerResVo().getTrailerLicenseId() + "";
                     initView(null);
                     initData();
                 } else {
@@ -933,7 +936,16 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, olb.getData().isCarExist());
+//                   if (cdb != null && cdb.getData().getTrailerResVo() &&cdb.getRes() == 1)
+                    boolean isExist = false;
+                    if (olb != null) {//主页识别成功后获取
+                        isExist = olb.getData().isCarExist();
+                    } else {
+                        if (cdb != null && cdb.getData().getTrailerResVo() != null && cdb.getRes() == 1) {//上个页面带来数据
+                            isExist = true;
+                        }
+                    }
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, isExist);
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
                 }