From ef6247fc22d81a7f6382bcdc84a21a314e7f1041 Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 16 Jul 2024 17:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B8=E8=B4=A7=EF=BC=8C=E8=A3=85=E5=8D=B8?= =?UTF-8?q?=E5=9B=9E=E5=8D=95=E6=B7=BB=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shangchuan/ShangChuangImgActivity.java | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) 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 6c4fa76..fb84ba8 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 @@ -94,7 +94,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { switch (m.what) { case RequsetCodeConstants.SUCCESS: if (CacheGroup.cacheList.get("upload") != null) { - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } Log.e("upload", CacheGroup.cacheList.get("upload")); @@ -115,12 +115,12 @@ 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){//装货回单 + if (!keys) {//装货回单 + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { + customDialog.dismiss(); + } Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); finish(); } @@ -156,7 +156,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { hyr.uploadFile(new File(path)); } } else {//识别失败后返回code500 - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } if (index == 0) {//装卸货车辆需要识别车牌号){ @@ -171,7 +171,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { break; case 14://定位成功 locationKey = true; - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } tv_loaction.setText("定位成功"); @@ -181,7 +181,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { break; case 16://定位失败 locationKey = false; - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } tv_loaction.setText("定位失败，点击重试"); @@ -211,6 +211,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { break; } } + private LatLng latLng; public LatLng convertGPSToBaidu(LatLng srLatLng) { @@ -339,7 +340,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { Log.e("图片地址:", path); gia.dis(); - if (customDialog!=null&&!customDialog.isShowing()){ + if (customDialog != null && !customDialog.isShowing()) { customDialog = new CustomDialog(con, "网络请求中..."); customDialog.show(); } @@ -358,7 +359,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { Log.e("图片地址:", path); gia.dis(); - if (customDialog!=null&&!customDialog.isShowing()){ + if (customDialog != null && !customDialog.isShowing()) { customDialog = new CustomDialog(con, "网络请求中..."); customDialog.show(); } @@ -376,12 +377,12 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { // for(int i=0;i 0) { lub.setLatitude(lgdu.getLatitude() + ""); @@ -563,7 +564,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } Log.e("上报安联", "装货照片上传成功"); @@ -598,7 +599,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } Log.e("上报安联", "卸货照片上传成功"); @@ -609,6 +610,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(); + } // SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber()); // SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image)); // Intent serviceIn=new Intent(con, MakeUpAlService.class); @@ -634,7 +638,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } Log.e("上报安联", "回单照片上传成功"); @@ -684,8 +688,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { } - - /** * 上传安联和交通厅,平台-装货 */ @@ -714,7 +716,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onFailure(String s, String s1) { Log.e("上报安联失败(装货):", s + s1); - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } new MessageUtils().showCenMessage(con, s1); @@ -754,7 +756,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onFailure(String s, String s1) { Log.e("上报安联失败(卸货):", s + s1); - if (!isFinishing()&&customDialog!=null&&customDialog.isShowing()){ + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { customDialog.dismiss(); } new MessageUtils().showCenMessage(con, s1);