From 337e989d3764ec96bb994203f296fbb2fd6ab72b Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 19 May 2023 16:57:41 +0800 Subject: [PATCH] =?UTF-8?q?[MAP]=20=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E7=BA=A7=E5=88=AB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/map/IMogoMap.java | 8 ++++++++ .../mogo/map/uicontroller/IMogoMapUIController.java | 7 +++++++ .../src/main/java/com/mogo/map/AMapViewWrapper.java | 12 ++++++++++++ .../src/main/java/com/mogo/map/AMapWrapper.java | 8 ++++++++ .../main/java/com/mogo/map/MogoMapUIController.java | 8 ++++++++ .../com/mogo/map/uicontroller/AMapUIController.java | 7 +++++++ 6 files changed, 50 insertions(+) diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java index 4e389d5af2..bd5123acf8 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java +++ b/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); + /** * 获取缩放比例 * diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 12306b6eb4..544524a623 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/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模式 * diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index bd73571d31..75a0bc9db1 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/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); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index 69ca87df35..edb13a8f71 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/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()) { diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index ec7c4ad156..0a69e33827 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/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(); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java index 34234961e4..92420346d5 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java +++ b/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) {