From 9599f79840adb6d58397390689a49245b6746aad Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 19 Feb 2020 18:37:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=80=E5=87=BA=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/map/impl/amap/AMapNaviViewWrapper.java | 14 +++++++++----- .../com/mogo/map/impl/amap/navi/NaviClient.java | 9 +++++++++ .../extensions/entrance/EntranceFragment.java | 10 +++++----- 3 files changed, 23 insertions(+), 10 deletions(-) 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 c65ca81a70..a9e6eaa1ae 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 @@ -23,6 +23,7 @@ import com.amap.api.maps.model.animation.TranslateAnimation; import com.amap.api.navi.AMapNaviView; import com.amap.api.navi.AMapNaviViewListener; import com.amap.api.navi.AMapNaviViewOptions; +import com.amap.api.navi.enums.AimLessMode; import com.amap.api.navi.model.NaviInfo; import com.mogo.map.IMogoMap; import com.mogo.map.IMogoMapView; @@ -423,11 +424,11 @@ public class AMapNaviViewWrapper implements IMogoMapView, MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); style.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER); style.interval(1000); - style.anchor(0.5F,0.5F); - style.strokeColor(Color.TRANSPARENT); - style.strokeWidth(0); - style.myLocationIcon( - BitmapDescriptorFactory.fromResource(R.drawable.map_api_ic_current_location)); + //style.anchor(0.5F,0.5F); + //style.strokeColor(Color.TRANSPARENT); + //style.strokeWidth(0); + //style.myLocationIcon( + // BitmapDescriptorFactory.fromResource(R.drawable.map_api_ic_current_location)); mMapView.getMap().setMyLocationStyle(style); } } @@ -463,6 +464,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, if (checkAMapView()) { mMapView.setCarOverlayVisible(true); showMyLocation( false ); + NaviClient.getInstance(getContext()).stopAimlessMode(); } } @@ -471,6 +473,8 @@ public class AMapNaviViewWrapper implements IMogoMapView, if (checkAMapView()) { mMapView.setCarOverlayVisible(false); showMyLocation(true); + NaviClient.getInstance(getContext()).startAimlessMode(AimLessMode.CAMERA_AND_SPECIALROAD_DETECTED); + } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java index 19a020fc79..c752f47731 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java @@ -233,4 +233,13 @@ public class NaviClient implements IMogoNavi { mAMapNaviListener.handleClickedPolyline( polyline ); } } + + public void startAimlessMode(int cameraAndSpecialroadDetected) { + mAMapNavi.startAimlessMode(cameraAndSpecialroadDetected); + } + + public void stopAimlessMode() { + mAMapNavi.stopAimlessMode(); + + } } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 11288b1cc7..d4edf466ff 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -134,12 +134,12 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent mExitNavi = findViewById( R.id.module_entrance_id_exit_navi ); mExitNavi.setOnClickListener( view -> { if ( mMogoNavi != null ) { - if ( mIsLock ) { + //if ( mIsLock ) { NaviNoticeDialog naviNoticeDialog = new NaviNoticeDialog( getContext() ); naviNoticeDialog.show(); - } else { - mMApUIController.recoverLockMode(); - } + //} else { + // mMApUIController.recoverLockMode(); + //} } } ); @@ -251,7 +251,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent if ( isLock ) { mExitNavi.setText( R.string.module_ext_str_exit_navi ); } else { - mExitNavi.setText( R.string.module_ext_str_exit_path ); + mExitNavi.setText( R.string.module_ext_str_exit_navi ); } } From a0095043cb0df3fc48d49c8e3b530b4ea2ed84e7 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 19 Feb 2020 18:39:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/map/impl/amap/AMapNaviViewWrapper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 a9e6eaa1ae..6fc7c92606 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 @@ -424,11 +424,11 @@ public class AMapNaviViewWrapper implements IMogoMapView, MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); style.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER); style.interval(1000); - //style.anchor(0.5F,0.5F); - //style.strokeColor(Color.TRANSPARENT); - //style.strokeWidth(0); - //style.myLocationIcon( - // BitmapDescriptorFactory.fromResource(R.drawable.map_api_ic_current_location)); + style.anchor(0.5F,0.5F); + style.strokeColor(Color.TRANSPARENT); + style.strokeWidth(0); + style.myLocationIcon( + BitmapDescriptorFactory.fromResource(R.drawable.map_api_ic_current_location)); mMapView.getMap().setMyLocationStyle(style); } }