yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

Browse Source
This commit is contained in:
wangcongtao
2020-02-19 18:55:27 +08:00
parent e7a6252835 8669eeb3af
commit 764806a977
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
View File

@@ -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);
}
}

9
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
View File

@@ -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();
}
}

10
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -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 );
}
}