From b29c35ada545995c4b5ab9425712f71f730daaa0 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 21 Oct 2022 17:09:32 +0800
Subject: [PATCH] =?UTF-8?q?[2.12.0]=20taxi=20=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=81=E9=A9=BE=E5=B8=A6=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/BaseTaxiTabFragment.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 2865a380bc..e486a42f0b 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -564,9 +564,10 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     }
 
     protected void showAmapNaviToStationFragment(boolean isShow) {
+
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-        closeRouteViewIFHadeAdd(transaction);
         if (isShow) {
+            closeRouteViewIFHadeAdd();
 //            if (ochNaviFragment == null){
             ochAmapNaviFragment = TaxiAmapNaviFragment.newInstance();
 //            }
@@ -579,15 +580,16 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             flNaviPanelContainer.setVisibility(View.VISIBLE);
             CallerSmpManager.hidePanel();//隐藏小地图
         } else {
-            closeAmapViewIFHadeAdd(transaction);
+            closeAmapViewIFHadeAdd();
             mCloseNaviIcon.setVisibility(View.GONE);
             flNaviPanelContainer.setVisibility(View.GONE);
             CallerSmpManager.showPanel();//显示小地图
         }
     }
 
-    private void closeAmapViewIFHadeAdd(FragmentTransaction transaction){
+    private void closeAmapViewIFHadeAdd(){
         if (ochAmapNaviFragment != null) {
+            FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
             ochAmapNaviFragment.onDestroy();
             transaction.remove(ochAmapNaviFragment);
             transaction.commitAllowingStateLoss();
@@ -595,8 +597,9 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         }
     }
 
-    private void closeRouteViewIFHadeAdd(FragmentTransaction transaction){
-        if (ochAmapNaviFragment != null) {
+    private void closeRouteViewIFHadeAdd(){
+        if (taxiRottingNaviFragment != null) {
+            FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
             taxiRottingNaviFragment.onDestroy();
             transaction.remove(taxiRottingNaviFragment);
             transaction.commitAllowingStateLoss();
@@ -605,9 +608,10 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     }
 
     protected void showRottingToStationFragment(boolean isShow) {
+
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-        closeAmapViewIFHadeAdd(transaction);
         if (isShow) {
+            closeAmapViewIFHadeAdd();
 //            if (ochNaviFragment == null){
             taxiRottingNaviFragment = TaxiRottingNaviFragment.newInstance();
 //            }
@@ -620,7 +624,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             flNaviPanelContainer.setVisibility(View.VISIBLE);
             CallerSmpManager.hidePanel();//隐藏小地图
         } else {
-            closeRouteViewIFHadeAdd(transaction);
+            closeRouteViewIFHadeAdd();
             mCloseNaviIcon.setVisibility(View.GONE);
             flNaviPanelContainer.setVisibility(View.GONE);
             CallerSmpManager.showPanel();//显示小地图