From 0d3e35d6f70a414846db3de7265849eb1a730dfd Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 15 Jul 2024 11:29:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=B8=E6=9C=BA=EF=BC=8C?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=98=BE=E7=A4=BA=E9=94=99=E4=B9=B1=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/CarDelBean.java | 18 +++++++++++++++ .../bean/OCRVehicleLicenseBean.java | 9 ++++++++ .../ui/auth/CertificatesActivity.java | 22 ++++++++++++++----- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/CarDelBean.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/CarDelBean.java index 279e125..adc0e19 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/CarDelBean.java +++ b/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; diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRVehicleLicenseBean.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRVehicleLicenseBean.java index 561ff6a..9f47d98 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRVehicleLicenseBean.java +++ b/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; diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java index 99a89ef..43042e3 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java +++ b/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); -// initData(); + //重复代码? + initView(null); + 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 { @@ -834,7 +837,7 @@ public class CertificatesActivity extends BaseAppCompatActivity { value1.setEnabled(false); Glide.with(con).load(olb.getData().getExistCarInfo().getBackImage()).into(img2); url2 = olb.getData().getExistCarInfo().getBackImage(); - ToastUtils.showLongToast(con,"该车辆已存在,请仔细核对相关信息"); + ToastUtils.showLongToast(con, "该车辆已存在,请仔细核对相关信息"); } else { value1.setEnabled(true); } @@ -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)); }