From 8604b93c0b0b62729200624a589075f16d0ba7af Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 9 Sep 2024 15:28:23 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0]=20[fix]=20[=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=A0=E9=99=A4statusbar]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wigets/map/switchvisual/VisualViewModel.kt | 2 ++ .../com/mogo/och/facade/route/FacadeProvider.kt | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt index 3fd5f7993e..ff3264072c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.function.api.map.angle.Scene import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.eagle.core.function.angle.scenes.Default +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.UiThreadHandler class VisualViewModel : ViewModel(), @@ -32,6 +33,7 @@ class VisualViewModel : ViewModel(), } override fun onSceneChanged(scene: Scene) { + CallerLogger.d(TAG,"scene:${scene}") if (scene.isCanSwitch()) {// 可切换 when (scene.getVisualAngleMode()) { VisualAngleMode.MODE_MEDIUM_SIGHT -> { diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index 150408add5..0b3c630547 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt @@ -17,6 +17,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager import com.mogo.eagle.core.function.hmi.ui.setting.SopView import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView @@ -61,15 +62,16 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { val fragment = if (LoginStatusManager.isLogin()) { val fragment = getFragment() LoginStatusManager.resetFragment() + injectStatusBar() fragment } else { CallerHmiManager.hideToolsView() ToggleDebugView.toggleDebugView.dismiss() SopView.sopView.dismiss() commonService?.resetFragment() + removeStatusBar() LoginStatusManager.getFragment() } - injectStatusBar() d(TAG, "切换 fragment:${fragment}") @@ -167,6 +169,14 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { override fun onStatusChange(currentStatus: LoginStatusEnum) { d(TAG, "登录状态发生改变 $currentStatus") + when (currentStatus) { + LoginStatusEnum.Login -> { + CallerOrderListenerManager.invokeLoginStatusUpdate(true) + } + else -> { + CallerOrderListenerManager.invokeLoginStatusUpdate(false) + } + } UiThreadHandler.post { showFragment() } @@ -211,6 +221,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { back.replace(containerId, fragment, fragment.tag) back.commitAllowingStateLoss() } + removeStatusBar() } else { onBusinessChange(businessEnum) val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager @@ -222,8 +233,8 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { back.replace(containerId, fragment, fragment.tag) back.commitAllowingStateLoss() } + injectStatusBar() } - injectStatusBar() } private fun injectStatusBar() {