From b7b7626351ffe5f9efb8839c6ca879169a5ea296 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 27 Nov 2023 11:33:32 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[bugfix]=20[taxi=20=E9=A2=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=BC=93=E5=AD=98=20=E5=AF=BC=E8=87=B4=E9=AB=98?=
 =?UTF-8?q?=E5=BE=B7=E5=9C=B0=E5=9B=BE=E5=81=9C=E6=AD=A2=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/model/TaxiModel.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 0a7c6422c8..97d23806fc 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -1415,11 +1415,16 @@ public class TaxiModel {
         if (mRoutePoints.size() > 0) {
             reportTotalDisAndTime();
         }
-        //开启实时计算剩余距离，剩余时间，预计时间
-        startOrStopCalculateRouteInfo(true);
-        AmapNaviToDestinationModel.getInstance(mContext).destroyAmaNavi();
-        if (mOrderStatusCallback != null) {
-            mOrderStatusCallback.onNaviToEnd(false, false);
+        if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.getCode() ||//司机到达上车点
+                mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.getCode() ||//乘客到达上车点
+                mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()//服务中（去往目的地）
+        ) {
+            //开启实时计算剩余距离，剩余时间，预计时间
+            startOrStopCalculateRouteInfo(true);
+            AmapNaviToDestinationModel.getInstance(mContext).destroyAmaNavi();
+            if (mOrderStatusCallback != null) {
+                mOrderStatusCallback.onNaviToEnd(false, false);
+            }
         }
     }