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 b01cd4514a..80fc1f77bf 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; @@ -465,6 +466,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, if (checkAMapView()) { mMapView.setCarOverlayVisible(true); showMyLocation( false ); + NaviClient.getInstance(getContext()).stopAimlessMode(); } } @@ -473,6 +475,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 71a1f69d5a..0506ff0a2f 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 @@ -138,12 +138,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(); + //} } } ); @@ -256,7 +256,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 ); } }