Merge remote-tracking branch 'origin/feature/map_zoom_level' into dev_minibus-d_230425_3.2.0

libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java

@@ -100,6 +100,14 @@ public interface IMogoMap {
      */
     void changeZoom(float zoom);
 
+
+    /**
+     * 改变地图缩放级别的别一种方式
+     *
+     * @param zoom 缩放等级
+     */
+    void changeZoom2(float zoom);
+
     /**
      * 获取缩放比例
      *

libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java

@@ -31,6 +31,13 @@ public interface IMogoMapUIController {
      */
     MapControlResult changeZoom(float zoom);
 
+
+    /**
+     * 修改缩放级别的另一种方式
+     * @param zoom 缩放比例
+     */
+    void changeZoom2(float zoom);
+
     /**
      * 设置地图是否是Debug模式
      *

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

@@ -346,6 +346,18 @@ public class AMapViewWrapper implements IMogoMapView,
         return MapControlResult.SUCCESS;
     }
 
+    @Override
+    public void changeZoom2(float zoom) {
+        if (isVrMold()) {
+            return;
+        }
+        CallerLogger.INSTANCE.d(M_MAP + TAG, "changeZoom2 : " + zoom);
+        if (DebugConfig.isDebug()) {
+            CallerLogger.INSTANCE.d(M_MAP + TAG, Log.getStackTraceString(new Throwable()));
+        }
+        getMap().changeZoom2(zoom);
+    }
+
     @Override
     public void setDebugMode(Boolean debugMode) {
         MapAutoApi.INSTANCE.setDebugMode(debugMode);

libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java

@@ -236,6 +236,14 @@ public class AMapWrapper implements IMogoMap {
         }
     }
 
+    @Override
+    public void changeZoom2(float zoom) {
+        CallerLogger.INSTANCE.d(TAG, "changeZoom %s", zoom);
+        if (checkAMap()) {
+            mAMap.setZoomVal(zoom);
+        }
+    }
+
     @Override
     public float getZoomLevel() {
         if (checkAMap()) {

libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java

@@ -68,6 +68,14 @@ public class MogoMapUIController implements IMogoMapUIController {
         return MapControlResult.ERROR;
     }
 
+    @Override
+    public void changeZoom2(float zoom) {
+        initDelegate();
+        if (mDelegate != null) {
+            mDelegate.changeZoom2(zoom);
+        }
+    }
+
     @Override
     public void setDebugMode(Boolean debugMode) {
         initDelegate();

libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java

@@ -56,6 +56,13 @@ public class AMapUIController implements IMogoMapUIController {
         return MapControlResult.ERROR;
     }
 
+    @Override
+    public void changeZoom2(float zoom) {
+        if (mClient != null) {
+            mClient.changeZoom2(zoom);
+        }
+    }
+
     @Override
     public void setDebugMode(Boolean debugMode) {
         if (mClient != null) {