From 040cc745dcb9ae16ac1cd2f28fbc6da99f1cf619 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 14 Oct 2022 13:19:36 +0800
Subject: [PATCH] =?UTF-8?q?[2.11.0=20fix]=20=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/CoordinateCalculateRouteUtil.java   | 55 ++++++++++---------
 .../mogo/och/taxi/ui/TaxiNaviFragment.java    |  6 +-
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java
index 01ec888715..d0532ffea9 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.java
@@ -144,26 +144,29 @@ public class CoordinateCalculateRouteUtil {
         if (mRoutePoints.size() > 0){
             //基础点
             LatLng baseLatLng = mRoutePoints.get(0);
-            float baseDiffDis = CoordinateUtils.calculateLineDistance(realLon,realLat
-                    ,baseLatLng.longitude,baseLatLng.latitude);// lon,lat, prelon, prelat
+            if (baseLatLng != null){
+                float baseDiffDis = CoordinateUtils.calculateLineDistance(realLon,realLat
+                        ,baseLatLng.longitude,baseLatLng.latitude);// lon,lat, prelon, prelat
 
-            for (int i= 1; i < mRoutePoints.size(); i++){
-                LatLng latLng = mRoutePoints.get(i);
-                float diff = CoordinateUtils.calculateLineDistance(realLon,realLat
-                        ,latLng.longitude,latLng.latitude);
-                if (baseDiffDis > diff){
+                for (int i= 1; i < mRoutePoints.size(); i++){
+                    LatLng latLng = mRoutePoints.get(i);
+                    float diff = CoordinateUtils.calculateLineDistance(realLon,realLat
+                            ,latLng.longitude,latLng.latitude);
+                    if (baseDiffDis > diff){
 //                    Logger.d(M_TAXI + "calculateRouteSumLength", "点："+i+"-------先记录点----- ");
-                    baseDiffDis = diff;
-                    currentIndex = i;
+                        baseDiffDis = diff;
+                        currentIndex = i;
+                    }
                 }
-            }
 //            Logger.d(M_TAXI + "calculateRouteSumLength", "点："+currentIndex+"-------是最近的点------ ");
-            if (currentIndex == mRoutePoints.size()-1){
-                latePoints.add(mRoutePoints.get(currentIndex));
-            }else {
-                latePoints.addAll(mRoutePoints.subList(currentIndex,mRoutePoints.size()-1));
+                if (currentIndex == mRoutePoints.size()-1){
+                    latePoints.add(mRoutePoints.get(currentIndex));
+                }else {
+                    latePoints.addAll(mRoutePoints.subList(currentIndex,mRoutePoints.size()-1));
+                }
+                return latePoints;
             }
-            return latePoints;
+
         }
         return latePoints;
     }
@@ -180,20 +183,22 @@ public class CoordinateCalculateRouteUtil {
         if (mRoutePoints.size() > 0){
             //基础点
             LatLng baseLatLng = mRoutePoints.get(0);
-            float baseDiffDis = CoordinateUtils.calculateLineDistance(realLon,realLat
-                    ,baseLatLng.longitude,baseLatLng.latitude);// lon,lat, prelon, prelat
+            if (baseLatLng != null){
+                float baseDiffDis = CoordinateUtils.calculateLineDistance(realLon,realLat
+                        ,baseLatLng.longitude,baseLatLng.latitude);// lon,lat, prelon, prelat
 
-            for (int i= 1; i < mRoutePoints.size(); i++){
-                LatLng latLng = mRoutePoints.get(i);
-                float diff = CoordinateUtils.calculateLineDistance(realLon,realLat
-                        ,latLng.longitude,latLng.latitude);
-                if (baseDiffDis > diff){
+                for (int i= 1; i < mRoutePoints.size(); i++){
+                    LatLng latLng = mRoutePoints.get(i);
+                    float diff = CoordinateUtils.calculateLineDistance(realLon,realLat
+                            ,latLng.longitude,latLng.latitude);
+                    if (baseDiffDis > diff){
 //                    Logger.d(M_TAXI + "calculateRouteSumLength", "点："+i+"-------先记录点----- ");
-                    baseDiffDis = diff;
-                    currentIndex = i;
+                        baseDiffDis = diff;
+                        currentIndex = i;
+                    }
                 }
+                return currentIndex;
             }
-            return currentIndex;
         }
         return currentIndex;
     }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiNaviFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiNaviFragment.java
index 35438d42a4..fd629e6f51 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiNaviFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiNaviFragment.java
@@ -156,8 +156,12 @@ public class TaxiNaviFragment extends BaseTaxiUIFragment implements AMapNaviView
     @Override
     public void onDestroy() {
         super.onDestroy();
+
         NaviToDestinationModel.getInstance(getContext()).setVoiceIsMute(false);
-        mAMapNaviView.onDestroy();
+        if (mAMapNaviView != null){
+            mAMapNaviView.onDestroy();
+        }
+
         if (mNaviToStartInfoCallback != null){
             mNaviToStartInfoCallback = null;
         }