From 5e7f92616c27954a15dd639bf7f5f220aa2e049c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 24 Feb 2020 20:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91=20=20=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E9=94=81=E8=BD=A6=E7=BA=A7=E5=88=AB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java | 8 ++++++++ .../mogo/map/impl/amap/uicontroller/AMapUIController.java | 7 +++++++ .../com/mogo/map/uicontroller/IMogoMapUIController.java | 6 ++++++ .../src/main/java/com/mogo/map/MogoMapUIController.java | 7 +++++++ .../java/com/mogo/module/service/MogoServiceProvider.java | 5 +++++ 5 files changed, 33 insertions(+) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index fa7abe8541..369ff9de4b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -462,6 +462,14 @@ public class AMapNaviViewWrapper implements IMogoMapView, } } + @Override + public void setLockZoom(int var1) { + if ( checkAMapView() ) { + Logger.d( TAG, "锁定锁车比例尺" ); + mMapView.setLockZoom(var1); + } + } + @Override public void displayOverview() { if ( checkAMapView() ) { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java index 72da50a6ba..fee5856728 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java @@ -95,6 +95,13 @@ public class AMapUIController implements IMogoMapUIController { } } + @Override + public void setLockZoom(int var1) { + if ( mClient != null ) { + mClient.setLockZoom(var1); + } + } + @Override public void displayOverview() { if ( mClient != null ) { 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 8b854d2844..89f8593d08 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 @@ -59,6 +59,12 @@ public interface IMogoMapUIController { */ void recoverLockMode(); + /** + * 设置锁车缩放级别 + * @param var1 级别 3-20 + */ + void setLockZoom(int var1); + /** * 预览全程 */ 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 05634e5b08..1b008b9743 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 @@ -88,6 +88,13 @@ public class MogoMapUIController implements IMogoMapUIController { } } + @Override + public void setLockZoom(int var1) { + if (mDelegate != null) { + mDelegate.setLockZoom(var1); + } + } + @Override public void displayOverview() { if (mDelegate != null) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index 3af035142f..831857feb8 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -663,6 +663,11 @@ public class MogoServiceProvider implements IMogoModuleProvider, return; } int status = intent.getIntExtra( MogoReceiver.PARAM_ADAS_STATUS, 0 ); + if (status == 1 ){ + MarkerServiceHandler.getMapUIController().setLockZoom(15); + }else{ + MarkerServiceHandler.getMapUIController().setLockZoom(16); + } mStatusManager.setADASUIShow( getModuleName(), status == 1 ); } else if ( Intent.ACTION_POWER_CONNECTED.equals( command ) ) { mStatusManager.setAccStatus( getModuleName(), true );