- * 描述 - */ -public class BackToLauncherConst { - - public static final String MODULE_NAME ="MOGO_BACK_2_LAUNCHER"; - - public static final String MODULE_PATH = "/back2launcher/ui"; -} diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java index fc323c8ae3..952ece3f5c 100644 --- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java +++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java @@ -9,6 +9,8 @@ import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.debug.DebugConfig; +import com.mogo.module.common.MogoModulePaths; +import com.mogo.service.MogoServicePaths; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; @@ -18,7 +20,7 @@ import com.mogo.service.module.ModuleType; *
* 描述 */ -@Route( path = BackToLauncherConst.MODULE_PATH ) +@Route( path = MogoServicePaths.PATH_BACK ) public class BackToLauncherModuleProvider implements IMogoModuleProvider { private static final String TAG = "BackToLauncherModuleProvider"; @@ -36,7 +38,7 @@ public class BackToLauncherModuleProvider implements IMogoModuleProvider { @NonNull @Override public String getModuleName() { - return BackToLauncherConst.MODULE_NAME; + return TAG; } @Override diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 22692aeddb..eb3be1a916 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -278,7 +278,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { mServiceApis.getAdasControllerApi().showADAS(); } - mServiceApis.getLauncherApi().setFloatButtonVisible( false ); + if ( mServiceApis.getLauncherApi() != null ) { + mServiceApis.getLauncherApi().setFloatButtonVisible( false ); + } } @Override @@ -290,7 +292,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme if ( shouldCloseADASPanelWhenPause() ) { mServiceApis.getAdasControllerApi().closeADAS(); } - mServiceApis.getLauncherApi().setFloatButtonVisible( true ); + if ( mServiceApis.getLauncherApi() != null ) { + mServiceApis.getLauncherApi().setFloatButtonVisible( true ); + } } protected boolean shouldCloseADASPanelWhenPause() { diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index bda89f02ad..08b519fed8 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -112,7 +112,9 @@ public class SchemeIntent implements IMogoStatusChangedListener { delay = 5_000L; } mNextIntent = new IntentWrapper(intent, delay); - mApis.getLauncherApi().backToLauncher(mContext); + if ( mApis.getLauncherApi() != null ) { + mApis.getLauncherApi().backToLauncher(mContext); + } return; } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java index 0c0f8722a6..cf2e41b2a7 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java @@ -117,7 +117,9 @@ public class MapPresenter extends Presenter< MapView > implements AIAssist.getInstance( getContext() ).speakTTSVoice( "已为您继续导航" ); UiThreadHandler.removeCallbacks( mLockCarRunnable ); } else { - mLauncher.backToLauncher( getContext() ); + if ( mLauncher != null ) { + mLauncher.backToLauncher( getContext() ); + } UiThreadHandler.postDelayed( () -> { try { mStatusManager.setDisplayOverview( TAG, false ); @@ -136,7 +138,9 @@ public class MapPresenter extends Presenter< MapView > implements if ( CustomNaviInterrupter.getInstance().interrupt() ) { return; } - mLauncher.backToLauncher( getContext() ); + if ( mLauncher != null ) { + mLauncher.backToLauncher( getContext() ); + } if ( !mMogoMapService.getNavi( getContext() ).isNaviing() && !mStatusManager.isSearchUIShow() ) { mSearchManager.showSearch(); } @@ -148,7 +152,9 @@ public class MapPresenter extends Presenter< MapView > implements if ( CustomNaviInterrupter.getInstance().interrupt() ) { return; } - mLauncher.backToLauncher( getContext() ); + if ( mLauncher != null ) { + mLauncher.backToLauncher( getContext() ); + } mMogoSearchManager.calculatePath( new MogoLatLng( lat, lon ) ); } @@ -158,7 +164,9 @@ public class MapPresenter extends Presenter< MapView > implements // 导航过程中语音指令退出导航，会出现 activity 不走 onResume 的情况 UiThreadHandler.postDelayed( () -> { if ( AppUtils.isAppForeground( getContext() ) && !hasOthersActivity() && !mStatusManager.isMainPageOnResume() ) { - mLauncher.backToLauncher( getContext() ); + if ( mLauncher != null ) { + mLauncher.backToLauncher( getContext() ); + } } }, 500L ); return; @@ -203,7 +211,9 @@ public class MapPresenter extends Presenter< MapView > implements mView.getUIController().displayOverview( mDisplayOverviewBounds ); AIAssist.getInstance( getContext() ).speakTTSVoice( "展示全程路线" ); } else { - mLauncher.backToLauncher( getContext() ); + if ( mLauncher != null ) { + mLauncher.backToLauncher( getContext() ); + } UiThreadHandler.postDelayed( () -> { mStatusManager.setUserInteractionStatus( TAG, true, false ); mStatusManager.setDisplayOverview( TAG, true ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index e78d6601cc..a27ce3c033 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -171,7 +171,6 @@ public class MogoServices implements IMogoMapListener, private IMogoIntentManager mIntentManager; private IMogoActionManager mActionManager; private IMogoADASController mADASController; - private IMogoLauncher mLauncher; private IMogoFragmentManager mFragmentManager; private IMogoNavi mNavi; private IMogoRegisterCenter mRegisterCenter; @@ -557,7 +556,6 @@ public class MogoServices implements IMogoMapListener, mIntentManager.registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, this); mADASController = MarkerServiceHandler.getADASController(); - mLauncher = MarkerServiceHandler.getLauncher(); mFragmentManager = MarkerServiceHandler.getFragmentManager(); mFragmentManager.addMainFragmentStackTransactionListener(this); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MyLocationHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MyLocationHandler.java index 4504dd7e01..95f1d1e6c6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MyLocationHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MyLocationHandler.java @@ -22,7 +22,9 @@ public class MyLocationHandler implements IntentHandler { if ( MarkerServiceHandler.getMogoStatusManager().isMainPageOnResume() ) { MarkerServiceHandler.getMapUIController().recoverLockMode(); } else { - MarkerServiceHandler.getLauncher().backToLauncher( context ); + if ( MarkerServiceHandler.getLauncher() != null ) { + MarkerServiceHandler.getLauncher().backToLauncher( context ); + } UiThreadHandler.postDelayed( () -> { MarkerServiceHandler.getMapUIController().recoverLockMode(); }, 2_000L ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/WholeVoiceCommandIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/WholeVoiceCommandIntentHandler.java index e7f77292d1..757877f314 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/WholeVoiceCommandIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/WholeVoiceCommandIntentHandler.java @@ -50,7 +50,9 @@ class WholeVoiceCommandIntentHandler implements IntentHandler { } switch ( command ) { case ServiceConst.COMMAND_BACK: - MarkerServiceHandler.getLauncher().backToLauncher( context ); + if ( MarkerServiceHandler.getLauncher() != null ) { + MarkerServiceHandler.getLauncher().backToLauncher( context ); + } break; } } diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java index 66d798f936..940e957a6a 100644 --- a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java +++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java @@ -227,7 +227,9 @@ class AutoNaviIntentHandler implements IMogoVoiceCmdCallBack { private void enterApp( Context context ) { try { if ( DebugConfig.isLauncher() ) { - MogoWidgetManger.getInstance().getApis().getLauncherApi().backToLauncher( context ); + if ( MogoWidgetManger.getInstance().getApis().getLauncherApi() != null ) { + MogoWidgetManger.getInstance().getApis().getLauncherApi().backToLauncher( context ); + } } else { LaunchUtils.launchByPkg( context, "com.mogo.launcher.app" ); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java index 5cc6cba1d2..8d5f687c8e 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java @@ -279,4 +279,9 @@ public class MogoServicePaths { * 全局免唤醒 */ public static final String PATH_GLOBAL_UNWAKE = "/global/unwake"; + + /** + * 返回悬浮按钮 + */ + public static final String PATH_BACK = "/back2launcher/ui"; }