diff --git a/app/build.gradle b/app/build.gradle index c599b2b..5b8dfbb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.arpa.hndahesudintocctmsdriver" minSdkVersion 23 targetSdkVersion 30 - versionCode 59 - versionName "3.2.9" + versionCode 60 + versionName "3.3.0" flavorDimensions "CHANNEL_VALUE" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { 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 27b1d32..afafb17 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 @@ -660,7 +660,9 @@ public class CertificatesActivity extends BaseAppCompatActivity { break; case 3: Log.e("挂车信息", gson.toJson(cdb)); - if (cdb != null && cdb.getData().getTrailerResVo() != null) { + if (cdb != null && cdb.getData().getTrailerResVo() != null + && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getFrontImage()) + && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getBackImage())) { url1 = StringUtil.isNull(cdb.getData().getTrailerResVo().getFrontImage(), ""); url2 = StringUtil.isNull(cdb.getData().getTrailerResVo().getBackImage(), ""); url3 = StringUtil.isNull(cdb.getData().getTrailerResVo().getThreeImage(), ""); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java index 11d13bf..bc48c4e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java @@ -158,13 +158,13 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRoadLicenseNo"), IsAuthDriverAuthQualificationBean.class); if (ib.getCode() == 200) { //判断是否需要跳转挂车行驶证页面 - if (!"".equals(carId) ){ - if (cdb.getData().getIsTrailer() == 1&&!TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车,并且传过挂车直接结束 + if (!"".equals(carId)) { + if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车,并且传过挂车直接结束 finish(); Intent in = new Intent(con, AddCarSuccActivity.class); in.putExtra("type", 3); con.startActivity(in); - }else if(cdb.getData().getIsTrailer() == 1&&TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车,没传过挂车,到挂车页面 + } else if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车,没传过挂车,到挂车页面 finish(); Intent in = new Intent(con, CertificatesActivity.class); in.putExtra("index", 3); @@ -173,14 +173,14 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl in.putExtra("cheData", new Gson().toJson(cdb)); } startActivity(in); - }else if(cdb.getData().getIsTrailer() == 0){//不需要挂车 - if ("1".equals(cdb.getData().getNeedUpQCPhoto())){//需要从业资格证 + } else if (cdb.getData().getIsTrailer() == 0) {//不需要挂车 + if ("1".equals(cdb.getData().getNeedUpQCPhoto())) {//需要从业资格证 Intent in = new Intent(con, AuthQualificationActivity.class); in.putExtra("type", "0"); in.putExtra("carId", carId); in.putExtra("isOverCar", false); startActivity(in); - }else{ + } else { finish(); Intent in = new Intent(con, AddCarSuccActivity.class); in.putExtra("type", 3); @@ -315,7 +315,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl * 展示大图片 */ private void showBigImg() { - if (TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())){ + if (TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) { choicePhoto(); return; } @@ -323,7 +323,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl case 0: if (cdb.getData().getRoadLicensePhoto() != null && !cdb.getData().getCarImage().equals("")) { new XPopup.Builder(con) - .asImageViewer(img, cdb.getData().getCarImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) + .asImageViewer(img, cdb.getData().getCarImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); // new XPopup.Builder(con) // .asImageViewer(img, cdb.getData().getCarImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) @@ -377,14 +377,14 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl switch (type) { case 0: - if (!TextUtils.isEmpty(url)||(cdb!=null&&!TextUtils.isEmpty(cdb.getData().getCarImage()))){ + if (!TextUtils.isEmpty(url) || (cdb != null && !TextUtils.isEmpty(cdb.getData().getCarImage()))) { finish(); Intent in = new Intent(con, PhotoCarActivity.class); // in.putExtra("type", 1); in.putExtra("type", 3); in.putExtra("carId", carId); con.startActivity(in); - } else{ + } else { Toast.makeText(this, "请上传车辆照片", Toast.LENGTH_SHORT).show(); } break; @@ -401,7 +401,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show(); return; } - new AuthRequest().saveCarRegisterNo(con,hd,carId,s); + new AuthRequest().saveCarRegisterNo(con, hd, carId, s); break; case 3: String s1 = value1.getText().toString(); @@ -409,7 +409,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show(); return; } - new AuthRequest().saveCarRoadLicenseNo(con,hd,carId,s1); + new AuthRequest().saveCarRoadLicenseNo(con, hd, carId, s1); break; } }