From e52bf89c99fda378ceeea038f8f282b524ad26f7 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 21 Oct 2022 14:50:23 +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

---
 .../com/mogo/och/taxi/model/TaxiModel.java    |  1 +
 .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 34 ++++++++++++-------
 .../com/mogo/och/taxi/ui/TaxiFragment.java    |  4 +++
 .../och/taxi/ui/TaxiRottingNaviFragment.java  |  7 +---
 .../src/main/res/layout/taxi_panel.xml        |  7 ++++
 .../res/layout/taxi_rotting_navi_view.xml     |  8 ++---
 6 files changed, 39 insertions(+), 22 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 2d6570af5f..6a2fa36132 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
@@ -1326,6 +1326,7 @@ public class TaxiModel {
         }
         //开启实时计算剩余距离，剩余时间，预计时间
         startOrStopCalculateRouteInfo(true);
+        NaviToDestinationModel.getInstance(mContext).destroyAmaNavi();
     }
 
     private void reportTotalDisAndTime() {
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 00d7f11be7..2865a380bc 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
@@ -565,6 +565,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
 
     protected void showAmapNaviToStationFragment(boolean isShow) {
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+        closeRouteViewIFHadeAdd(transaction);
         if (isShow) {
 //            if (ochNaviFragment == null){
             ochAmapNaviFragment = TaxiAmapNaviFragment.newInstance();
@@ -578,20 +579,34 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             flNaviPanelContainer.setVisibility(View.VISIBLE);
             CallerSmpManager.hidePanel();//隐藏小地图
         } else {
-            if (ochAmapNaviFragment != null) {
-                ochAmapNaviFragment.onDestroy();
-                transaction.remove(ochAmapNaviFragment);
-                transaction.commitAllowingStateLoss();
-                ochAmapNaviFragment = null;
-            }
+            closeAmapViewIFHadeAdd(transaction);
             mCloseNaviIcon.setVisibility(View.GONE);
             flNaviPanelContainer.setVisibility(View.GONE);
             CallerSmpManager.showPanel();//显示小地图
         }
     }
 
+    private void closeAmapViewIFHadeAdd(FragmentTransaction transaction){
+        if (ochAmapNaviFragment != null) {
+            ochAmapNaviFragment.onDestroy();
+            transaction.remove(ochAmapNaviFragment);
+            transaction.commitAllowingStateLoss();
+            ochAmapNaviFragment = null;
+        }
+    }
+
+    private void closeRouteViewIFHadeAdd(FragmentTransaction transaction){
+        if (ochAmapNaviFragment != null) {
+            taxiRottingNaviFragment.onDestroy();
+            transaction.remove(taxiRottingNaviFragment);
+            transaction.commitAllowingStateLoss();
+            taxiRottingNaviFragment = null;
+        }
+    }
+
     protected void showRottingToStationFragment(boolean isShow) {
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+        closeAmapViewIFHadeAdd(transaction);
         if (isShow) {
 //            if (ochNaviFragment == null){
             taxiRottingNaviFragment = TaxiRottingNaviFragment.newInstance();
@@ -605,12 +620,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             flNaviPanelContainer.setVisibility(View.VISIBLE);
             CallerSmpManager.hidePanel();//隐藏小地图
         } else {
-            if (taxiRottingNaviFragment != null) {
-                taxiRottingNaviFragment.onDestroy();
-                transaction.remove(taxiRottingNaviFragment);
-                transaction.commitAllowingStateLoss();
-                taxiRottingNaviFragment = null;
-            }
+            closeRouteViewIFHadeAdd(transaction);
             mCloseNaviIcon.setVisibility(View.GONE);
             flNaviPanelContainer.setVisibility(View.GONE);
             CallerSmpManager.showPanel();//显示小地图
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 d70ea4690e..2738e1420a 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
@@ -26,6 +26,7 @@ import com.mogo.och.taxi.constant.TaxiConst;
 import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
 import com.mogo.och.taxi.bean.OrderQueryRespBean;
 import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
+import com.mogo.och.taxi.model.NaviToDestinationModel;
 import com.mogo.och.taxi.model.TaxiModel;
 import com.mogo.och.taxi.presenter.TaxiPresenter;
 import com.mogo.och.taxi.utils.TPRouteDataTestUtils;
@@ -395,6 +396,9 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             }
             TaxiModel.getInstance().setOnTheWayToEndStation();
         });
+        findViewById(R.id.test_bar_route).setOnClickListener(v -> {
+            testRouteInfoUpload();
+        });
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.java
index 6048d0564a..853c9ec895 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiRottingNaviFragment.java
@@ -29,7 +29,7 @@ public class TaxiRottingNaviFragment extends MvpFragment<TaxiRottingNaviFragment
         fragment.setArguments(args);
         return fragment;
     }
-    
+
     @Override
     protected int getLayoutId() {
         return R.layout.taxi_rotting_navi_view;
@@ -45,11 +45,6 @@ public class TaxiRottingNaviFragment extends MvpFragment<TaxiRottingNaviFragment
         mMapDirectionView = findViewById(R.id.rotting_navi_view);
     }
 
-    @Override
-    protected void initViews(Bundle savedInstanceState) {
-        super.initViews(savedInstanceState);
-    }
-
     @Override
     public void onResume() {
         super.onResume();
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
index 49fb0eda5f..32a776ed22 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
@@ -85,5 +85,12 @@
             android:text="到达目的地"
             android:textSize="12sp" />
 
+        <Button
+            android:id="@+id/test_bar_route"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="模拟轨迹"
+            android:textSize="12sp" />
+
     </LinearLayout>
 </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_rotting_navi_view.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_rotting_navi_view.xml
index 27227994c3..5d8207fd00 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_rotting_navi_view.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_rotting_navi_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     app:cardCornerRadius="30px"
     app:cardElevation="8px"
     app:cardUseCompatPadding="true"
@@ -11,6 +11,6 @@
 
     <com.mogo.och.taxi.ui.TaxiMapDirectionView
         android:id="@+id/rotting_navi_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
 </androidx.cardview.widget.CardView>