Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

# Conflicts:
#	core/function-impl/mogo-core-function-map/build.gradle

libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java

@@ -130,6 +130,10 @@ public class AMapViewWrapper implements IMogoMapView,
         if (options != null) {
             //设置手势是否可以缩放 isCanZoom true 可缩放 false 不可缩放
             options.setZoomGesturesEnabled(true);
+            options.setScaleVRMode(true);
+            if (options.getMyLocationStyle() != null) {
+                options.getMyLocationStyle().setDisplayAnimEnable(false);
+            }
             // 设置自车的图片对象
             //options.setMyLocationStyle(options.getMyLocationStyle().myLocationIcon(DEFAULT_OPTION.getCarCursorRes()));
         }
@@ -335,24 +339,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实例为空，请检查");