From d5899958ac7646a10c11dde73ad46c2b8ec298bd Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Thu, 25 Nov 2021 17:00:38 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=E4=B8=B4=E6=97=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=B8=AD=E7=9B=91=E5=90=AC=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=BA=86=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E5=88=B0=E7=AB=99?=
 =?UTF-8?q?=E5=9B=9E=E6=8E=89=E5=AF=BC=E8=87=B4=E7=9A=84=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../hmi/ui/widget/AutoPilotStatusView.kt      |  2 +-
 .../dispatch/DispatchAutoPilotManager.java    | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
index ad045478c8..a527cd53a3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
@@ -86,7 +86,7 @@ class AutoPilotStatusView @JvmOverloads constructor(
         currentAutopilot.startLatLon =
             AutopilotControlParameters.AutoPilotLonLat(MogoApisHandler.getInstance().apis.adasControllerApi.lastLat, MogoApisHandler.getInstance().apis.adasControllerApi.lastLon)
         currentAutopilot.endLatLon =
-            AutopilotControlParameters.AutoPilotLonLat(40.2023065, 116.7328583)
+            AutopilotControlParameters.AutoPilotLonLat(26.82355278566775, 112.57001723522112)
         currentAutopilot.vehicleType = 10
 
         CallerAutoPilotManager.startAutoPilot(currentAutopilot)
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
index 959701db52..cd4aed4881 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
@@ -197,17 +197,21 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
 
     @Override
     public void onArriveAt(AutopilotStationInfo data) {
-        Logger.d(TAG, "onArriveAt data : " + data.toString());
-        double endLat = data.getLat();
-        double endLon = data.getLon();
-        // 计算是不是到了终点
-        float distanceFromSelf = CoordinateUtils.calculateLineDistance(receiverBean.getEndLon(), receiverBean.getEndLat()
-                , endLon, endLat);
-        Logger.d(TAG, "onArriveAt cal distance : " + distanceFromSelf);
-        if (distanceFromSelf < 10) {
-            Logger.d(TAG, "onArriveAt end location");
-            isDispatch = false;
-            isArriveEnd = true;
+        try {
+            Logger.d(TAG, "onArriveAt data : " + data.toString());
+            double endLat = data.getLat();
+            double endLon = data.getLon();
+            // 计算是不是到了终点
+            float distanceFromSelf = CoordinateUtils.calculateLineDistance(receiverBean.getEndLon(), receiverBean.getEndLat()
+                    , endLon, endLat);
+            Logger.d(TAG, "onArriveAt cal distance : " + distanceFromSelf);
+            if (distanceFromSelf < 10) {
+                Logger.d(TAG, "onArriveAt end location");
+                isDispatch = false;
+                isArriveEnd = true;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }