From 7afcde119fcbec15f52655b68760dc5923527275 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 3 Aug 2022 17:01:47 +0800
Subject: [PATCH] =?UTF-8?q?[290=20bus/taxi]bus=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E8=AE=A1=E7=AE=97=E6=95=B0=E6=8D=AE=E4=B8=BA?=
 =?UTF-8?q?0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/BusPassengerModel.java    | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 6322d5dd04..050cfe77aa 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -410,21 +410,23 @@ public class BusPassengerModel {
         //计算当前位置和下一站的剩余点集合
         //计算剩余点总里程和时间
         calculateTwoStationsRoute();
-        List<LatLng> lastPoints = CoordinateCalculateRouteUtil
-                .getRemainPointListByCompare(mTwoStationsRouts,mLongitude,mLatitude);
+        if (mTwoStationsRouts.size() > 0){
+            List<LatLng> lastPoints = CoordinateCalculateRouteUtil
+                    .getRemainPointListByCompare(mTwoStationsRouts,mLongitude,mLatitude);
 
-        float lastSumLength = 0;
-        if (lastPoints.size() == 1){ //只是最后一个点，计算当前位置和最后一个点的距离
-            lastSumLength = CoordinateUtils.calculateLineDistance(
-                    lastPoints.get(0).longitude, lastPoints.get(0).latitude,
-                    mLongitude, mLatitude);
-        }else {
-            lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints);
-        }
-        double lastTime = lastSumLength / BusPassengerConst.BUS_AVERAGE_SPEED * 3.6 ; //秒
-        CallerLogger.INSTANCE.d(M_BUS_P + TAG, "lastSumLength = " + lastSumLength);
-        if (mAutopilotPlanningCallback != null){
-            mAutopilotPlanningCallback.routePlanningToNextStationChanged((long)lastSumLength,(long) lastTime);
+            float lastSumLength = 0;
+            if (lastPoints.size() == 1){ //只是最后一个点，计算当前位置和最后一个点的距离
+                lastSumLength = CoordinateUtils.calculateLineDistance(
+                        lastPoints.get(0).longitude, lastPoints.get(0).latitude,
+                        mLongitude, mLatitude);
+            }else {
+                lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints);
+            }
+            double lastTime = lastSumLength / BusPassengerConst.BUS_AVERAGE_SPEED * 3.6 ; //秒
+            CallerLogger.INSTANCE.d(M_BUS_P + TAG, "lastSumLength = " + lastSumLength);
+            if (mAutopilotPlanningCallback != null){
+                mAutopilotPlanningCallback.routePlanningToNextStationChanged((long)lastSumLength,(long) lastTime);
+            }
         }
     }