From 491c9b8c84b6e891fa8d1c0a2b2adf731349bb55 Mon Sep 17 00:00:00 2001 From: lijia Date: Fri, 21 Jun 2024 08:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=8D=B8=E8=B4=A7=EF=BC=8C=E5=9B=9E?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/DriverExpireBean.java | 18 +++++++++++++++ .../ui/home/HomeFragment.java | 3 ++- .../shangchuan/ShangChuangImgActivity.java | 22 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverExpireBean.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverExpireBean.java index 114dac0..b5ee266 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverExpireBean.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverExpireBean.java @@ -49,6 +49,24 @@ public class DriverExpireBean { private String driverLicenseUpdateUrl; private String idCardUpdateUrl; private String qualificationUpdateUrl; + private String roadLicenseUpdateUrl; + private String insuranceUpdateUrl; + + public String getRoadLicenseUpdateUrl() { + return roadLicenseUpdateUrl; + } + + public void setRoadLicenseUpdateUrl(String roadLicenseUpdateUrl) { + this.roadLicenseUpdateUrl = roadLicenseUpdateUrl; + } + + public String getInsuranceUpdateUrl() { + return insuranceUpdateUrl; + } + + public void setInsuranceUpdateUrl(String insuranceUpdateUrl) { + this.insuranceUpdateUrl = insuranceUpdateUrl; + } public String getQualificationUpdateUrl() { return qualificationUpdateUrl; diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index 52b898f..70d348e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -241,7 +241,8 @@ public class HomeFragment extends BaseFragment { } } if (!"".equals(deb.getData().getDriverLicenseUpdateUrl()) || !"".equals(deb.getData().getIdCardUpdateUrl())|| - !"".equals(deb.getData().getQualificationUpdateUrl())) { + !"".equals(deb.getData().getQualificationUpdateUrl())||!"".equals(deb.getData().getRoadLicenseUpdateUrl())|| + !"".equals(deb.getData().getInsuranceUpdateUrl())) { new XToast<>(act) .setContentView(R.layout.view_bc) // 设置成可拖拽的 diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java index 9106336..917fb8b 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java @@ -111,6 +111,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { for (int i = 0; i < TYPE_NAME.length; i++) { if (CacheGroup.cacheList.get(TYPE_NAME[i]) != null) { BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class); + if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + customDialog.dismiss(); + } if (bb.getCode() == 200) { if (index == 2) { if (!keys){//装货回单 @@ -356,6 +359,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { // } switch (index) { case 0: + if (customDialog!=null&&!customDialog.isShowing()){ + customDialog = new CustomDialog(con, "网络请求中..."); + customDialog.show(); + } //装货 if (imgIds != null && imgIds.size() > 0) { lub.setLatitude(lgdu.getLatitude() + ""); @@ -537,6 +544,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { + if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + customDialog.dismiss(); + } Log.e("上报安联", "装货照片上传成功"); Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); finish(); @@ -569,6 +579,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { + if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + customDialog.dismiss(); + } Log.e("上报安联", "卸货照片上传成功"); Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); finish(); @@ -602,6 +615,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { + if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + customDialog.dismiss(); + } Log.e("上报安联", "回单照片上传成功"); Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); finish(); @@ -679,6 +695,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onFailure(String s, String s1) { Log.e("上报安联失败(装货):", s + s1); + if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + customDialog.dismiss(); + } new MessageUtils().showCenMessage(con, s1); } }); @@ -716,6 +735,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onFailure(String s, String s1) { Log.e("上报安联失败(卸货):", s + s1); + if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + customDialog.dismiss(); + } new MessageUtils().showCenMessage(con, s1); } });