From 50cc329a4ddeacc42f19b95e88512ae20b8c3e4d Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 21 Sep 2023 15:12:30 +0800 Subject: [PATCH] =?UTF-8?q?3.2.9=E4=B8=8A=E4=BC=A0=E7=85=A7=E7=89=87?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=99=BE=E5=BA=A6=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../shangchuan/ShangChuangImgActivity.java | 130 +++++------------- 2 files changed, 37 insertions(+), 97 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a4e614f..81a470c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.arpa.hndahesudintocctmsdriver" minSdkVersion 23 targetSdkVersion 30 - versionCode 58 - versionName "3.2.8" + versionCode 59 + versionName "3.2.9" flavorDimensions "CHANNEL_VALUE" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { 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 db96bb0..3421796 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 @@ -29,12 +29,9 @@ import com.arpa.hndahesudintocctmsdriver.util.NfcUtils; import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil; import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert; import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil; -import com.baidu.mapapi.CoordType; -import com.baidu.mapapi.SDKInitializer; import com.baidu.mapapi.model.LatLng; import com.baidu.mapapi.utils.CoordinateConverter; import com.bumptech.glide.Glide; -import com.dahe.mylibrary.utils.ToastUtils; import com.google.gson.Gson; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; @@ -47,7 +44,6 @@ import com.arpa.hndahesudintocctmsdriver.bean.UploadBean; import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset; import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean; import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean; -import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity; import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil; import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog; import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup; @@ -167,6 +163,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { customDialog.dismiss(); tv_loaction.setText("定位成功"); tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null)); + latLng = convertGPSToBaidu(new LatLng(lgdu.getLatitude(), lgdu.getLongitude())); initLocation(); break; case 16://定位失败 @@ -199,6 +196,14 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { break; } } + private LatLng latLng; + + public LatLng convertGPSToBaidu(LatLng srLatLng) { + CoordinateConverter converter = new CoordinateConverter(); + converter.from(CoordinateConverter.CoordType.COMMON); + converter.coord(srLatLng); + return converter.convert(); + } private String wid; private int h_type; @@ -245,8 +250,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { if (!locationKey) { customDialog.show(); lgdu.onCreate(); - lu = new LocationUtil(con, hd); - lu.onCreate(); +// lu = new LocationUtil(con, hd); +// lu.onCreate(); } }); hyr = new HuoYuanRequset(con, hd); @@ -356,10 +361,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { Log.e("--装货信息", gson.toJson(lub)); if (locationKey) {//高德定位 if (keys) { - if (lu!=null&&lu.getErrorCode()!=161){ - ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！"); - return; - } nfc(); loadInfo(); // up_traffic_start(); @@ -384,10 +385,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { Log.e("--卸货信息", gson.toJson(lub)); if (locationKey) { if (keys) { - if (lu!=null&&lu.getErrorCode()!=161){ - ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！"); - return; - } nfc(); uploadInfo(); @@ -416,10 +413,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { Log.e("--回单信息", gson.toJson(urib)); if (locationKey) { if (index == 2 && keys) { - if (lu!=null&&lu.getErrorCode()!=161){ - ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！"); - return; - } up_trafficSign(); up_trafficReceipt(); receipt_image(); @@ -439,34 +432,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { private StartOrderBean sob; - //上传安联和交通厅-装货 - public void up_traffic_start() { - //安联 - if (sob.getData().getReportAlct() == 1) { - Location l = new Location(); - l.setBaiduLongitude(lu.getLongitude()); - l.setBaiduLatitude(lu.getLatitude()); - l.setLocation(lu.getAddress()); - l.setTime(Timer.getTimerT()); - MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { - @Override - public void onSuccess() { - Log.e("上报安联", "装货上传成功"); - } - - @Override - public void onFailure(String s, String s1) { - Log.e("上报安联失败(装货):", s + s1); - new MessageUtils().showCenMessage(con, s1); - } - }); - } - //交通厅 - if (sob.getData().getReport() == 1) { - JTTProcess.start(con, sob, ""); - } - } - public void nfc() { // if(sob.getData().getNfcId().equals(nfcStr)){ // Toast.makeText(con,"nfcId匹配失败",Toast.LENGTH_LONG).show(); @@ -488,41 +453,13 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { }); } - //上传安联和交通厅-卸货 - public void up_traffic_end() { - //安联 - if (sob.getData().getReportAlct() == 1) { - Location l = new Location(); - l.setBaiduLongitude(lu.getLongitude()); - l.setBaiduLatitude(lu.getLatitude()); - l.setLocation(lu.getAddress()); - l.setTime(Timer.getTimerT()); - Log.e("-安联卸货信息-", gson.toJson(l)); - MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { - @Override - public void onSuccess() { - Log.e("上报安联", "卸货上传成功"); - } - - @Override - public void onFailure(String s, String s1) { - Log.e("上报安联失败(卸货):", s + s1); - } - }); - } - //交通厅 - if (sob.getData().getReport() == 1) { - JTTProcess.stop(con, sob, ""); - } - } - //上传安联-签收 public void up_trafficSign() { //安联 Location l = new Location(); - l.setBaiduLongitude(lu.getLongitude()); - l.setBaiduLatitude(lu.getLatitude()); - l.setLocation(lu.getAddress()); + l.setBaiduLongitude(latLng.longitude); + l.setBaiduLatitude(latLng.latitude); + l.setLocation(lgdu.getAddress()); l.setTime(Timer.getTimerT()); List gs = new ArrayList<>(); for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) { @@ -560,9 +497,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { public void up_trafficReceipt() { //安联 Location l = new Location(); - l.setBaiduLongitude(lu.getLongitude()); - l.setBaiduLatitude(lu.getLatitude()); - l.setLocation(lu.getAddress()); + l.setBaiduLongitude(latLng.longitude); + l.setBaiduLatitude(latLng.latitude); + l.setLocation(lgdu.getAddress()); l.setTime(Timer.getTimerT()); MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { @@ -588,9 +525,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); image.setImageTakenDate(Timer.getTimerT()); - image.setBaiduLongitude(lu.getLongitude()); - image.setBaiduLatitude(lu.getLatitude()); - image.setLocation(lu.getAddress()); + image.setBaiduLongitude(latLng.longitude); + image.setBaiduLatitude(latLng.latitude); + image.setLocation(lgdu.getAddress()); MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new com.alct.mdp.callback.OnResultListener() { @Override @@ -620,9 +557,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); image.setImageTakenDate(Timer.getTimerT()); - image.setBaiduLongitude(lu.getLongitude()); - image.setBaiduLatitude(lu.getLatitude()); - image.setLocation(lu.getAddress()); + image.setBaiduLongitude(latLng.longitude); + image.setBaiduLatitude(latLng.latitude); + image.setLocation(lgdu.getAddress()); MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new com.alct.mdp.callback.OnResultListener() { @Override @@ -653,9 +590,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { image.setFileExt(FileUtil.lastName(file)); image.setFileName(FileUtil.fileName(file)); image.setImageTakenDate(Timer.getTimerT()); - image.setBaiduLongitude(lu.getLongitude()); - image.setBaiduLatitude(lu.getLatitude()); - image.setLocation(lu.getAddress()); + image.setBaiduLongitude(latLng.longitude); + image.setBaiduLatitude(latLng.latitude); + image.setLocation(lgdu.getAddress()); MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new com.alct.mdp.callback.OnResultListener() { @Override @@ -706,6 +643,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { Log.e("nfc", nfcStr); } + + + /** * 上传安联和交通厅,平台-装货 */ @@ -713,9 +653,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { //安联 if (sob.getData().getReportAlct() == 1) { Location l = new Location(); - l.setBaiduLongitude(lu.getLongitude()); - l.setBaiduLatitude(lu.getLatitude()); - l.setLocation(lu.getAddress()); + l.setBaiduLongitude(latLng.longitude); + l.setBaiduLatitude(latLng.latitude); + l.setLocation(lgdu.getAddress()); l.setTime(Timer.getTimerT()); MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() { @Override @@ -749,9 +689,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { //安联 if (sob.getData().getReportAlct() == 1) { Location l = new Location(); - l.setBaiduLongitude(lu.getLongitude()); - l.setBaiduLatitude(lu.getLatitude()); - l.setLocation(lu.getAddress()); + l.setBaiduLongitude(latLng.longitude); + l.setBaiduLatitude(latLng.latitude); + l.setLocation(lgdu.getAddress()); l.setTime(Timer.getTimerT()); Log.e("-安联卸货信息-", gson.toJson(l)); MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {