From 46f8bc8c9427e49c83070e93137c117c7c5e10c2 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 18 Oct 2022 14:13:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[V2X][Road]=E8=A7=86=E8=A7=92=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=B9=9F=E8=A6=81=E4=BF=9D=E6=8C=81=E7=BB=98=E5=88=B6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/fragment/BaseBusTabFragment.java   | 3 ---
 .../och/taxi/passenger/ui/TaxiPassengerBaseFragment.java     | 3 ---
 .../main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java  | 4 ----
 .../core/function/hmi/ui/widget/PerspectiveSwitchView.kt     | 5 -----
 4 files changed, 15 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index 78adde0984..4d02c0d64d 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -140,7 +140,6 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
                 if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()) {
                     // 2.11.0去掉
 //                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
-                    AiRoadMarker.INSTANCE.restore();
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
                 } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
@@ -149,13 +148,11 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
 //                            .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS, BusConst.TYPE_MARKER_BUS_ORDER);
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                     mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long);
-                    AiRoadMarker.INSTANCE.clear();
                 } else {
                     // 2.11.0去掉
 //                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
-                    AiRoadMarker.INSTANCE.restore();
                 }
             }
         });
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index d8a1c5c4bc..4af679e575 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -137,19 +137,16 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 //                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_medium);
-                    AiRoadMarker.INSTANCE.restore();
                 } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
                     // 2.11.0 去掉
 //                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS);
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                     mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_long);
-                    AiRoadMarker.INSTANCE.clear();
                 } else {
                     // 2.11.0去掉
 //                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_medium);
-                    AiRoadMarker.INSTANCE.restore();
                 }
                 //OverlayLeftViewUtils.INSTANCE.dismissOverlayView();
             }
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 2c42628d6a..54ee62dd60 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
@@ -199,21 +199,17 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
 //                        MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .visibleAllMarkers();
                         MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                         mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
-                        AiRoadMarker.INSTANCE.restore();
                     } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
                         // 2.11.0去掉
 //                        MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
 //                                .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS, TaxiConst.TYPE_MARKER_TAXI_ORDER);
                         MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                         mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_long);
-                        AiRoadMarker.INSTANCE.clear();
                     } else {
                         // 2.11.0去掉
 //                        MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .visibleAllMarkers();
                         MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                         mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
-                        AiRoadMarker.INSTANCE.restore();
-
                     }
                 } finally {
                     CallerLogger.INSTANCE.d(M_TAXI + TAG, "cost:" + (SystemClock.elapsedRealtime() - start));
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt
index 669a57074d..0d91542d7b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt
@@ -6,11 +6,9 @@ import android.view.*
 import android.widget.*
 import com.mogo.commons.*
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.function.hmi.R.drawable
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.*
 import com.mogo.map.*
 import com.mogo.map.uicontroller.*
-import com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT
 import com.mogo.module.common.constants.*
 import kotlinx.android.synthetic.main.view_perspective_switch.view.*
 
@@ -38,19 +36,16 @@ class PerspectiveSwitchView @JvmOverloads constructor(
                 .visibleAllMarkers()
             MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
             textSwitch.setText(R.string.module_map_model_normal)
-            AiRoadMarker.restore()
         } else if (MogoMapUIController.getInstance().currentMapVisualAngle.isMediumSight) {
             MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
                 .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS)
             MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null)
             textSwitch.setText(R.string.module_map_model_faster)
-            AiRoadMarker.clear()
         } else {
             MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
                 .visibleAllMarkers()
             MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
             textSwitch.setText(R.string.module_map_model_normal)
-            AiRoadMarker.restore()
         }
     }
 }
\ No newline at end of file

From 143c082a6dbdf69d570e2d1d82686ef4775cb142 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 18 Oct 2022 15:24:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[2.11.0]=20taxi=20=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AFAdasAbilityManager=20release?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
index b6cdb73c6b..936ac5e68f 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
@@ -75,7 +75,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
         TaxiModel.getInstance().setCarStatusCallback(this);
         TaxiModel.getInstance().setControllerStatusCallback(this);
         TaxiModel.getInstance().setOrderStatusCallback(this);
-        OCHAdasAbilityManager.getInstance().release();
     }
 
     private void releaseListeners() {
@@ -83,6 +82,7 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
         TaxiModel.getInstance().setCarStatusCallback(null);
         TaxiModel.getInstance().setControllerStatusCallback(null);
         TaxiModel.getInstance().setOrderStatusCallback(null);
+        OCHAdasAbilityManager.getInstance().release();
     }
 
     private void runOnUIThread( Runnable executor ) {