From efa2ec578f4958f5dd86d4adaf73c34ca0be5375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 19 Aug 2020 14:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=AA=97=E4=BD=93=E5=90=8E=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java   | 5 +++--
 .../module/v2x/scenario/scene/push/V2XPushEventScenario.java | 2 +-
 .../module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
index 6c06102a66..aa70d637ee 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
@@ -127,8 +127,7 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
     @Override
     public void onViewRemoved(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 动画结束");
-        // 警报状态，true-警报中，false-警报结束
-        V2XServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, false);
+
     }
 
     @Override
@@ -139,6 +138,8 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
     @Override
     public void beforeViewRemoveAnim(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 开始");
+        // 警报状态，true-警报中，false-警报结束
+        V2XServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, false);
         // 打开直播后，窗口倒计时暂停关闭，直播被关闭后继续倒计时
         V2XRoadEventWindow window = (V2XRoadEventWindow) V2XRoadEventScenario.getInstance().getV2XWindow();
         window.startCountDown();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
index 5fc836c2aa..da696e8977 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
@@ -131,7 +131,6 @@ public class V2XPushEventScenario extends AbsV2XScenario<V2XPushMessageEntity> i
     @Override
     public void onViewRemoved(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 动画结束");
-        V2XServiceManager.getMoGoV2XStatusManager().setPushWindowShow(TAG, false);
     }
 
     @Override
@@ -142,6 +141,7 @@ public class V2XPushEventScenario extends AbsV2XScenario<V2XPushMessageEntity> i
     @Override
     public void beforeViewRemoveAnim(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 开始");
+        V2XServiceManager.getMoGoV2XStatusManager().setPushWindowShow(TAG, false);
         // 重置场景提示的消息
         setV2XMessageEntity(null);
         clearPOI();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
index 79bcc6420b..10da5513fe 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
@@ -160,7 +160,6 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
     @Override
     public void onViewRemoved(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 动画结束");
-        V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, false);
     }
 
     @Override
@@ -171,6 +170,7 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
     @Override
     public void beforeViewRemoveAnim(View view) {
         Logger.d(MODULE_NAME, "关闭 Window 开始");
+        V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, false);
         // 重置场景提示的消息
         setV2XMessageEntity(null);
         clearPOI();