From f12974f73c90a4e16c866c7c78e7b7e3234cfd52 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 11 Nov 2022 21:48:51 +0800
Subject: [PATCH] =?UTF-8?q?[2.12.0]=20taxi=E9=80=81=E9=A9=BE=E9=AB=98?=
 =?UTF-8?q?=E5=BE=B7=E5=AF=BC=E8=88=AA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java      | 3 +++
 .../src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java      | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 348ca2acbe..3edd01769f 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
@@ -1358,6 +1358,9 @@ public class TaxiModel {
         //开启实时计算剩余距离，剩余时间，预计时间
         startOrStopCalculateRouteInfo(true);
         AmapNaviToDestinationModel.getInstance(mContext).destroyAmaNavi();
+        if (mOrderStatusCallback != null){
+            mOrderStatusCallback.onNaviToEnd(false,false);
+        }
     }
 
     private void reportTotalDisAndTime() {
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index d94c06c813..056ed4c921 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -315,8 +315,10 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
         if (isAmap){
             if (null == serverOrdersFragment) return;
             serverOrdersFragment.onNaviToEndAmap(isShow);
-        }else { //使用rotting数据
+        }else if (isShow){ //使用rotting数据
             showRottingToStationFragment(true);
+        }else {
+            showAmapNaviToStationFragment(false);
         }
     }