From 3dd02556bf73d434b683ff31a94e3d89befa170e Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 18 Apr 2023 11:29:40 +0800
Subject: [PATCH] =?UTF-8?q?[2.15.0][V2N]=20=E4=BC=98=E5=8C=96=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E8=BE=B9=E6=A1=86=E5=B1=95=E7=A4=BA=E5=92=8C=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java  | 1 -
 .../v2n/scenario/scene/warning/V2XFrontWarningScenario.java    | 3 ---
 .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt     | 1 -
 .../mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt   | 3 +++
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java
index 3ac400e900..be0d509a70 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java
@@ -177,7 +177,6 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
 
     @Override
     public void onDismiss() {
-        CallerHmiManager.INSTANCE.dismissWarning(WarningDirectionEnum.ALERT_WARNING_TOP);
         if (isNeedChangeAngle()) {
             CallerVisualAngleManager.INSTANCE.changeAngle(new Default(3, TimeUnit.SECONDS));
         }
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java
index af31f6bc55..56c2e609aa 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java
@@ -166,9 +166,6 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas
 
     @Override
     public void onDismiss() {
-        if (mDirection != null) {
-            CallerHmiManager.INSTANCE.dismissWarning(mDirection);
-        }
 //        clearPOI();
     }
 }
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 a2742b44fd..53668b88a6 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
@@ -121,7 +121,6 @@ class MoGoHmiProvider : IMoGoHmiProvider {
                 return
             }
             listener?.onShow()
-            CallerV2XWarningListenerManager.dismiss()
             CallerV2XWarningListenerManager.show(v2xType, direction, expireTime)
             CallerLogger.d(
                 "$M_HMI$TAG",
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt
index a6aaa074e4..d648a661a4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt
@@ -63,6 +63,8 @@ class V2XWarningView @JvmOverloads constructor(
     private fun showWarning(direction: WarningDirectionEnum, time: Long = ALL_CLOSE_TIMER) {
         // 如果传入的不是关闭显示，则设置倒计时，定时关闭红框警示
         if (oldDirection.get() == direction) {
+            removeCallbacks(closeWarningTask)
+            postDelayed(closeWarningTask, time)
             return
         }
         if (direction != ALERT_WARNING_NON) {
@@ -225,6 +227,7 @@ class V2XWarningView @JvmOverloads constructor(
                 }
             }
             clearAnimation()
+            this.oldDirection.set(null)
         }
     }