1. 优化模块加载、去掉部分逻辑、升级socket版本号

This commit is contained in:
wangcongtao
2020-11-23 17:49:55 +08:00
parent d8eb3569b9
commit 0a3c77cef0
23 changed files with 122 additions and 95 deletions

View File

@@ -258,17 +258,18 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
mStatusManager.setDisplayOverview(TAG, false);
UiThreadHandler.removeCallbacks(mLockCarRunnable);
}
if ( mIsLock ) {
if ( mMApUIController.getCurrentUiMode() == EnumMapUI.CarUp_2D ) {
mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D );
} else if( mMApUIController.getCurrentUiMode() == EnumMapUI.NorthUP_2D ){
mMApUIController.changeMapMode( EnumMapUI.CarUp_2D );
}
} else {
if ( !mApis.getRefreshStrategyControllerApi().restartAutoRefreshAtTime( 0 ) ) {
mStatusManager.setUserInteractionStatus(TAG, true, false);
mMApUIController.recoverLockMode();
}
// if ( mIsLock ) {
// if ( mMApUIController.getCurrentUiMode() == EnumMapUI.CarUp_2D ) {
// mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D );
// } else if( mMApUIController.getCurrentUiMode() == EnumMapUI.NorthUP_2D ){
// mMApUIController.changeMapMode( EnumMapUI.CarUp_2D );
// }
// } else {
//
// }
if ( !mApis.getRefreshStrategyControllerApi().restartAutoRefreshAtTime( 0 ) ) {
mStatusManager.setUserInteractionStatus(TAG, true, false);
mMApUIController.recoverLockMode();
}
}
} );
@@ -753,16 +754,15 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
} else {
mExitNavi.setText(R.string.module_ext_str_continue_navi);
}
if ( isLock ) {
if ( mMApUIController.getCurrentUiMode() == EnumMapUI.CarUp_2D ) {
mMove2CurrentLocation.setImageResource( R.drawable.icon_north_up );
} else {
mMove2CurrentLocation.setImageResource( R.drawable.icon_car_up );
}
} else {
mMove2CurrentLocation.setImageResource( R.drawable.module_map_ic_move2_current_location );
}
// if ( isLock ) {
// if ( mMApUIController.getCurrentUiMode() == EnumMapUI.CarUp_2D ) {
// mMove2CurrentLocation.setImageResource( R.drawable.icon_north_up );
// } else {
// mMove2CurrentLocation.setImageResource( R.drawable.icon_car_up );
// }
// } else {
// mMove2CurrentLocation.setImageResource( R.drawable.module_map_ic_move2_current_location );
// }
}
private void traceData(String from) {
@@ -986,11 +986,11 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
mCameraMode.setSelected(ui == EnumMapUI.NorthUP_2D);
mCameraMode.setText(getString(ui == EnumMapUI.NorthUP_2D ? R.string.mode_car_up : R.string.mode_north_up));
if ( ui == EnumMapUI.CarUp_2D ) {
mMove2CurrentLocation.setImageResource( R.drawable.icon_north_up );
} else if( ui == EnumMapUI.NorthUP_2D ){
mMove2CurrentLocation.setImageResource( R.drawable.icon_car_up );
}
// if ( ui == EnumMapUI.CarUp_2D ) {
// mMove2CurrentLocation.setImageResource( R.drawable.icon_north_up );
// } else if( ui == EnumMapUI.NorthUP_2D ){
// mMove2CurrentLocation.setImageResource( R.drawable.icon_car_up );
// }
}
private static int SEEK_HELP_NOTICE_NUM_MSG_TYPE = 401015;