From a878a9238a0925e863ec6678adf6b957fa2394f8 Mon Sep 17 00:00:00 2001 From: lijia Date: Wed, 18 Dec 2024 08:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=8D=B8=E8=B4=A7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shangchuan/ShangChuangImgActivityBC.java | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java index 0fd5ffd..8416877 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java @@ -43,6 +43,7 @@ import com.arpa.hndahesudintocctmsdriver.report.JTTProcess; import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset; import com.arpa.hndahesudintocctmsdriver.request.OCRRequest; import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean; +import com.arpa.hndahesudintocctmsdriver.request.bean.TrackInputBean; import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean; import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil; import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; @@ -260,6 +261,15 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I break; } } + if (CacheGroup.cacheList.get("genzong") != null) { + BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("genzong"), BaseBean.class); + if (bb.getCode() == 200) { + Log.e("--轨迹上传--", "成功"); + } else { + Log.e("--轨迹上传失败:--", bb.getMsg()); + } + CacheGroup.cacheList.remove("genzong"); + } if (CacheGroup.cacheList.get("carName") != null) { BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("carName"), BaseBean.class); if (bb.getCode() == 200) { @@ -377,14 +387,14 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I initView(null); customDialog = new CustomDialog(con, "正在定位当前位置..."); customDialog.show(); - lgdu = new LocationGDUtil(con, hd); - //启动定位 - lgdu.onCreate(); +// lgdu = new LocationGDUtil(con, hd); +// //启动定位 +// lgdu.onCreate(); tv_loaction.setOnClickListener(v -> { - if (!locationKey) { - customDialog.show(); - lgdu.onCreate(); - } +// if (!locationKey) { +// customDialog.show(); +// lgdu.onCreate(); +// } }); btnOk.setOnClickListener(v -> { @@ -524,7 +534,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I lub.setImageId(imgIds); lub.setWaybillId(wid); Log.e("--装货信息", gson.toJson(lub)); - if (locationKey) {//高德定位 +// if (locationKey) {//高德定位 if (keys) { MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() { @Override @@ -539,6 +549,8 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I nfc(); loadInfo(); } + + upLocation(tempLoca.getLatitude()+"",tempLoca.getLongitude()+"",sob.getData().getShippingNoteNumber()); } @Override @@ -550,9 +562,9 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I } }); } - } else { - Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show(); - } +// } else { +// Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show(); +// } } else { Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show(); @@ -568,7 +580,8 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I lub.setWaybillId(wid); lub.setRealLoadTime(tempLoca.getTime()); Log.e("--卸货信息", gson.toJson(lub)); - if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) { +// if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) { + if (!TextUtils.isEmpty(tempLoca.address)) { if (keys) { MDPLocationCollectionManager.getShipmentStatus(con, sob.getData().getShippingNoteNumber(), new OnDownloadResultListener() { @Override @@ -581,6 +594,7 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I nfc(); uploadInfo(); } + upLocation(tempLoca.getLatitude()+"",tempLoca.getLongitude()+"",sob.getData().getShippingNoteNumber()); } @Override @@ -620,16 +634,16 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I //子运运单ID urib.setWaybillId(wid); Log.e("--回单信息", gson.toJson(urib)); - if (locationKey) { +// if (locationKey) { if (index == 2 && keys && !TextUtils.isEmpty(tempLoca.address)) { up_trafficSign(); up_trafficReceipt(); receipt_image(); } hyr.receipt(urib); - } else { - Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show(); - } +// } else { +// Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show(); +// } } else { Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show(); } @@ -929,5 +943,11 @@ public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements I } - + private void upLocation(String lat,String lon,String shippingNoteNumber){ + TrackInputBean tib = new TrackInputBean(); + tib.setLatitude(lat); + tib.setLongitude(lon); + tib.setShippingNoteNumber(shippingNoteNumber); + hyr.trackTracking(tib); + } }