From bb74e8442765c2541bab9693824d6b98670b316a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 1 Jun 2021 20:28:52 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20bug=20=E4=BF=AE=E5=A4=8D=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=B7=AF=E5=8F=A3=E3=80=81=E5=89=8D=E6=96=B9=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E7=9B=B4=E6=92=AD=E5=BC=B9=E7=AA=97=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E5=85=B3=E9=97=AD=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84bug=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=B5=8B=E8=AF=95=E9=9D=A2=E6=9D=BF=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9C=B0=E5=9B=BE=E7=89=88=E6=9C=AC1.0.0-vr-?=
 =?UTF-8?q?8.5.36?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/runConfigurations.xml                   |   1 +
 .../com/mogo/launcher/MogoApplication.java    |   4 +-
 config.gradle                                 |   2 +-
 libraries/map-custom/build.gradle             |   2 +-
 .../common/map/MapCenterPointStrategy.java    |   2 +-
 .../extensions/utils/TopViewManager.java      |   9 -
 .../utils/TopViewNoLinkageAnimHelper.java     | 131 +-----
 modules/mogo-module-v2x/consumer-rules.pro    |   1 -
 .../mogo/module/v2x/V2XModuleProvider.java    |   4 +
 .../com/mogo/module/v2x/V2XObuManager.java    |   4 +-
 .../v2x/alarm/V2XEarlyWarningServer.java      |  26 +-
 .../v2x/scenario/impl/V2XScenarioManager.java |   1 +
 .../v2x/scenario/scene/V2XBasWindow.java      |   1 -
 .../scene/livecar/V2XPushLiveCarScenario.java |   4 -
 .../scene/livecar/V2XVoiceCallLiveBiz.java    |  20 +-
 .../livecar/V2XVoiceCallLiveScenario.java     |   1 +
 .../scene/test/V2XTestConsoleWindow.java      | 415 ------------------
 .../mogo/module/v2x/utils/EventTypeUtils.java |   2 +-
 .../module/v2x/view/V2XLiveGSYVideoView.java  |  13 +-
 .../windowview/IMogoTopViewManager.java       |   7 -
 20 files changed, 68 insertions(+), 582 deletions(-)
 delete mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d8b..e497da9998 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 77aaf7f766..5a10a15340 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -157,7 +157,7 @@ public class MogoApplication extends AbsMogoApplication {
         // 设置是否是第三APP登录
         clientConfig.setThirdLogin(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
         // 设置是否输出日志
-        clientConfig.setShowDebugLog(true);
+        clientConfig.setShowDebugLog(false);
         // 设置是否是直播推流的主播
         clientConfig.setAnchor(false);
         // 设置从蘑菇AI开放平台获取的APPKey
@@ -192,7 +192,7 @@ public class MogoApplication extends AbsMogoApplication {
                                 .getApis().getMapServiceApi()
                                 .getSingletonLocationClient(getApp())
                                 .getLastKnowLocation();
-                Logger.i(TAG, "刷新DNS" + mogoLocation);
+                //Logger.i(TAG, "刷新DNS" + mogoLocation);
                 if (mogoLocation != null) {
                     return new HttpDnsSimpleLocation(
                             mogoLocation.getCityCode(),
diff --git a/config.gradle b/config.gradle
index 325b270279..a2db6d6cc8 100644
--- a/config.gradle
+++ b/config.gradle
@@ -13,7 +13,7 @@ ext {
             compileSdkVersion              : 28,
             buildToolsVersion              : "29.0.2",
             minSdkVersion                  : 19,
-            targetSdkVersion               : 19,
+            targetSdkVersion               : 22,
             minSdkVersionPadLenovo         : 23,
             targetSdkVersionPadLenovo      : 23,
     ]
diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index 30c0064173..ce9057bea4 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -67,7 +67,7 @@ dependencies {
         implementation project(':foudations:mogo-commons')
     }
 
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.35'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.36'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }
 
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
index 022550f286..22bc26856e 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
@@ -271,7 +271,7 @@ public class MapCenterPointStrategy {
             return;
         }
         if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
-            Logger.w( TAG, "vr 模式下忽略该设置" );
+            //Logger.w( TAG, "vr 模式下忽略该设置" );
             return;
         }
         Map< Integer, Map< String, MapCenterPoint > > strategies = sCommonStrategies;
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
index f7152a92a0..0663d8c14b 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java
@@ -133,15 +133,6 @@ public class TopViewManager implements IMogoTopViewManager {
         }
     }
 
-    @Override
-    public boolean isViewNoLinkageAdded(View view) {
-        try {
-            return TopViewNoLinkageAnimHelper.getInstance().isViewAdded(view);
-        } catch( Exception e ){
-            return false;
-        }
-    }
-
     @Override
     public void removeAllViewInVrMode() {
         try {
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java
index 50974b952c..4c2822fea3 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java
@@ -34,7 +34,6 @@ public class TopViewNoLinkageAnimHelper {
     private TopView topContainerNoLinkage;
 
     private volatile boolean isTopViewOut = true;
-    private final List<View> viewCaches = new ArrayList<>();
     private final Map<View, IMogoTopViewStatusListener> statusListenerMap = new ArrayMap<>();
 
     private View currentAnimatingView = null;
@@ -61,10 +60,6 @@ public class TopViewNoLinkageAnimHelper {
     }
 
     public void init(ConstraintLayout rootView) {
-        init(rootView, null);
-    }
-
-    public void init(ConstraintLayout rootView, OnTopViewAnimSimpleListener listener) {
         topMotionLayout = rootView;
         topContainerNoLinkage = rootView.findViewById(R.id.module_entrance_id_top_container_no_linkage);
 
@@ -85,96 +80,29 @@ public class TopViewNoLinkageAnimHelper {
         if (params == null) {
             throw new IllegalArgumentException("method addTopView params LayoutParams is null");
         }
-        if (!viewCaches.contains(view)) {
-            // 判断此view是否已经增加到了顶部view，如果增加过就不增加了
-            view.setTranslationY(0);
-            statusListenerMap.put(view, statusListener);
-            Logger.d(TAG, "开始执行");
-            isTopViewOut = false;
-            if (topContainerNoLinkage.getChildCount() > 0) {
-                // 顶部view已经有了内容，新增内容无需整体布局变化，只是新增布局加个动画
-                viewCaches.add(view);
 
-                // 生硬的删掉之前的view
-                int lastCount = topContainerNoLinkage.getChildCount();
-                Logger.d(TAG, "进入动画，lastCount: " + lastCount);
-                for (int i = 0; i < lastCount; i++) {
-                    View lastView = topContainerNoLinkage.getChildAt(i);
-                    if (statusListenerMap.get(lastView) != null) {
-                        statusListenerMap.get(lastView).beforeViewRemoveAnim(lastView);
-                    }
-                    viewCaches.remove(lastView);
-                    if (statusListenerMap.get(lastView) != null) {
-                        statusListenerMap.remove(lastView).onViewRemoved(lastView);
-                    }
-                }
-                Logger.d(TAG, "生硬的删掉了之前的view: " + viewCaches.size());
-                topContainerNoLinkage.removeAllViews();
-                // 同时设置一下隐藏状态
-                MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, false);
+        // 判断此view是否已经增加到了顶部view，如果增加过就不增加了
+        view.setTranslationY(0);
+        statusListenerMap.put(view, statusListener);
+        Logger.d(TAG, "开始执行");
+        isTopViewOut = false;
 
-                // 如果高度变化，生硬的变化一下高度
-                Logger.d(TAG, "container.height: " + topContainerNoLinkage.getHeight());
-                if (topContainerNoLinkage.getHeight() != params.height) {
-                    LayoutParams p = topContainerNoLinkage.getLayoutParams();
-                    p.height = params.height;
-                    topContainerNoLinkage.setLayoutParams(p);
-                    topContainerNoLinkage.setTranslationY(params.height);
-                    Logger.d(TAG, "改变container的高度===");
-                }
-
-                view.setTranslationY(-(params.height));
-                topContainerNoLinkage.addView(view, params);
-                Logger.d(TAG, "顶部view已经有布局了，增加新增view滑入动画: " + view.getTranslationY() + "  height:" +
-                        " " + view.getHeight() + "  paramsHeight: " + params.height);
-                if (statusListenerMap.get(view) != null) {
-                    statusListenerMap.get(view).beforeViewAddAnim(view);
-                }
-                view.animate().translationY(0).setDuration(500).setListener(new Animator.AnimatorListener() {
-                    @Override
-                    public void onAnimationStart(Animator animation) {
-
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animation) {
-                        IMogoTopViewStatusListener listener = statusListenerMap.get(view);
-                        if (listener != null) {
-                            listener.onViewAdded(view);
-                        }
-                    }
-
-                    @Override
-                    public void onAnimationCancel(Animator animation) {
-
-                    }
-
-
-                    @Override
-                    public void onAnimationRepeat(Animator animation) {
-
-                    }
-                }).start();
-            } else {
-                // 顶部view还没有内容，需要整体下移
-                currentAnimatingView = view;
-                viewCaches.add(view);
-                topContainerNoLinkage.addView(view, params);
-                Logger.d(TAG, "整体进入==== view.visibility: " + view.getVisibility() + "  view" +
-                        ".position: (" + view.getX() + ", " + view.getY() + ") params.width: " + params.width + "  params.height: " + params.height);
-                if (statusListenerMap.get(view) != null) {
-                    statusListenerMap.get(view).beforeViewAddAnim(view);
-                }
-                topContainerNoLinkage.setChildAddedListener(child -> {
-                    topContainerNoLinkage.setChildAddedListener(null);
-                    NoMapTopViewShaderHelper.getInstance().showShader();
-                    topContainerNoLinkage.animate().translationY(child.getHeight()).setListener(mainAnimListener).start();
-                    int scene = Scene.AIMLESS_WITH_ROAD_EVENT;
-                    Logger.d(TAG, "show top setMapCenterPointByScene: " + scene);
-                    MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene);
-                });
-            }
+        // 顶部view还没有内容，需要整体下移
+        currentAnimatingView = view;
+        topContainerNoLinkage.addView(view, params);
+        Logger.d(TAG, "整体进入==== view.visibility: " + view.getVisibility() + "  view" +
+                ".position: (" + view.getX() + ", " + view.getY() + ") params.width: " + params.width + "  params.height: " + params.height);
+        if (statusListenerMap.get(view) != null) {
+            statusListenerMap.get(view).beforeViewAddAnim(view);
         }
+        topContainerNoLinkage.setChildAddedListener(child -> {
+            topContainerNoLinkage.setChildAddedListener(null);
+            NoMapTopViewShaderHelper.getInstance().showShader();
+            topContainerNoLinkage.animate().translationY(child.getHeight()).setListener(mainAnimListener).start();
+            int scene = Scene.AIMLESS_WITH_ROAD_EVENT;
+            Logger.d(TAG, "show top setMapCenterPointByScene: " + scene);
+            MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene);
+        });
 
         MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, true);
 
@@ -188,6 +116,8 @@ public class TopViewNoLinkageAnimHelper {
      * 退出最新的（也就是最上面的）view
      */
     private void startLatestTopOutAnim() {
+        Logger.d(TAG, "startLatestTopOutAnim=====");
+
         if (topContainerNoLinkage.getChildCount() > 0) {
             startTopOutAnim(topContainerNoLinkage.getChildAt(topContainerNoLinkage.getChildCount() - 1));
         }
@@ -198,7 +128,7 @@ public class TopViewNoLinkageAnimHelper {
             return;
         }
         Logger.d(TAG, "startTopOutAnim=====");
-        if (!isTopViewOut && viewCaches.contains(view)) {
+        if (!isTopViewOut) {
             // 顶部view仅剩一个view，需要整体上移
             if (statusListenerMap.get(view) != null) {
                 statusListenerMap.get(view).beforeViewRemoveAnim(view);
@@ -217,24 +147,12 @@ public class TopViewNoLinkageAnimHelper {
         return (int) topMotionLayout.getContext().getResources().getDimensionPixelSize(resId);
     }
 
-    interface OnTopViewAnimSimpleListener {
-        void onAnimStart();
-
-        void onAnimEnd();
-    }
-
-    public boolean isViewAdded(View view) {
-        return viewCaches.contains(view);
-    }
-
-
     public void removeAllView() {
         Logger.d(TAG, "remove all view");
         isTopViewOut = true;
         int lastCount = topContainerNoLinkage.getChildCount();
         for (int i = 0; i < lastCount; i++) {
             View child = topContainerNoLinkage.getChildAt(i);
-            viewCaches.remove(child);
             IMogoTopViewStatusListener listener = statusListenerMap.remove(child);
             if (listener != null) {
                 listener.beforeViewRemoveAnim(child);
@@ -268,13 +186,12 @@ public class TopViewNoLinkageAnimHelper {
 
         @Override
         public void onAnimationEnd(Animator animation) {
-            Logger.d(TAG, "onMainAnimEnd: " + currentAnimatingView);
+            Logger.d(TAG, "isTopViewOut: " + isTopViewOut);
             IMogoTopViewStatusListener listener;
             if (isTopViewOut) {
                 int lastCount = topContainerNoLinkage.getChildCount();
                 for (int i = 0; i < lastCount; i++) {
                     View child = topContainerNoLinkage.getChildAt(i);
-                    viewCaches.remove(child);
                     listener = statusListenerMap.remove(child);
                     if (listener != null) {
                         listener.onViewRemoved(child);
diff --git a/modules/mogo-module-v2x/consumer-rules.pro b/modules/mogo-module-v2x/consumer-rules.pro
index 8a55cbc5d2..05db144996 100644
--- a/modules/mogo-module-v2x/consumer-rules.pro
+++ b/modules/mogo-module-v2x/consumer-rules.pro
@@ -6,7 +6,6 @@
 -keep class com.mogo.module.v2x.marker.*{*;}
 -keep class com.mogo.module.v2x.utils.SpanUtils.Align
 -keep class com.mogo.module.v2x.utils.TimeConstants.Unit
--keep class com.mogo.module.v2x.scenario.scene.test.V2XTestConsoleWindow{*;}
 -keep class com.mogo.module.v2x.utils.SpanUtils.SerializableSpannableStringBuilder{*;}
 -keep class com.mogo.module.v2x.utils.V2XUtils{*;}
 -keep class com.mogo.module.v2x.view.*{*;}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
index 01c4b29e7b..3f13716984 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
@@ -53,6 +53,7 @@ import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 import com.mogo.utils.storage.SharedPrefsMgr;
+import com.tencent.liteav.basic.log.TXCLog;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 import static com.mogo.module.v2x.VideoInitKt.initVideo;
@@ -133,6 +134,9 @@ public class V2XModuleProvider implements
     public void init(Context context) {
         Logger.d(MODULE_NAME, "V2X 模块初始化。。。。");
         mContext = context;
+        // 关闭腾讯直播日志
+        TXCLog.setLevel(TXCLog.LOG_NONE);
+        TXCLog.setConsoleEnabled(false);
 
         V2XUtils.init(context);
         V2XServiceManager.init(context);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
index 50c1dfb939..548639f6c4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
@@ -178,9 +178,9 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
 
     @Override
     public void onEventInfoCallback(MogoObuEventInfo info) {
-        Logger.d("V2X_OBU_EVENT", "carEventInfo==" + info);
+        //Logger.d("V2X_OBU_EVENT", "carEventInfo==" + info);
         if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
-            Logger.d("V2X_OBU_EVENT", "vr模式下不展示obu事件");
+            //Logger.d("V2X_OBU_EVENT", "vr模式下不展示obu事件");
             return;
         }
         Long last = intervalMap.get(info.getTypeCode());
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
index db5b7cabcf..2db3438e30 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
@@ -55,23 +55,23 @@ public class V2XEarlyWarningServer {
 
                     // 封路、施工、拥堵、拥堵 才会有UGC提示
                     if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) {
-                        Logger.w(MODULE_NAME,
-                                "V2X预警--UGC检测：" +
-                                        "\n事件详情：" + roadInfoId +
-                                        "\n事件详情：" + EventTypeUtils.getPoiTypeStr(v2XRoadEventEntity.getPoiType()) +
-                                        "\n车头方向： " + carBearing +
-                                        "\n车与事件夹角：" + eventAngle +
-                                        "\n已经UGC的事件：" + GsonUtil.jsonFromObject(alertMessageId)
-                        );
+//                        Logger.w(MODULE_NAME,
+//                                "V2X预警--UGC检测：" +
+//                                        "\n事件详情：" + roadInfoId +
+//                                        "\n事件详情：" + EventTypeUtils.getPoiTypeStr(v2XRoadEventEntity.getPoiType()) +
+//                                        "\n车头方向： " + carBearing +
+//                                        "\n车与事件夹角：" + eventAngle +
+//                                        "\n已经UGC的事件：" + GsonUtil.jsonFromObject(alertMessageId)
+//                        );
                         // 判断是否预警过了
                         if (!alertMessageId.contains(roadInfoId)) {
                             // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了
                             if (80 <= eventAngle) {
-                                Logger.w(MODULE_NAME + "_" + TAG, "V2X预警UGC--事件与车头角度夹角过大：" +
-                                        "\n角度：" + eventAngle + " 度" +
-                                        "\n事件详情：" + roadInfoId +
-                                        "\n库存事件：" + V2XAlarmServer.mAlertRoadEventList.size()
-                                );
+//                                Logger.w(MODULE_NAME + "_" + TAG, "V2X预警UGC--事件与车头角度夹角过大：" +
+//                                        "\n角度：" + eventAngle + " 度" +
+//                                        "\n事件详情：" + roadInfoId +
+//                                        "\n库存事件：" + V2XAlarmServer.mAlertRoadEventList.size()
+//                                );
 
                                 // 记录已经 UGC 提醒过的数据
                                 alertMessageId.add(roadInfoId);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
index b3d8aa1170..094bd071a4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -26,6 +26,7 @@ import com.mogo.module.v2x.scenario.scene.warning.V2XFrontWarningScenario;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
+import com.mogo.utils.network.utils.GsonUtil;
 
 import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_RECOMMEND_PARKING;
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/V2XBasWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/V2XBasWindow.java
index b805c72c5d..97929a0d71 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/V2XBasWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/V2XBasWindow.java
@@ -43,6 +43,5 @@ public class V2XBasWindow extends RelativeLayout {
      */
     protected void release() {
         Logger.w(TAG, "release……");
-
     }
 }
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 2753c14411..d85fd31184 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
@@ -33,10 +33,6 @@ public class V2XPushLiveCarScenario extends AbsV2XScenario<V2XPushMessageEntity>
     public void init(@Nullable V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity) {
         if (!isSameScenario(v2XMessageEntity)
                 && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) {
-            boolean isWindowShow = V2XServiceManager.getMoGoV2XStatusManager().isLeftLiveVideoShow();
-            if (isWindowShow) {
-                close();
-            }
             setV2XMessageEntity(v2XMessageEntity);
             if (v2XMessageEntity != null &&
                     (v2XMessageEntity.getContent().getVideoSn() != null ||
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
index 74ce706ab8..c15562e7e7 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
@@ -19,6 +19,7 @@ import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
+import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.utils.ToastUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -143,9 +144,8 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener {
     public void getFrontCarLive() {
         LiveStreamManagerImpl.getInstance(AbsMogoApplication.getApp(),
                 MoGoAiCloudClientConfig.getInstance().getThirdPartyDeviceId());
-        V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, null);
-        V2XVoiceCallLiveScenario mV2XVoiceCallLiveScenario = new V2XVoiceCallLiveScenario();
-        mV2XVoiceCallLiveScenario.init(v2XMessageEntity);
+        V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, null, V2XMessageEntity.V2XTypeEnum.ALERT_VOICE_CALL_FOR_LIVECAR_SHOW);
+        V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
     }
 
     /**
@@ -157,9 +157,8 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener {
             @Override
             public void liveUrlResult(String liveUrl) {
                 if (!TextUtils.isEmpty(liveUrl)) {
-                    V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, liveUrl);
-                    V2XPushLiveCarScenario pushLiveCarScenario = new V2XPushLiveCarScenario();
-                    pushLiveCarScenario.init(v2XMessageEntity);
+                    V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, liveUrl, V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING);
+                    V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
                 } else {
                     Logger.d(MODULE_NAME, "getOpenRoadCameraLive 路口实况直播地址为空");
                     ToastUtils.showShort(R.string.v2x_front_live_url_null);
@@ -184,9 +183,8 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener {
             @Override
             public void liveUrlResult(String liveUrl) {
                 if (!TextUtils.isEmpty(liveUrl)) {
-                    V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, liveUrl);
-                    V2XPushLiveCarScenario pushLiveCarScenario = new V2XPushLiveCarScenario();
-                    pushLiveCarScenario.init(v2XMessageEntity);
+                    V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, liveUrl, V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING);
+                    V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
                 } else {
                     Logger.d(MODULE_NAME, "getOpenRoadCameraLive 路口实况直播地址为空");
                     ToastUtils.showShort(R.string.v2x_specific_live_url_null);
@@ -208,14 +206,14 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener {
      * @param liveUrl 直播Url
      * @return {@link V2XMessageEntity<V2XPushMessageEntity>}
      */
-    private V2XMessageEntity<V2XPushMessageEntity> buildCallLiveParams(String sn, String liveUrl) {
+    private V2XMessageEntity<V2XPushMessageEntity> buildCallLiveParams(String sn, String liveUrl, int type) {
         V2XPushMessageEntity v2XPushMessageEntity = new V2XPushMessageEntity();
         v2XPushMessageEntity.setVideoSn(sn);
         v2XPushMessageEntity.setVideoUrl(liveUrl);
         v2XPushMessageEntity.setShowWindow(true);
         v2XPushMessageEntity.setExpireTime(1000 * 30);
         V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = new V2XMessageEntity<>();
-        v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_VOICE_CALL_FOR_LIVECAR_SHOW);
+        v2XMessageEntity.setType(type);
         v2XMessageEntity.setContent(v2XPushMessageEntity);
         v2XMessageEntity.setShowState(true);
         return v2XMessageEntity;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
index 1b7c047ccd..fe0d7d6c3f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
@@ -25,6 +25,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 public class V2XVoiceCallLiveScenario extends AbsV2XScenario<V2XPushMessageEntity> implements IMogoTopViewStatusListener {
 
     public V2XVoiceCallLiveScenario() {
+        Logger.d(V2XConst.MODULE_NAME, "V2XVoiceCallLiveScenario new()" );
         setV2XWindow(new V2XVoiceCallLiveCarWindow());
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
deleted file mode 100644
index 03934fbeb9..0000000000
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
+++ /dev/null
@@ -1,415 +0,0 @@
-package com.mogo.module.v2x.scenario.scene.test;
-
-import android.content.Context;
-import android.content.Intent;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-import android.widget.ToggleButton;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import com.google.android.flexbox.FlexboxLayout;
-import com.mogo.module.common.entity.MarkerExploreWay;
-import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPushMessageEntity;
-import com.mogo.module.common.entity.V2XRoadEventEntity;
-import com.mogo.module.common.entity.V2XWarningEntity;
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XConst;
-import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.alarm.V2XAlarmServer;
-import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
-import com.mogo.module.v2x.entity.net.V2XSpecialCarRes;
-import com.mogo.module.v2x.scenario.scene.livecar.V2XVoiceCallLiveBiz;
-import com.mogo.module.v2x.utils.TestOnLineCarUtils;
-import com.mogo.module.v2x.utils.V2XSQLiteUtils;
-import com.mogo.utils.TipToast;
-import com.zhidao.carchattingprovider.MogoDriverInfo;
-
-import java.util.List;
-
-import static android.text.style.TtsSpan.GENDER_MALE;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020/4/24 11:34 AM
- * desc   : 用来测试的控制台 Window
- * version: 1.0
- */
-@Deprecated
-public class V2XTestConsoleWindow extends ConstraintLayout {
-    private static V2XTestConsoleWindow mV2XTestConsoleWindow;
-
-    private LinearLayout mFlTestPanel;
-    private FlexboxLayout flTestPanelShunNormal;
-    private FlexboxLayout flTestPanelShunYi;
-    private FlexboxLayout flTestPanelVR;
-    private Button mBtnTriggerOpen;
-    private Button mBtnTriggerRoadEvent;
-    private Button mBtnClearRoadEvent;
-    private Button mBtnTriggerPushEvent;
-    private Button mBtnTriggerWarningEvent;
-    private Button mBtnTriggerPushLiveCarEvent;
-    private Button mBtnTriggerAnimationEvent;
-    private Button mBtnbtnFrontCarLiveEvent;
-    private Button mBtnbtnXINGLiveEvent;
-    private Button mBtnTriggerFatigueDrivingEvent;
-    private Button mBtnTriggerSeekHelpEvent;
-    private Button mBtnTriggerParkEvent;
-    private Button mBtnTriggerCallUserInfo;
-    private Button mBtnTriggerEventUgc;
-    private Button mBtnTriggerTrafficSearch;
-    private Button mBtnTriggerRecommendRouteEvent;
-    private ToggleButton nBtnTriggerVR;
-    private Button mBtnAdasDataWarn;
-
-
-    private Button btnTriggerRearVIPCarTip,
-            btnTriggerVehicleBrakes,
-            btnTriggerRearDangerousVehicles,
-            btnTriggerReverseVehicleRoutePrediction,
-            btnTriggerVIPLightChange,
-            btnTriggerObstacleDetour,
-            btnTriggerPedestrianWarning,
-            btnTriggerCongestedRouteRecommendation,
-            btnTriggerDoubleFlash;
-
-    public static V2XTestConsoleWindow getInstance(Context context, int showType) {
-        if (mV2XTestConsoleWindow == null) {
-            synchronized (V2XTestConsoleWindow.class) {
-                if (mV2XTestConsoleWindow == null) {
-                    mV2XTestConsoleWindow = new V2XTestConsoleWindow(context, showType);
-                }
-            }
-        }
-        return mV2XTestConsoleWindow;
-    }
-
-    public V2XTestConsoleWindow(Context context, int showType) {
-        super(context);
-        initView(context, showType);
-    }
-
-    public V2XTestConsoleWindow(Context context) {
-        this(context, null);
-    }
-
-    public V2XTestConsoleWindow(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public V2XTestConsoleWindow(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initView(context, 0);
-    }
-
-    private void initView(Context context, int showType) {
-        LayoutInflater.from(context).inflate(R.layout.window_test_console, this);
-
-        mFlTestPanel = findViewById(R.id.flTestPanel);
-        flTestPanelShunNormal = findViewById(R.id.flTestPanelShunNormal);
-        flTestPanelShunYi = findViewById(R.id.flTestPanelShunYi);
-        flTestPanelVR = findViewById(R.id.flTestPanelVR);
-        mBtnTriggerOpen = findViewById(R.id.btnTriggerOpen);
-        mBtnTriggerWarningEvent = findViewById(R.id.btnTriggerWarningEvent);
-        mBtnClearRoadEvent = findViewById(R.id.btnClearRoadEvent);
-        mBtnTriggerRoadEvent = findViewById(R.id.btnTriggerRoadEvent);
-        mBtnTriggerPushEvent = findViewById(R.id.btnTriggerPushEvent);
-        mBtnTriggerPushLiveCarEvent = findViewById(R.id.btnTriggerPushLiveCarEvent);
-        mBtnTriggerAnimationEvent = findViewById(R.id.btnTriggerAnimationEvent);
-        mBtnbtnFrontCarLiveEvent = findViewById(R.id.btnFrontCarLiveEvent);
-        mBtnbtnXINGLiveEvent = findViewById(R.id.btnXINGLiveEvent);
-        mBtnTriggerFatigueDrivingEvent = findViewById(R.id.btnTriggerFatigueDrivingEvent);
-        mBtnTriggerSeekHelpEvent = findViewById(R.id.btnTriggerSeekHelpEvent);
-        mBtnTriggerParkEvent = findViewById(R.id.btnTriggerParkEvent);
-        mBtnTriggerEventUgc = findViewById(R.id.btnTriggerEventUgc);
-        mBtnTriggerCallUserInfo = findViewById(R.id.btnTriggerCallUserInfo);
-        mBtnTriggerTrafficSearch = findViewById(R.id.btnTriggerTrafficSearch);
-        mBtnTriggerRecommendRouteEvent = findViewById(R.id.btnTriggerRecommendRouteEvent);
-        nBtnTriggerVR = findViewById(R.id.btnTriggerVR);
-        mBtnAdasDataWarn = findViewById(R.id.btnAdasDataWarn);
-
-        switch (showType) {
-            case 0:
-                flTestPanelShunNormal.setVisibility(View.VISIBLE);
-                flTestPanelShunYi.setVisibility(View.VISIBLE);
-                break;
-            case 1:
-                flTestPanelShunNormal.setVisibility(View.VISIBLE);
-                break;
-            case 2:
-                flTestPanelShunYi.setVisibility(View.VISIBLE);
-                break;
-        }
-
-        nBtnTriggerVR.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                V2XServiceManager.getMoGoStatusManager().setVrMode("nBtnTriggerVR", isChecked);
-            }
-        });
-
-        btnTriggerRearVIPCarTip = findViewById(R.id.btnTriggerRearVIPCarTip);
-        btnTriggerVehicleBrakes = findViewById(R.id.btnTriggerVehicleBrakes);
-        btnTriggerRearDangerousVehicles = findViewById(R.id.btnTriggerRearDangerousVehicles);
-        btnTriggerReverseVehicleRoutePrediction = findViewById(R.id.btnTriggerReverseVehicleRoutePrediction);
-        btnTriggerVIPLightChange = findViewById(R.id.btnTriggerVIPLightChange);
-        btnTriggerObstacleDetour = findViewById(R.id.btnTriggerObstacleDetour);
-        btnTriggerPedestrianWarning = findViewById(R.id.btnTriggerPedestrianWarning);
-        btnTriggerCongestedRouteRecommendation = findViewById(R.id.btnTriggerCongestedRouteRecommendation);
-        btnTriggerDoubleFlash = findViewById(R.id.btnTriggerDoubleFlash);
-
-
-        switch (showType) {
-            case 0:
-                flTestPanelShunNormal.setVisibility(View.VISIBLE);
-                flTestPanelShunYi.setVisibility(View.VISIBLE);
-                flTestPanelVR.setVisibility(View.VISIBLE);
-                break;
-            case 1:
-                flTestPanelShunNormal.setVisibility(View.VISIBLE);
-                break;
-            case 2:
-                flTestPanelShunYi.setVisibility(View.VISIBLE);
-                break;
-            case 3:
-                flTestPanelVR.setVisibility(View.VISIBLE);
-                break;
-        }
-
-
-        mBtnTriggerCallUserInfo.setOnClickListener(v -> {
-            MogoDriverInfo mogoDriverInfo = new MogoDriverInfo();
-            mogoDriverInfo.setAge(24);
-            mogoDriverInfo.setGender(GENDER_MALE);
-            mogoDriverInfo.setSn("12345678");
-            mogoDriverInfo.setUserName("测试");
-            mogoDriverInfo.setUserHead("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1600872867592&di=994e371880ca6ae2814f553e0d0e4139&imgtype=0&src=http%3A%2F%2Fp3.ssl.cdn.btime.com%2Ft014c5d8a1e5cef12ba.jpg%3Fsize%3D506x543");
-            if (V2XServiceManager.getCarsChattingProvider() != null) {
-                V2XServiceManager.getCarsChattingProvider().showUserWindow("CAR_CALL_USER_TO_" + V2XConst.MODULE_NAME, mogoDriverInfo, context);
-            }
-        });
-
-        mBtnTriggerOpen.setOnClickListener(v ->
-                V2XServiceManager
-                        .getIMogoWindowManager()
-                        .removeView(V2XTestConsoleWindow.getInstance(context, showType))
-        );
-
-        mBtnClearRoadEvent.setOnClickListener(v -> {
-            V2XAlarmServer.mAlertRoadEventList.clear();
-            V2XSQLiteUtils.clearScenarioHistoryData();
-            TipToast.tip("缓存已清除");
-        });
-
-        mBtnTriggerRoadEvent.setOnClickListener(v -> {
-            V2XMessageEntity<V2XRoadEventEntity> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XScenarioRoadEventData();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-
-
-            // 存储本地，出行动态作展示
-            saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING,
-                    v2XMessageEntity.getContent().getNoveltyInfo());
-
-        });
-
-        //车路云—场景预警-V1.0 碰撞预警
-//        mBtnTriggerWarningEvent.setOnClickListener(v -> {
-//            V2XMessageEntity<V2XWarningEntity> v2XMessageEntity =
-//                    TestOnLineCarUtils.getV2XScenarioPushFrontWarningEventData("right");
-//
-//            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-//            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-//            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-//        });
-
-        mBtnTriggerPushEvent.setOnClickListener(v -> {
-            V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XScenarioPushEventData();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-        });
-
-        mBtnTriggerPushLiveCarEvent.setOnClickListener(v -> {
-            V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XScenarioPushLiveEventData();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-        });
-
-        mBtnTriggerAnimationEvent.setOnClickListener(v -> {
-            V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XScenarioAnimationEventData();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-        });
-
-        mBtnbtnFrontCarLiveEvent.setOnClickListener(v -> {
-            V2XVoiceCallLiveBiz.getInstance().getFrontCarLive();
-        });
-
-        mBtnbtnXINGLiveEvent.setOnClickListener(v -> {
-            V2XVoiceCallLiveBiz.getInstance().getOpenRoadCameraLive();
-        });
-
-        mBtnTriggerFatigueDrivingEvent.setOnClickListener(v -> {
-            V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XScenarioFatigueDrivingData();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-        });
-
-        mBtnTriggerSeekHelpEvent.setOnClickListener(v -> {
-            V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XScenarioSeekHelpData();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-        });
-
-
-        mBtnTriggerEventUgc.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                V2XMessageEntity<V2XRoadEventEntity> v2XMessageEntity =
-                        TestOnLineCarUtils.getV2XScenarioRoadEventUGCData();
-
-                Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-                intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-                LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-            }
-        });
-
-        mBtnTriggerParkEvent.setOnClickListener(v -> {
-            Log.d("触发违章停车事件", "00");
-            V2XMessageEntity<List<MarkerExploreWay>> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XIllegalParkData();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-        });
-
-        mBtnAdasDataWarn.setOnClickListener(v -> {
-            Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "right");
-            getContext().sendBroadcast(intent);
-        });
-
-        mBtnTriggerTrafficSearch.setOnClickListener(v -> V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus());
-
-        mBtnTriggerRecommendRouteEvent.setOnClickListener(view -> {
-            // V2XServiceManager.getV2XRefreshModel().queryRoadData("ZD802C1938L10797");
-            V2XServiceManager.getV2XRefreshModel().queryRoadData("ZD802B1932L00622");
-        });
-
-        /*
-         *后方VIP车辆提示
-         * */
-        btnTriggerRearVIPCarTip.setOnClickListener(v -> {
-
-        });
-        /*
-         *前车急刹
-         * */
-        btnTriggerVehicleBrakes.setOnClickListener(v -> {
-
-        });
-        /*
-         *后方危险车辆预警
-         * */
-        btnTriggerRearDangerousVehicles.setOnClickListener(v -> {
-
-        });
-
-        /*
-         * 逆向车辆路线预判
-         * */
-        btnTriggerReverseVehicleRoutePrediction.setOnClickListener(v -> {
-            V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XScenarionVRReverseCarData();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-        });
-
-        /*
-         *VIP变灯通行
-         * */
-        btnTriggerVIPLightChange.setOnClickListener(v -> {
-
-        });
-
-        /*
-         *车路云场景预警-左侧
-         * */
-        btnTriggerObstacleDetour.setOnClickListener(v -> {
-            Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "left");
-            getContext().sendBroadcast(intent);
-        });
-
-        /*
-         *行人预警，行人路线预测  车路云预警-前方行人
-         * */
-        btnTriggerPedestrianWarning.setOnClickListener(v -> {
-            Intent intent = new Intent(V2XConst.BROADCAST_ADAS_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY, "pedestrians");
-            getContext().sendBroadcast(intent);
-        });
-
-        /*
-         *拥堵路线推荐
-         * */
-        btnTriggerCongestedRouteRecommendation.setOnClickListener(v -> {
-            V2XMessageEntity<V2XOptimalRouteDataRes> v2XMessageEntity =
-                    TestOnLineCarUtils.getV2XOptimalRoute();
-
-            Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
-            intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
-        });
-
-        /*
-         *双闪车辆，自动绕行
-         * */
-        btnTriggerDoubleFlash.setOnClickListener(v -> {
-
-        });
-    }
-
-    /**
-     * 存储本地数据
-     *
-     * @param v2XRoadEventEntity 要存储的场景
-     */
-    public void saveLocalStory(int scenarioType, MarkerExploreWay v2XRoadEventEntity) {
-        try {
-            V2XSQLiteUtils.saveLocalStory(scenarioType, v2XRoadEventEntity, v2XRoadEventEntity.hashCode());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
index c3b54799ea..286f0f32f3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
@@ -26,7 +26,7 @@ public class EventTypeUtils {
         // 先获取网络配置的poi对应的名称
         PoiWrapper wrapper = CloudPoiManager.getInstance().getWrapperByPoiType(poiType);
         if (wrapper != null) {
-            Logger.d("EventTypeUtils", "从配置表中拿到了相关数据： " + wrapper.getTitle());
+            //Logger.d("EventTypeUtils", "从配置表中拿到了相关数据： " + wrapper.getTitle());
             return wrapper.getTitle();
         }
         // 如果获取不到，那么就用本地默认的
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
index 9df92acde9..c06a8c09c5 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
@@ -95,6 +95,7 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS
         txLivePlayConfig.setConnectRetryCount(30);
         mLivePlayer.setConfig(txLivePlayConfig);
 
+
         mLivePlayer.enableHardwareDecode(true);
 
         mLoading = findViewById(R.id.loading);
@@ -144,10 +145,10 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS
                 mLivePlayer.setPlayListener(new ITXLivePlayListener() {
                     @Override
                     public void onPlayEvent(int event, Bundle bundle) {
-                        Logger.w(MODULE_NAME,
-                                "直播信息= " + GsonUtil.jsonFromObject(carLiveInfo) +
-                                        "\n播放器：onPlayEvent==" + event +
-                                        "\nbundle===" + bundle);
+//                        Logger.i(MODULE_NAME,
+//                                "直播信息= " + GsonUtil.jsonFromObject(carLiveInfo) +
+//                                        "\n播放器：onPlayEvent==" + event +
+//                                        "\nbundle===" + bundle);
                         if (event == TXLiveConstants.PLAY_EVT_PLAY_LOADING) {
                             mLoading.setVisibility(VISIBLE);
                             mClLoadError.setVisibility(GONE);
@@ -170,7 +171,7 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS
 
                     @Override
                     public void onNetStatus(Bundle bundle) {
-                        Logger.w(MODULE_NAME, "播放器：onNetStatus===bundle===" + bundle);
+//                        Logger.i(MODULE_NAME, "播放器：onNetStatus===bundle===" + bundle);
                     }
                 });
             }
@@ -184,7 +185,7 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS
 
     public void stopLive(MarkerCarInfo.CarLiveInfo carLiveInfo) {
         try {
-            Logger.w(MODULE_NAME, "心跳：关闭直播...");
+            //Logger.i(MODULE_NAME, "心跳：关闭直播...");
             // 暂停
             mLivePlayer.pause();
             // true 代表清除最后一帧画面
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewManager.java
index 3593e3ec8c..c2113766d5 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewManager.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewManager.java
@@ -118,13 +118,6 @@ public interface IMogoTopViewManager extends IProvider {
      */
     boolean isViewAdded(View view);
 
-    /**
-     * 这个view是否已经被添加进了顶部布局
-     * @param view 待查询的view
-     * @return true-已经添加  false-未添加
-     */
-    boolean isViewNoLinkageAdded(View view);
-
     /**
      * 在vr模式下，隐藏所有topview，除了vr模式下的导航信息
      */