From 1eb7419b49ff4a9439ca06f7a7ae3f1bfd0880c3 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 30 Oct 2020 16:14:15 +0800
Subject: [PATCH] =?UTF-8?q?H5=E6=8E=A8=E9=80=81=E7=9B=B4=E6=92=AD,?=
 =?UTF-8?q?=E6=9A=82=E6=97=A0=E4=B8=8A=E6=BB=91=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/livecar/V2XPushLiveCarScenario.java | 36 +++++++++----------
 .../scene/livecar/V2XRoadLiveCarScenario.java | 12 +++++--
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
index 4dcd8ff40e..524a02cf2b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
@@ -48,25 +48,25 @@ public class V2XPushLiveCarScenario extends AbsV2XScenario<V2XPushMessageEntity>
 
     @Override
     public void init(@Nullable V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity) {
-        if (!isSameScenario(v2XMessageEntity)
-                && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
-            boolean isWindowShow = V2XServiceManager.getMoGoV2XStatusManager().isLeftLiveVideoShow();
-            if (isWindowShow) {
-                close();
-            }
-            setV2XMessageEntity(v2XMessageEntity);
-            if (v2XMessageEntity != null &&
-                    (v2XMessageEntity.getContent().getVideoSn() != null ||
-                            !TextUtils.isEmpty(v2XMessageEntity.getContent().getVideoUrl()))) {
-                show();
-            } else {
-                TipToast.shortTip("附近没有可直播车机");
-                Logger.e(V2XConst.MODULE_NAME, "直播地址为null");
-            }
-        } else {
-            setV2XMessageEntity(v2XMessageEntity);
-            Logger.w(V2XConst.MODULE_NAME, "要处理的场景已经存在，丢弃这次初始化");
+        boolean isWindowShow = V2XServiceManager.getMoGoV2XStatusManager().isLeftLiveVideoShow();
+        if (isWindowShow) {
+            close();
         }
+        setV2XMessageEntity(v2XMessageEntity);
+        if (v2XMessageEntity != null &&
+                (v2XMessageEntity.getContent().getVideoSn() != null ||
+                        !TextUtils.isEmpty(v2XMessageEntity.getContent().getVideoUrl()))) {
+            show();
+        } else {
+            TipToast.shortTip("附近没有可直播车机");
+            Logger.e(V2XConst.MODULE_NAME, "直播地址为null");
+        }
+//        if (!isSameScenario(v2XMessageEntity)
+//                && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
+//        } else {
+//            setV2XMessageEntity(v2XMessageEntity);
+//            Logger.w(V2XConst.MODULE_NAME, "要处理的场景已经存在，丢弃这次初始化");
+//        }
     }
 
     @Override
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 4a6f7a76bb..74600aa3f2 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
@@ -48,13 +48,19 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
         try {
             List<V2XEventShowEntity> v2XRoadEventEntity = v2XMessageEntity.getContent();
             if (v2XRoadEventEntity != null) {
-                if (v2XMessageEntity.isShowState()) {
+                if (!isSameScenario(v2XMessageEntity)
+                        && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
                     mV2XRoadLiveCarScenario.setV2XWindow(new V2XRoadLiveCarWindow());
                     setV2XMessageEntity(v2XMessageEntity);
                     show();
                 } else {
-                    close();
+                    setV2XMessageEntity(v2XMessageEntity);
+                    Logger.w(V2XConst.MODULE_NAME, "要处理的场景已经存在，丢弃这次初始化");
                 }
+
+            } else {
+                close();
+
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -70,7 +76,7 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
 
     @Override
     public void showWindow() {
-        Log.d(TAG,getV2XWindow().toString());
+        Log.d(TAG, getV2XWindow().toString());
         if (getV2XWindow() != null) {
             getV2XWindow().show(getV2XMessageEntity().getContent());
             V2XServiceManager