From 873e0b81cf615e57fa03bc50267e3995fbd9bf04 Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 21 Oct 2024 11:02:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../hndahesudintocctmsdriver/report/JTTProcess.java | 13 +++++++++++++ .../ui/home/StartYunDanActivity.java | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a78f818..8a0b27a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,7 +105,7 @@ android { JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可. ] buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"") - buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:8080/api/\"") + buildConfigField("String", "BASE_URL", "\"https://app.test.dahehuoyun.com/api/\"") buildConfigField "boolean", "isTest", "true" //APP名称，可以在androidMainfest中引用 resValue "string", "appName", "司机测试" diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java index 1046b50..e8f20ff 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/report/JTTProcess.java @@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.report; import android.app.Application; import android.content.Context; import android.content.Intent; +import android.text.TextUtils; import android.util.Log; import com.amap.api.location.AMapLocationClient; @@ -78,6 +79,9 @@ public class JTTProcess { ShippingNoteInfo sni=new ShippingNoteInfo(); StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0); StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1); + if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){ + return; + } sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber()); sni.setSerialNumber("0000"); sni.setStartLatitude(Double.parseDouble(startWay.getLatitude())); @@ -143,6 +147,9 @@ public class JTTProcess { ShippingNoteInfo sni=new ShippingNoteInfo(); StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0); StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1); + if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){ + return; + } sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber()); sni.setSerialNumber("0000"); sni.setStartLatitude(Double.parseDouble(startWay.getLatitude())); @@ -176,6 +183,9 @@ public class JTTProcess { ShippingNoteInfo sni=new ShippingNoteInfo(); StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0); StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1); + if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){ + return; + } sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber()); sni.setSerialNumber("0000"); sni.setStartLatitude(Double.parseDouble(startWay.getLatitude())); @@ -208,6 +218,9 @@ public class JTTProcess { ShippingNoteInfo sni=new ShippingNoteInfo(); StartOrderBean.DataDTO.WayChildrenDTO startWay=sob.getData().getWayChildren().get(0); StartOrderBean.DataDTO.WayChildrenDTO endWay=sob.getData().getWayChildren().get(sob.getData().getWayChildren().size()-1); + if (TextUtils.isEmpty(endWay.getLatitude())||TextUtils.isEmpty(endWay.getLongitude())){ + return; + } sni.setShippingNoteNumber(sob.getData().getShippingNoteNumber()); sni.setSerialNumber("0000"); sni.setStartLatitude(Double.parseDouble(startWay.getLatitude())); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java index 6133307..14e1b8c 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java @@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.home; import android.content.Intent; import android.os.Bundle; import android.os.Message; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.view.animation.AlphaAnimation; @@ -596,6 +597,10 @@ public class StartYunDanActivity extends BaseActivity { public void search() { + String latitude = sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude(); + if (TextUtils.isEmpty(latitude)){ + return; + } // try { // AMapLocationClient.updatePrivacyShow(con,true,true); // AMapLocationClient.updatePrivacyAgree(con,true);