denghuan/river-lucky-driver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

注册自动流转优化

Browse Source
This commit is contained in:
lijia 2024-11-25 09:48:59 +08:00
parent 2da410bcd4
commit 77481c73f6
6 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java
View File

@ -143,7 +143,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
}, 3000); }, 3000);
} }
} else { } else {
finish();
if (isOverCar) {//从业资格证=》道路运输许可证 if (isOverCar) {//从业资格证=》道路运输许可证
Intent in = new Intent(con, PhotoCarActivity.class); Intent in = new Intent(con, PhotoCarActivity.class);
in.putExtra("type", 3); in.putExtra("type", 3);
@ -154,6 +153,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
in.putExtra("type", 3); in.putExtra("type", 3);
con.startActivity(in); con.startActivity(in);
} }
finish();
} }

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

@ -312,7 +312,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
String needUpQCPhoto = bb.getData().getNeedUpQCPhoto(); String needUpQCPhoto = bb.getData().getNeedUpQCPhoto();
String needUpRLPhoto = bb.getData().getNeedUpRLPhoto();//是否需要上传道路运输证到 String needUpRLPhoto = bb.getData().getNeedUpRLPhoto();//是否需要上传道路运输证到
Toast.makeText(con, "挂车信息保存成功", Toast.LENGTH_SHORT).show(); Toast.makeText(con, "挂车信息保存成功", Toast.LENGTH_SHORT).show();
finish();
VehicleEvent ve = new VehicleEvent("挂"); VehicleEvent ve = new VehicleEvent("挂");
EventBus.getDefault().post(ve); EventBus.getDefault().post(ve);
@ -336,6 +336,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
in.putExtra("carId", carId); in.putExtra("carId", carId);
con.startActivity(in); con.startActivity(in);
} }
finish();
} else { } else {
Toast.makeText(con, "挂车信息保存失败", Toast.LENGTH_SHORT).show(); Toast.makeText(con, "挂车信息保存失败", Toast.LENGTH_SHORT).show();
} }
@ -512,7 +514,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
if (bb.getCode() == 200) { if (bb.getCode() == 200) {
VehicleEvent ve = new VehicleEvent(String.valueOf(carExistCarId)); VehicleEvent ve = new VehicleEvent(String.valueOf(carExistCarId));
EventBus.getDefault().postSticky(ve); EventBus.getDefault().postSticky(ve);
if (("0".equals(trailerId)||TextUtils.isEmpty(trailerId)) && value2.getText().toString().contains("牵")) { if (("0".equals(trailerId) || TextUtils.isEmpty(trailerId)) && value2.getText().toString().contains("牵")) {
Intent in = new Intent(con, CertificatesActivity.class); Intent in = new Intent(con, CertificatesActivity.class);
in.putExtra("index", 3); in.putExtra("index", 3);
in.putExtra("carId", carExistCarId); in.putExtra("carId", carExistCarId);
@ -530,7 +532,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
} else { } else {
pathOrcRes(); pathOrcRes();
//重复代码? //重复代码?
initView(null); // initView(null);
if (!(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null || CacheGroup.cacheList.get(TYPE_NAME_BANK[3]) != null)) { if (!(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null || CacheGroup.cacheList.get(TYPE_NAME_BANK[3]) != null)) {
initData(); initData();
} }
@ -635,6 +637,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
default: default:
break; break;
} }
initView(null);
} }
@Override @Override
@ -939,12 +942,13 @@ public class CertificatesActivity extends BaseAppCompatActivity {
case 0: case 0:
if (CacheGroup.cacheList.get(TYPE_NAME[0]) != null) { if (CacheGroup.cacheList.get(TYPE_NAME[0]) != null) {
ocb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[0]), OCRCardBean.class); ocb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[0]), OCRCardBean.class);
ImageLoader.getInstance().loadImage(con, path, img1, typeImgOne[index]);
if (ocb.getCode() == 200 && ocb.getData() != null) { if (ocb.getCode() == 200 && ocb.getData() != null) {
// url1 = ocb.getData().getUrl(); // url1 = ocb.getData().getUrl();
value1.setText(ocb.getData().getName()); value1.setText(ocb.getData().getName());
value2.setText(ocb.getData().getIdcard()); value2.setText(ocb.getData().getIdcard());
value3.setText(ocb.getData().getAddress()); value3.setText(ocb.getData().getAddress());
Glide.with(con).load(path).into(img1); // Glide.with(con).load(path).into(img1);
} else { } else {
Toast.makeText(con, "识别失败请重新上传", Toast.LENGTH_SHORT).show(); Toast.makeText(con, "识别失败请重新上传", Toast.LENGTH_SHORT).show();
} }
@ -952,9 +956,10 @@ public class CertificatesActivity extends BaseAppCompatActivity {
} }
if (CacheGroup.cacheList.get(TYPE_NAME_BANK[0]) != null) { if (CacheGroup.cacheList.get(TYPE_NAME_BANK[0]) != null) {
ocbb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[0]), OCRCardBackBean.class); ocbb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[0]), OCRCardBackBean.class);
ImageLoader.getInstance().loadImage(con, path, img2, typeImgTwo[index]);
if (ocbb.getCode() == 200 && ocbb.getData() != null) { if (ocbb.getCode() == 200 && ocbb.getData() != null) {
value4.setText(ocbb.getData().getValidTo()); value4.setText(ocbb.getData().getValidTo());
Glide.with(con).load(path).into(img2); // Glide.with(con).load(path).into(img2);
startTime = ocbb.getData().getValidFrom(); startTime = ocbb.getData().getValidFrom();
//自动调取提交功能，实现页面自动跳转 //自动调取提交功能，实现页面自动跳转
subimt(); subimt();
@ -968,6 +973,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
//{"档案编号","初次领证日期","准驾车型","有效期限(止)"}, //{"档案编号","初次领证日期","准驾车型","有效期限(止)"},
if (CacheGroup.cacheList.get(TYPE_NAME[1]) != null) { if (CacheGroup.cacheList.get(TYPE_NAME[1]) != null) {
odl = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[1]), OCRDrivingLicenseBean.class); odl = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[1]), OCRDrivingLicenseBean.class);
ImageLoader.getInstance().loadImage(con, path, img1, typeImgOne[index]);
if (odl.getCode() == 200 && odl.getData() != null) { if (odl.getCode() == 200 && odl.getData() != null) {
OCRDrivingLicenseBean.DataDTO od = odl.getData(); OCRDrivingLicenseBean.DataDTO od = odl.getData();
// url1 = odl.getData().getUrl(); // url1 = odl.getData().getUrl();
@ -976,7 +982,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
value2.setText(StringUtil.isNull(od.getFirstGetDocDate(), "识别异常")); value2.setText(StringUtil.isNull(od.getFirstGetDocDate(), "识别异常"));
value3.setText(StringUtil.isNull(od.getQuasiDriveType(), "识别异常")); value3.setText(StringUtil.isNull(od.getQuasiDriveType(), "识别异常"));
value4.setText(StringUtil.isNull(od.getEndDate(), "识别异常")); value4.setText(StringUtil.isNull(od.getEndDate(), "识别异常"));
Glide.with(con).load(path).into(img1);
// Glide.with(con).load(path).into(img1);
} else { } else {
Toast.makeText(con, "识别失败请重新上传", Toast.LENGTH_SHORT).show(); Toast.makeText(con, "识别失败请重新上传", Toast.LENGTH_SHORT).show();
} }
@ -984,8 +991,9 @@ public class CertificatesActivity extends BaseAppCompatActivity {
} }
if (CacheGroup.cacheList.get(TYPE_NAME_BANK[1]) != null) { if (CacheGroup.cacheList.get(TYPE_NAME_BANK[1]) != null) {
odlb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[1]), OCRDrivingLicenseBackBean.class); odlb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[1]), OCRDrivingLicenseBackBean.class);
ImageLoader.getInstance().loadImage(con, path, img2, typeImgTwo[index]);
if (odlb.getCode() == 200 && odlb.getData() != null) { if (odlb.getCode() == 200 && odlb.getData() != null) {
Glide.with(con).load(path).into(img2); // Glide.with(con).load(path).into(img2);
//自动调取提交功能，实现页面自动跳转 //自动调取提交功能，实现页面自动跳转
subimt(); subimt();
} else { } else {
@ -1000,6 +1008,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
if (CacheGroup.cacheList.get(TYPE_NAME[2]) != null) { if (CacheGroup.cacheList.get(TYPE_NAME[2]) != null) {
Log.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2])); Log.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
olb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[2]), OCRVehicleLicenseBean.class); olb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[2]), OCRVehicleLicenseBean.class);
ImageLoader.getInstance().loadImage(con, path, img1, typeImgOne[index]);
if (olb.getCode() == 200 && olb.getData() != null) { if (olb.getCode() == 200 && olb.getData() != null) {
if (2 == index && olb.getData().getVclN().contains("挂")) { if (2 == index && olb.getData().getVclN().contains("挂")) {
Toast.makeText(con, "该证件为挂车,请上传行驶证证件", Toast.LENGTH_SHORT).show(); Toast.makeText(con, "该证件为挂车,请上传行驶证证件", Toast.LENGTH_SHORT).show();
@ -1024,7 +1033,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
value4.setText(olb.getData().getVin()); value4.setText(olb.getData().getVin());
// fontId = olb.getData().getId(); // fontId = olb.getData().getId();
// Glide.with(con).load(url1).into(img1); // Glide.with(con).load(url1).into(img1);
Glide.with(con).load(path).into(img1); // Glide.with(con).load(path).into(img1);
oCrcarId = olb.getData().getCarId() + ""; oCrcarId = olb.getData().getCarId() + "";
if (!TextUtils.isEmpty(olb.getData().getVclN()) && !olb.getData().getVclN().contains("挂")) if (!TextUtils.isEmpty(olb.getData().getVclN()) && !olb.getData().getVclN().contains("挂"))
new AuthRequest().getCarInfo(con, hd, olb.getData().getVclN()); new AuthRequest().getCarInfo(con, hd, olb.getData().getVclN());
@ -1036,11 +1046,13 @@ public class CertificatesActivity extends BaseAppCompatActivity {
} }
if (CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null) { if (CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null) {
oblb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]), OCRVehicleBackLicenseBean.class); oblb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]), OCRVehicleBackLicenseBean.class);
ImageLoader.getInstance().loadImage(con, path, img2, typeImgTwo[index]);
if (oblb.getCode() == 200 && oblb.getData() != null) { if (oblb.getCode() == 200 && oblb.getData() != null) {
// url2 = oblb.getData().getUrl(); // url2 = oblb.getData().getUrl();
// backId = oblb.getData().getId(); // backId = oblb.getData().getId();
// Glide.with(con).load(url2).into(img2); // Glide.with(con).load(url2).into(img2);
Glide.with(con).load(path).into(img2);
// Glide.with(con).load(path).into(img2);
//自动调取提交功能，实现页面自动跳转实现页面自动跳转 //自动调取提交功能，实现页面自动跳转实现页面自动跳转
subimt(); subimt();
} else { } else {

8
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
View File

@ -186,11 +186,11 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
Log.e("is", CacheGroup.cacheList.get("saveCarRegisterNo")); Log.e("is", CacheGroup.cacheList.get("saveCarRegisterNo"));
IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRegisterNo"), IsAuthDriverAuthQualificationBean.class); IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRegisterNo"), IsAuthDriverAuthQualificationBean.class);
if (ib.getCode() == 200) { if (ib.getCode() == 200) {
finish();
Intent in = new Intent(con, PhotoCarActivity.class); Intent in = new Intent(con, PhotoCarActivity.class);
in.putExtra("type", 3); in.putExtra("type", 3);
in.putExtra("carId", carId); in.putExtra("carId", carId);
con.startActivity(in); con.startActivity(in);
finish();
} else { } else {
Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show(); Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show();
} }
@ -204,12 +204,11 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
//判断是否需要跳转挂车行驶证页面 //判断是否需要跳转挂车行驶证页面
if (!"".equals(carId) && cdb.getData() != null) { if (!"".equals(carId) && cdb.getData() != null) {
if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，并且传过挂车直接结束 if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，并且传过挂车直接结束
finish();
Intent in = new Intent(con, AddCarSuccActivity.class); Intent in = new Intent(con, AddCarSuccActivity.class);
in.putExtra("type", 3); in.putExtra("type", 3);
con.startActivity(in); con.startActivity(in);
} else if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，没传过挂车，到挂车页面
finish(); finish();
} else if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，没传过挂车，到挂车页面
Intent in = new Intent(con, CertificatesActivity.class); Intent in = new Intent(con, CertificatesActivity.class);
in.putExtra("index", 3); in.putExtra("index", 3);
in.putExtra("carId", carId); in.putExtra("carId", carId);
@ -217,6 +216,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
in.putExtra("cheData", new Gson().toJson(cdb)); in.putExtra("cheData", new Gson().toJson(cdb));
} }
startActivity(in); startActivity(in);
finish();
} else if (cdb.getData().getIsTrailer() == 0) {//不需要挂车 } else if (cdb.getData().getIsTrailer() == 0) {//不需要挂车
if ("1".equals(cdb.getData().getNeedUpQCPhoto())) {//需要从业资格证 if ("1".equals(cdb.getData().getNeedUpQCPhoto())) {//需要从业资格证
Intent in = new Intent(con, AuthQualificationActivity.class); Intent in = new Intent(con, AuthQualificationActivity.class);
@ -225,10 +225,10 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
in.putExtra("isOverCar", false); in.putExtra("isOverCar", false);
startActivity(in); startActivity(in);
} else { } else {
finish();
Intent in = new Intent(con, AddCarSuccActivity.class); Intent in = new Intent(con, AddCarSuccActivity.class);
in.putExtra("type", 3); in.putExtra("type", 3);
con.startActivity(in); con.startActivity(in);
finish();
} }
} }
} else { } else {

23
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java
View File

@ -282,13 +282,24 @@ public class MyFragment extends BaseFragment {
if (!"".equals(userBean.getData().getHeadportraitUrl())) { if (!"".equals(userBean.getData().getHeadportraitUrl())) {
Glide.with(con).load(userBean.getData().getHeadportraitUrl()).into(img_head); Glide.with(con).load(userBean.getData().getHeadportraitUrl()).into(img_head);
} }
if (userBean != null && 100003 == userBean.getData().getAuditStatus()) {
auth_box.setVisibility(View.GONE); if (userBean!=null){
no_auth.setVisibility(View.GONE); if ("0".equals(userBean.getData().getRealAuthentication())){
} else { no_auth.setVisibility(View.VISIBLE);
auth_box.setVisibility(View.GONE); }else{
no_auth.setVisibility(View.VISIBLE); if (100003 != userBean.getData().getAuditStatus()){
no_auth.setBackgroundResource(R.mipmap.icon_auth_wsh);
}
}
} }
// if (userBean != null && 100003 == userBean.getData().getAuditStatus()) {
// auth_box.setVisibility(View.GONE);
// no_auth.setVisibility(View.GONE);
// } else {
// auth_box.setVisibility(View.GONE);
// no_auth.setVisibility(View.VISIBLE);
// }
} }
} }

2
app/src/main/res/layout/item_my_new.xml
View File

@ -80,7 +80,7 @@
android:layout_marginLeft="@dimen/dp_14" android:layout_marginLeft="@dimen/dp_14"
android:layout_width="@dimen/dp_143" android:layout_width="@dimen/dp_143"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_36"
android:src="@mipmap/icon_auth_new"/> android:background="@mipmap/icon_auth_new"/>
</LinearLayout> </LinearLayout>

BIN
app/src/main/res/mipmap-hdpi/icon_auth_wsh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB