From 335213257876ca313efae7615aed16006c7542b5 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 3 Aug 2022 17:00:17 +0800
Subject: [PATCH] =?UTF-8?q?[290=20bus/taxi]taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?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

---
 .../com/mogo/och/taxi/model/TaxiModel.java    | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 90040dd0c8..5b151461f5 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -1287,30 +1287,32 @@ public class TaxiModel {
      * 实时计算当前剩余里程和时间
      */
     public void dynamicCalculateRouteInfo() {
-        List<LatLng> lastPoints = CoordinateCalculateRouteUtil
-                .getRemainPointListByCompare(mRoutePoints, mLongitude, mLatitude);
+        if (mRoutePoints.size() > 0){
+            List<LatLng> lastPoints = CoordinateCalculateRouteUtil
+                    .getRemainPointListByCompare(mRoutePoints, mLongitude, mLatitude);
 
-        float lastSumLength = 0;
+            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);
+            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 / TaxiConst.TAXI_AVERAGE_SPEED * 3.6; //秒
+            Logger.d(M_TAXI + "dynamicCalculateRouteInfo"
+                    , "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime
+                            + " thread = "+ Thread.currentThread().getName());
+
+            mCurrentOCHOrder.decreaseTravelDistance(lastSumLength);
+            if (mOrderStatusCallback != null) {
+                mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) lastSumLength, (long) lastTime);
+            }
+
+            reportOrderRemain((long) lastSumLength, (long) lastTime);
         }
-
-        double lastTime = lastSumLength / TaxiConst.TAXI_AVERAGE_SPEED * 3.6; //秒
-        Logger.d(M_TAXI + "dynamicCalculateRouteInfo"
-                , "---lastSumLength: " + lastSumLength + "----lastTime : " + lastTime
-           + " thread = "+ Thread.currentThread().getName());
-
-        mCurrentOCHOrder.decreaseTravelDistance(lastSumLength);
-        if (mOrderStatusCallback != null) {
-            mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) lastSumLength, (long) lastTime);
-        }
-
-        reportOrderRemain((long) lastSumLength, (long) lastTime);
     }
 
     /**