From e94036f85e1ba3cd29fe4eca851ce9f7bd882aae Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 5 Jan 2021 11:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=87=E6=8D=A2=E9=81=93?= =?UTF-8?q?=E8=B7=AF=E5=8C=B9=E9=85=8D=E6=B5=8B=E8=AF=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/map-custom/build.gradle | 2 +- .../com/mogo/map/impl/custom/AMapViewWrapper.java | 12 ++++++------ .../impl/custom/uicontroller/AMapUIController.java | 6 ++---- .../mogo/map/uicontroller/IMogoMapUIController.java | 2 +- .../main/java/com/mogo/map/MogoMapUIController.java | 4 ++-- .../module/service/intent/MockIntentHandler.java | 2 +- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 6c0a079e2e..6e19847bc0 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.7.2' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.7.3' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.5-log-1' } 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 9a9e817493..27fd4f0f76 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 @@ -889,16 +889,16 @@ public class AMapViewWrapper implements IMogoMapView, } } - private boolean mMatchRoadEnable = false; + private boolean mRtkEnable = false; @Override - public void matchRoadEnable( boolean enable ) { + public void rtkEnable( boolean enable ) { try { - mMatchRoadEnable = !mMatchRoadEnable; - TipToast.shortTip( mMatchRoadEnable ? "gps,已开启道路匹配" : "rtk,已关闭道路匹配" ); - mMapView.getLocationClient().matchRoadEnable( mMatchRoadEnable ); + mRtkEnable = !mRtkEnable; + TipToast.shortTip( mRtkEnable ? "已开启gps道路匹配" : "已开启rtk道路匹配" ); + mMapView.getLocationClient().rtkEnable( mRtkEnable ); } catch ( Exception e ) { - Logger.e( TAG, e, "matchRoadEnable" ); + Logger.e( TAG, e, "rtkEnable" ); } } } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java index dc62c74f1a..8b4516726c 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java @@ -7,14 +7,12 @@ import android.view.View; import android.view.animation.Interpolator; import com.mogo.map.MogoLatLng; -import com.mogo.map.MogoMap; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.MapCameraPosition; import com.mogo.map.uicontroller.MapControlResult; -import com.mogo.utils.logger.Logger; import java.util.List; @@ -293,9 +291,9 @@ public class AMapUIController implements IMogoMapUIController { } @Override - public void matchRoadEnable( boolean enable ) { + public void rtkEnable( boolean enable ) { if ( mClient != null ) { - mClient.matchRoadEnable( enable ); + mClient.rtkEnable( enable ); } } } 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 aba1a2844b..38a8427a1a 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 @@ -247,7 +247,7 @@ public interface IMogoMapUIController { * * @param enable */ - default void matchRoadEnable( boolean enable ) { + default void rtkEnable( boolean enable ) { } } 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 13b52490f9..e3a0c0e25c 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 @@ -285,9 +285,9 @@ public class MogoMapUIController implements IMogoMapUIController { } @Override - public void matchRoadEnable( boolean enable ) { + public void rtkEnable( boolean enable ) { if ( mDelegate != null ) { - mDelegate.matchRoadEnable( enable ); + mDelegate.rtkEnable( enable ); } } } 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 6e35ad5170..bcb6785d5f 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 @@ -385,7 +385,7 @@ public class MockIntentHandler implements IntentHandler { break; case 38: MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController() - .matchRoadEnable( false ); + .rtkEnable( false ); break; } }