From 86f5c2e212fa90804f6df6ab075040657faf1a72 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 15 Feb 2022 17:11:00 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E4=BF=AE=E5=A4=8D=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E4=B8=BA2D=E6=A8=A1=E5=BC=8F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../mogo/map/impl/custom/AMapViewWrapper.java | 19 +------------------
 .../service/intent/MockIntentHandler.java     |  3 ---
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index 246a295648..978fcc335f 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -130,6 +130,7 @@ public class AMapViewWrapper implements IMogoMapView,
         if (options != null) {
             //设置手势是否可以缩放 isCanZoom true 可缩放 false 不可缩放
             options.setZoomGesturesEnabled(true);
+            options.setScaleVRMode(true);
             // 设置自车的图片对象
             //options.setMyLocationStyle(options.getMyLocationStyle().myLocationIcon(DEFAULT_OPTION.getCarCursorRes()));
         }
@@ -335,24 +336,6 @@ public class AMapViewWrapper implements IMogoMapView,
         moveToCenter(latLng, true);
     }
 
-    private void setUIMode(EnumMapUI ui) {
-        this.mCurrentCarUIMode = ui;
-        if (mMapView.getMapAutoViewHelper() != null) {
-            switch (ui) {
-                case CarUp_2D:
-                case CarUp_3D:
-                    mMapView.getMapAutoViewHelper().setMapViewPerspective(MapAutoApi.MAP_PERSPECTIVE_UP_CAR);
-                    break;
-                case NorthUP_2D:
-                    if (mCurrentUI == EnumMapUI.Type_VR) {
-                        return;
-                    }
-                    mMapView.getMapAutoViewHelper().setMapViewPerspective(MapAutoApi.MAP_PERSPECTIVE_UP_NORTH);
-                    break;
-            }
-        }
-    }
-
     private boolean checkAMapView() {
         if (mMapView == null || mMapView.getMapAutoViewHelper() == null) {
             Logger.e(TAG, "自研mapView实例为空，请检查");
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index 26ba340c36..b4dffd4d1e 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -15,7 +15,6 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo;
-import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.traffic.TrafficData;
@@ -28,8 +27,6 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.map.navi.IMogoNaviListener;
-import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.search.geo.IMogoGeoSearch;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoGeocodeResult;