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

This commit is contained in:
wangcongtao
2020-02-19 18:55:27 +08:00
3 changed files with 18 additions and 5 deletions

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