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

Merge branch 'qa_byd'

Browse Source
This commit is contained in:
wangcongtao
2020-08-14 10:07:11 +08:00
parent dc8d7a7dd2 240f30a50a
commit 6189e37e16
6 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/mogo-module-common/src/main/java/com/mogo/module/common/map/CustomNaviInterrupter.java
View File

@@ -38,13 +38,18 @@ class CustomNaviInterrupter implements Interrupter {
/**
* 判断是否用自己的导航
* 1. 项目是否强制使用自己的导航
* 2. 是否安装了高德车机版地图
* 3. 默认使用自己的导航
*
* @return true-用高德公版车机版地图 false-用Launcher自己的导航
*/
@Override
public boolean interrupt() {
if ( AppUtils.isAppInstalled( AbsMogoApplication.getApp(), "com.autonavi.amapauto" )
|| !DebugConfig.isUseCustomNavi() ) {
Logger.d( TAG, "do not use custom map function." );
if ( DebugConfig.isUseCustomNavi() ) {
return false;
}
if ( AppUtils.isAppInstalled( AbsMogoApplication.getApp(), "com.autonavi.amapauto" ) ) {
return true;
}
return false;

31
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -56,7 +56,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
protected IMogoFragmentManager mMogoFragmentManager;
protected IMogoStatusManager mMogoStatusManager;
// protected View mHeader;
// protected View mHeader;
protected View mApps;
protected View mEntrance;
protected FrameLayout mFloatingLayout;
@@ -81,7 +81,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
mFloatingLayout = findViewById( R.id.module_main_id_floating_view );
mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame );
mCoverUpLayout = findViewById( R.id.module_main_id_cover_up );
mLeftPanelLayout = findViewById(R.id.module_main_id_left_panel_fragment_container);
mLeftPanelLayout = findViewById( R.id.module_main_id_left_panel_fragment_container );
// 避免事件穿透导致地图被滑动
mLeftShadowFrame.setOnClickListener( view -> {
@@ -114,8 +114,8 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
if ( mServiceApis == null ) {
mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation();
}
mServiceApis.getShareManager().resetContext(this);
mServiceApis.getAuthManagerApi().showAuth(this);
mServiceApis.getShareManager().resetContext( this );
mServiceApis.getAuthManagerApi().showAuth( this );
mMogoStatusManager = mServiceApis.getStatusManagerApi();
mMogoStatusManager.setMainPageLaunchedStatus( TAG, true );
AutopilotServiceManage.getInstance().init( getContext() );
@@ -187,8 +187,8 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
protected void loadContainerModules() {
// MogoModulesManager.getInstance().loadExtensionsModule( R.id.module_main_id_header_fragment_container );
MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container );
MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container);
MogoModulesManager.getInstance().loadLeftPanelModule(R.id.module_main_id_left_panel_fragment_container);
MogoModulesManager.getInstance().loadEventPanelModule( R.id.module_main_id_event_panel_fragment_container );
MogoModulesManager.getInstance().loadLeftPanelModule( R.id.module_main_id_left_panel_fragment_container );
}
@Override
@@ -209,7 +209,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
public void loadSplash() {
MogoModulesManager.getInstance().loadSplashModule(R.id.module_main_id_splash_container);
MogoModulesManager.getInstance().loadSplashModule( R.id.module_main_id_splash_container );
}
@NonNull
@@ -252,7 +252,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
mIsHomeKeyDown = false;
}
private boolean shouldCloseADASPanel(){
private boolean shouldCloseADASPanel() {
// m4 系列因为按home键会造成页面pause后resume，造成adas panel 闪烁
// f 系列加上上滑返回桌面后会走 mIsHomeKeyDown = true，但是不会造成页面pause
// 独立 app 任何情况下都需要隐藏 adas
@@ -268,19 +268,26 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
public void onBackPressed() {
if ( mMogoFragmentManager.getStackSize() == 0 ) {
if ( mMogoFragmentManager == null
|| mMogoFragmentManager.getStackSize() <= 0 ) {
if ( DebugConfig.isLauncher() ) {
doWhenBackPressed();
return;
} else {
if ( doWhenBackPressed() ) {
return;
}
super.onBackPressed();
}
}
if ( mMogoFragmentManager != null
&& mMogoFragmentManager.getStackSize() > 0 ) {
} else {
mMogoFragmentManager.pop();
}
}
protected boolean doWhenBackPressed() {
return false;
}
@Override
protected void onNewIntent( Intent intent ) {
super.onNewIntent( intent );