From 23e3678e7a7670480422a0fe93d55c1160fddafb Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 24 Mar 2022 16:13:06 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=20passenger=20V1.1.0]=20Taxi=20Passenger?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=B0=8F=E5=9C=B0=E5=9B=BE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/passenger/model/TaxiPassengerModel.java |  9 +++++++++
 .../presenter/BaseTaxiPassengerPresenter.java        | 11 ++---------
 .../ui/TaxiPassengerServingOrderFragment.java        | 12 ++++++++++++
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
index b895718994..e3453380e0 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
@@ -275,6 +275,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
                             if (mCurrentOCHOrder != null) {
                                 queryCurOrderStatus();
                             }
+                            recoverNaviInfo();
                         }
                     }
 
@@ -600,6 +601,14 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         naviOrderStartToEnd();
     }
 
+    /**
+     * 订单结束或者取消的时候， 刷新导航标识位以及缓存的数据
+     */
+    public void recoverNaviInfo(){
+        SharedPrefsMgr.getInstance(mContext).remove(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS);
+        TaxiPassengerNaviToDestinationModel.getInstance(mContext).setFirstcalculateDriveRoute(0);
+    }
+
     private void runOnUIThread(Runnable executor) {
         if (executor == null) {
             return;
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
index 7dd3280fe8..d060812f85 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
@@ -140,7 +140,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
         CallerLogger.INSTANCE.d(M_TAXI_P+TAG,"updateOrderView = "+order.orderStatus);
         if (TaxiPassengerOrderStatusEnum.Cancel.getCode() == order.orderStatus){
             mView.showOrHideServingOrderFragment(false);
-            recoverNaviInfo();
+            TaxiPassengerModel.getInstance().recoverNaviInfo();
             return;
         }
         if (TaxiPassengerOrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus
@@ -149,7 +149,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
             return;
         }
         if (TaxiPassengerOrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus){
-            recoverNaviInfo();
+            TaxiPassengerModel.getInstance().recoverNaviInfo();
             runOnUIThread(() ->{
                 AIAssist.getInstance(getContext()).speakTTSVoice(getContext().getString(R.string.taxi_p_arrive_end_tts));
             });
@@ -165,11 +165,4 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
         }
     }
 
-    /**
-     * 订单结束或者取消的时候， 刷新导航标识位以及缓存的数据
-     */
-    public void recoverNaviInfo(){
-        SharedPrefsMgr.getInstance(getContext()).remove(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS);
-        TaxiPassengerNaviToDestinationModel.getInstance(getContext()).setFirstcalculateDriveRoute(0);
-    }
 }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
index 3c7886ac16..88efec1c08 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
@@ -366,6 +366,18 @@ public class TaxiPassengerServingOrderFragment extends
         TaxiPassengerModel.getInstance().naviOrderStartToEnd();
     }
 
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+
+        if (hidden){//fragment 隐藏， 导航取消
+            clearPolyline();
+            TaxiPassengerNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
+        }else {  //fragment 显示， 导航开始
+            TaxiPassengerModel.getInstance().naviOrderStartToEnd();
+        }
+    }
+
     @Override
     public void onPause() {
         super.onPause();