diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt index f34d388d46..370bc3932b 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/provider/LoginServiceImpl.kt @@ -60,6 +60,7 @@ class LoginServiceImpl : LoginService,ILoginViewCallback { if(uiModel) { fragment?.let { CallerHmiManager.hideToolsView() + CallerHmiManager.hideSOPSettingView() val parentFragmentManager = it.childFragmentManager val fragmentByTag: Fragment? = parentFragmentManager.findFragmentByTag(TAG) if (fragmentByTag is DialogFragment) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt index 754956167e..f677890be3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt @@ -238,6 +238,10 @@ class MoGoHmiProvider : IMoGoHmiProvider { toolsView.dismiss() } + override fun hideSOPSettingView() { + toolsView.hideSOPSettingView() + } + @BizConfig(V2I, "", BIZ_RTS) override fun showVideoDialog(infList: List) { ThreadUtils.runOnUiThread { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SopView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SopView.kt index ceb84b519c..14be263c58 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SopView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SopView.kt @@ -6,11 +6,9 @@ import android.view.Gravity import android.view.View import android.view.WindowManager import android.view.animation.OvershootInterpolator -import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.enums.SidePattern import com.mogo.eagle.core.function.hmi.notification.WarningFloat import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import me.jessyan.autosize.utils.AutoSizeUtils class SopView private constructor(){ @@ -77,4 +75,12 @@ class SopView private constructor(){ } } } + + fun dismiss() { + if (mSOPSettingViewFloat != null) { + WarningFloat.dismiss(mSOPSettingViewFloat!!.config.floatTag, false) + mSOPSettingViewFloat = null + mSOPSettingView = null + } + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt index 8bbb921d72..cb26d3823b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToolsView.kt @@ -123,4 +123,8 @@ class ToolsView private constructor() { dismissToolsFloatView() } + fun hideSOPSettingView() { + sopView?.dismiss() + } + } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt index 27014553eb..62b9dced0e 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt @@ -66,6 +66,11 @@ interface IMoGoHmiProvider :IProvider{ */ fun hideToolsView() + /** + * 关闭运营面板 + */ + fun hideSOPSettingView() + /** * 展示绑定车辆弹框 */ diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index c9cf543f3a..c72f51addc 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -104,6 +104,13 @@ object CallerHmiManager { hmiProviderApi?.hideToolsView() } + /** + * 关闭运营面板 + */ + fun hideSOPSettingView() { + hmiProviderApi?.hideSOPSettingView() + } + /** * 展示绑定车辆弹框 */