diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index f2f3864957..b57bf07640 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -587,7 +587,7 @@ class MoGoHmiFragment : MvpFragment activity?.let { val floatWindow = mWarningFloat val showTag = floatWindow?.config?.floatTag - if (floatWindow == null || TextUtils.isEmpty(showTag) || !floatWindow.isShow()) { + if (floatWindow == null || TextUtils.isEmpty(showTag) || !floatWindow.isShow() || floatWindow.config.floatTag != tag) { val notificationView = V2XNotificationView(it) notificationView.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType.toString())) val warningContent = alertContent ?: EventTypeEnum.getWarningContent(v2xType.toString()) @@ -597,8 +597,8 @@ class MoGoHmiFragment : MvpFragment } else { notificationView.setWarningContent(warningContent) } - if (mWarningFloat != null && mWarningFloat!!.config.floatTag != tag) { - WarningFloat.dismiss(mWarningFloat!!.config.floatTag, true) + if (floatWindow != null && floatWindow.isShow()) { + WarningFloat.dismiss(floatWindow.config.floatTag, true) } mWarningFloat = WarningFloat.with(it) .setTag(tag)