merge

2021-06-02 15:44:45 +08:00
parent a0ea55bd79 d877e15807
commit 52bcb38e6d
32 changed files with 193 additions and 662 deletions
--- 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" />
--- a/app/README.md
+++ b/app/README.md
@@ -25,6 +25,7 @@
 6. d8xx: D系列(2+32) - independent
 7. d82x: D系列(1+16) - independent
 8. byd: 比亚迪应用市场 - independent
+9. PadLenovo: 联想pad适配 - launcher

 ### env 维度

--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -40,6 +40,7 @@ import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.storage.SharedPrefsMgr;
 import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.RefWatcher;
 import com.zhidao.boot.persistent.lib.PersistentManager;
 import com.zhidao.mogo.module.left.panel.LeftPanelConst;

@@ -54,7 +55,7 @@ public class MogoApplication extends AbsMogoApplication {
    private static final String TAG = "MogoApplication";

    private long start;
-
+    private volatile static RefWatcher refWatcher;
    @Override
    public void onCreate() {
        initDebugConfig();
@@ -156,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
@@ -191,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(),
@@ -281,7 +282,9 @@ public class MogoApplication extends AbsMogoApplication {
            startService(intent);
        }

-        LeakCanary.install(this);
+        if (refWatcher != null){
+            refWatcher  = LeakCanary.install(this);
+        }

        // 初始化 bugly 升级
        ARouter.getInstance().navigation(UpgradeReportProvider.class);
--- 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,
    ]
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -1,6 +1,8 @@
 package com.mogo.commons.mvp;

+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.MotionEvent;
@@ -46,6 +48,24 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
    protected void onResume() {
        super.onResume();
        hideBottomUIMenu();
+        startVoicePad();
+    }
+
+    /**
+     * 在Pad上拉起语音
+     */
+    private void startVoicePad() {
+        try {
+            if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
+                Intent intent = new Intent();
+                intent.setComponent(new ComponentName("com.zhidao.speech.voice.pad",
+                        "com.zhidao.speech.MainActivity"));
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
    }

    //隐藏导航栏
--- 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'
 }

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
@@ -35,7 +35,9 @@ public abstract class MogoBaseMapView extends FrameLayout implements ILifeCycle

    private void init( Context context ) {
        addMapView( context );
-        MogoMap.getInstance().init( getContext(), mMapView.getMap() );
+        if (mMapView != null){
+            MogoMap.getInstance().init( getContext(), mMapView.getMap() );
+        }
    }

    protected abstract void addMapView( Context context );
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/DataTypes.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/DataTypes.java
@@ -8,13 +8,19 @@ public
 * 描述
 */
 class DataTypes {
+
    /**
-     * adas识别数据
+     * 识别感知和云端感知数据，全部标记为Marker融合数据
+     */
+    public static final String TYPE_MARKER_MERGE = "TYPE_MARKER_MERGE";
+
+    /**
+     * adas识别数据，Mock用
     */
    public static final String TYPE_MARKER_ADAS = "TYPE_MARKER_ADAS";

    /**
-     * 云端下发数据
+     * 云端下发数据，Mock用
     */
    public static final String TYPE_MARKER_CLOUD_DATA = "TYPE_MARKER_CLOUD_DATA";

--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
@@ -20,6 +20,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

+import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_ADAS;
+
 public
 /**
 * @author congtaowang
@@ -256,7 +258,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
    }

    /**
-     * 绘制某个物体的一个数据  todo 缓存问题
+     * 绘制某个物体的一个数据
     *
     * @param recognizedListResult           {@link ADASRecognizedResult}
     * @param newAdasRecognizedMarkersCaches
@@ -289,16 +291,14 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
            final MogoLatLng renderLoc = new MogoLatLng(recognizedListResult.lat, recognizedListResult.lon);
            long cost = System.currentTimeMillis() - start;
            final long intervalRef = interval - cost;
-//            SimpleHandlerThreadPool.getInstance().postRender(() -> {
            marker.addDynamicAnchorPosition(renderLoc, (float) recognizedListResult.heading, intervalRef);
-//            });
        } else {
            marker.setRotateAngle(((float) recognizedListResult.heading));
            marker.setPosition(recognizedListResult.lat, recognizedListResult.lon);
        }
        String carColor = recognizedListResult.color;
        if (TextUtils.isEmpty(carColor)) {
-            carColor = getModelRenderColor(recognizedListResult.type, recognizedListResult.speed, recognizedListResult.lon, recognizedListResult.lat, recognizedListResult.heading);
+            carColor = getModelRenderColor(recognizedListResult.type, FROM_ADAS, recognizedListResult.speed, recognizedListResult.lon, recognizedListResult.lat, recognizedListResult.heading);
        }
        marker.setAnchorColor(carColor);

@@ -323,10 +323,10 @@ class AdasRecognizedResultDrawer extends BaseDrawer {

        String carColor = recognizedListResult.color;
        if (TextUtils.isEmpty(carColor)) {
-            carColor = getModelRenderColor(recognizedListResult.type, recognizedListResult.speed, recognizedListResult.lon, recognizedListResult.lat, recognizedListResult.heading);
+            carColor = getModelRenderColor(recognizedListResult.type, FROM_ADAS, recognizedListResult.speed, recognizedListResult.lon, recognizedListResult.lat, recognizedListResult.heading);
        }
        MogoMarkerOptions options = new MogoMarkerOptions()
-                .owner(DataTypes.TYPE_MARKER_ADAS)
+                .owner(DataTypes.TYPE_MARKER_MERGE)
                .anchor(0.5f, 0.5f)
                .set3DMode(true)
                .gps(true)
@@ -336,7 +336,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
                .icon3DRes(resId)
                .rotate((float) recognizedListResult.heading)
                .position(new MogoLatLng(recognizedListResult.lat, recognizedListResult.lon));
-        IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(DataTypes.TYPE_MARKER_ADAS, options);
+        IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(DataTypes.TYPE_MARKER_MERGE, options);
        cacheMarkerIconResMd5Val(resIdVal, marker);
        return marker;
    }
@@ -358,6 +358,6 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
        if (mLastPositions != null) {
            mLastPositions.clear();
        }
-        sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_ADAS);
+        sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_MERGE);
    }
 }
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
@@ -26,9 +26,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

 import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_ADAS;
-import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_MY_LOCATION;
-import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_ADAS;
-import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_DATA;
+import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_ROAD_UNIT;
 import static java.lang.Math.PI;

 public
@@ -208,39 +206,47 @@ class BaseDrawer {
     * @param lat   纬度
     * @return 实际车辆颜色
     */
-    protected String getModelRenderColor(int type, double speed, double lon, double lat, double angle) {
+    protected String getModelRenderColor(int type, int fromType, double speed, double lon, double lat, double angle) {

        AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type);
        if (recognizedType == AdasRecognizedType.classIdTrafficBus) {
            return "#D8D8D8FF";
        }
-        if (recognizedType == AdasRecognizedType.classIdUnKnow) { //todo unKnow颜色绘制
+        if (recognizedType == AdasRecognizedType.classIdUnKnow) {
            return Car3DModelColor.Normal.color;
        }
-        // 距离策略
-        double[] coordinates = getCurCoordinates();
-        double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100;
-        if (distance < 50) {
-            return Car3DModelColor.Dangerous.color;
-        } else if (distance < 100 && distance >= 50) {
-            return Car3DModelColor.Warming.color;
-        }
-
-//         他车车速和自车车速对比速度策略
-//         自车速度 >= 50% 危险
-//         10% < 自车速度 < 50% 警告
-        double curSpeed = getCurSpeed();
-        if (curSpeed > 0 && speed > curSpeed) {
-            double rate = ((speed - curSpeed) / curSpeed) * 100;
-            if (rate >= 50) {
-                return Car3DModelColor.Dangerous.color;
-            } else if (rate > 10 && rate < 50) {
-                return Car3DModelColor.Warming.color;
-            }
-        }
+        // 距离策略 todo 此处两种策略是临时方案
+//        double[] coordinates = getCurCoordinates();
+//        double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100;
+//        if (distance < 50) {
+//            return Car3DModelColor.Dangerous.color;
+//        } else if (distance < 100 && distance >= 50) {
+//            return Car3DModelColor.Warming.color;
+//        }
+//
+////         他车车速和自车车速对比速度策略
+////         自车速度 >= 50% 危险
+////         10% < 自车速度 < 50% 警告
+//        double curSpeed = getCurSpeed();
+//        if (curSpeed > 0 && speed > curSpeed) {
+//            double rate = ((speed - curSpeed) / curSpeed) * 100;
+//            if (rate >= 50) {
+//                return Car3DModelColor.Dangerous.color;
+//            } else if (rate > 10 && rate < 50) {
+//                return Car3DModelColor.Warming.color;
+//            }
+//        }

        // 默认颜色
-        return Car3DModelColor.Normal.color;
+        switch (fromType) {
+            case FROM_ADAS:
+                return Car3DModelColor.Normal_Visual.color;
+            case FROM_ROAD_UNIT:
+                return Car3DModelColor.Normal_Cloud.color;
+            default:
+                return Car3DModelColor.Normal.color;
+        }
+//        return Car3DModelColor.Normal.color;
    }

    /**
@@ -292,6 +298,9 @@ class BaseDrawer {
    public enum Car3DModelColor {

        Normal("#D8D8D8FF"),
+        Normal_Visual("#D8CFF8BD"),
+        Normal_Cloud("#D8F8D69B"),
+
        Warming("#FFD53EFF"),
        Dangerous("#FF3C45FF");

@@ -467,14 +476,4 @@ class BaseDrawer {
        return new double[]{lon, lat};
    }

-    protected String getDataTypes(int fromType) {
-        switch (fromType) {
-            case FROM_MY_LOCATION:
-                return TYPE_MARKER_CLOUD_DATA;
-            case FROM_ADAS:
-                return TYPE_MARKER_ADAS;
-            default:
-                return TYPE_MARKER_CLOUD_DATA;
-        }
-    }
 }
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
@@ -34,6 +34,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

+import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_MERGE;
+
 /**
 * @author congtaowang
 * @since 2020/10/28
@@ -120,7 +122,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
            }
            mMarkersCaches.clear();
            mLastPositions.clear();
-            sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_CLOUD_DATA);
+            sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_MERGE);
            return true;
        }
        if (data == null || (
@@ -130,7 +132,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
                mMarkersCaches.clear();
            }
            mLastPositions.clear();
-            sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_CLOUD_DATA);
+            sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_MERGE);
            return true;
        }
        return false;
@@ -244,7 +246,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
    }

    private void removeUselessLastRecord() {  // todo 最好重新设计一个数据结构，用于多线程数据过期失效的场景，参见redis数据过期
-        if (mLastPositions == null || mLastPositions.isEmpty()) {
+        if (mLastPositions.isEmpty()) {
            return;
        }
        IMogoADASController adasControllerApi = MogoApisHandler.getInstance().getApis().getAdasControllerApi();
@@ -299,13 +301,19 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
            lastLat = lastPosition.getWgslat();
        }

-//        double[] matchLonLat = getMatchLonLat(cloudRoadData.getUuid(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading(), lastLon, lastLat);
-//
-//        SocketDownData.CloudRoadDataProto.Builder builder = cloudRoadData.toBuilder();
+        double[] matchLonLat = getMatchLonLat(cloudRoadData.getUuid(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading(), lastLon, lastLat);
+
+        SocketDownData.CloudRoadDataProto.Builder builder = cloudRoadData.toBuilder();
 //        builder.setWgslon(matchLonLat[0]);
 //        builder.setWgslat(matchLonLat[1]);
+        builder.setWgslon(56.0);
+        builder.setWgslat(57.0);

-//        cloudRoadData = builder.build();  //todo 验证值是否改变
+        double lon = cloudRoadData.getWgslon();
+        Log.d(TAG, "test lon : " + lon);
+
+
+//        cloudRoadData = builder.build();

        mLastPositions.put(uniqueKey, cloudRoadData);

@@ -321,7 +329,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
            marker.setRotateAngle(((float) cloudRoadData.getHeading()));
            marker.setPosition(cloudRoadData.getWgslat(), cloudRoadData.getWgslon());
        }
-        marker.setAnchorColor(getModelRenderColor(cloudRoadData.getType(), cloudRoadData.getSpeed(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading()));
+        marker.setAnchorColor(getModelRenderColor(cloudRoadData.getType(), cloudRoadData.getFromType(), cloudRoadData.getSpeed(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading()));
        if (shouldShowSpeed(cloudRoadData.getType())) {
            showSelfSpeed(marker, cloudRoadData.getSpeed(), cloudRoadData.getUuid(), cloudRoadData.getType(), MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode());
        }
@@ -335,7 +343,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
     */
    private void prepareData(List<SocketDownData.CloudRoadDataProto> in, List<SocketDownData.CloudRoadDataProto> out) {
        filterData(in);
-//        foreCastPoint(in);
+        foreCastPoint(in);
        out.addAll(in);
    }

@@ -425,7 +433,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
        }

        MogoMarkerOptions options = new MogoMarkerOptions()
-                .owner(getDataTypes(data.getFromType()))
+                .owner(TYPE_MARKER_MERGE)
                .anchor(0.5f, 0.5f)
                .rotate((float) data.getHeading())
                .object(data)
@@ -435,7 +443,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
        String resIdVal;
        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
            options.set3DMode(true);
-            options.anchorColor(getModelRenderColor(data.getType(), data.getSpeed(), data.getWgslon(), data.getWgslat(), data.getHeading()));
+            options.anchorColor(getModelRenderColor(data.getType(), data.getFromType(), data.getSpeed(), data.getWgslon(), data.getWgslat(), data.getHeading()));
            int resId = getModelRes(data.getType());
            resIdVal = resId + "";
            options.resName(mMarkerCachesResMd5Values.get(resIdVal));
@@ -446,7 +454,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
            options.icon(view);
            resIdVal = view.getId() + "";
        }
-        IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(getDataTypes(data.getFromType()), options);
+        IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(TYPE_MARKER_MERGE, options);
        cacheMarkerIconResMd5Val(resIdVal, marker);

        if (!TextUtils.isEmpty(data.getSn())) {
@@ -502,7 +510,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
    }

    /**
-     * 展示用户信息米娜版
+     * 展示用户信息面版
     *
     * @param data 道路数据
     */
--- 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;
--- 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 {
--- 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);
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -965,6 +965,11 @@ public class MogoServices implements IMogoMapListener,

    @Override
    public void onAdasCarDataCallback( ADASCarStateInfo stateInfo ) {
+
+        if(TimeDelayUploadManager.getInstance().isMock()){  //模拟数据时，不更新由工控机传输的自车位置
+            return;
+        }
+
        if ( stateInfo != null && stateInfo.getValues() != null ) {
            JSONObject data = new JSONObject();
            try {
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -2,8 +2,6 @@ package com.mogo.module.service.marker;

 import android.content.Context;
 import android.graphics.Rect;
-import android.os.Handler;
-import android.os.Message;
 import android.text.TextUtils;

 import com.mogo.cloud.socket.entity.SocketDownData;
@@ -38,13 +36,11 @@ import com.mogo.module.service.network.RefreshModel;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
 import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
-import com.mogo.service.adas.entity.ADASRecognizedResult;
 import com.mogo.service.module.IMogoBizActionDoneListener;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.ViewUtils;
-import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.carchattingprovider.ICallChatResponse;

@@ -148,7 +144,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
            @Override
            public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) {
                DebugConfig.setStatus(DebugConfig.sDownloadSnapshot, true);
-//                SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData);  //todo 6月4号 提测版本中去掉云端下发数据展示
+                SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData);  //todo 6月4号 提测版本中去掉云端下发数据展示
 //                Message msg = mSnapshotHandler.obtainMessage();
 //                msg.obj = mogoSnapshotSetData;
 //                msg.what = MSG_SNAPSHOT;
@@ -158,11 +154,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener,

        // adas 每隔一定频率传递过来的数据
        MarkerServiceHandler.getApis().getAdasControllerApi().addAdasRecognizedDataCallback(resultList -> {
+            AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList);
 //            Message msg = mSnapshotHandler.obtainMessage();
 //            msg.obj = resultList;
 //            msg.what = MSG_ADAS;
 //            msg.sendToTarget();
-            AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList);

            //添加自车的定位图标，碰撞只有一个预警,还需要和adas 联调，
 //            for ( ADASRecognizedResult result : resultList) {
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -11,7 +11,6 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.commons.data.BaseData;
 import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.uploadintime.SnapshotLocationController;
 import com.mogo.module.service.MarkerServiceHandler;
@@ -20,6 +19,7 @@ import com.mogo.module.service.network.bean.MockSocketReceiverData;
 import com.mogo.module.service.network.bean.MockSocketSendData;
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
+import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
@@ -53,6 +53,7 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
    private long mRecordSatelliteTime; //todo 后续多点模拟用

    private TimeDelayApiService timeDelayApiService;
+    private IMogoADASController adasControllerApi;

    private TimeDelayUploadManager() {

@@ -69,11 +70,16 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
        return timeDelayUploadManager;
    }

+    public boolean isMock(){
+        return isMockData;
+    }
+
    public void init(Context mContext) {
        MogoApisHandler.getInstance()
                .getApis()
                .getSocketManagerApi(mContext).registerOnMessageListener(MSG_SOCKET_TYPE, this);
        MoGoAiCloudRealTime.registerOnMsgListener(this);
+        adasControllerApi = MogoApisHandler.getInstance().getApis().getAdasControllerApi();
    }

    private final Handler mockHandler = new Handler(WorkThreadHandler.newInstance("mock-algorithm-work-thread").getLooper()) {
@@ -92,7 +98,6 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
                } catch (JSONException e) {
                    e.printStackTrace();
                }
-                Logger.d(TAG,"模拟自车位置  lon : " +  mMockData.getLon()  + "   lat : "  + mMockData.getLat());
                MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().syncLocation2Map(jo);
                SnapshotLocationController.getInstance().syncAdasLocationInfo(jo);
                mockHandler.sendEmptyMessageDelayed(MOCK_MSG, 50);
@@ -150,12 +155,12 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener<MockSocket
                Logger.d(TAG, "未找到与之匹配数据");
                return;
            }
-            Logger.d(TAG," match : " + result.toString());
            MockSocketSendData mockSocketSendData = new MockSocketSendData(System.currentTimeMillis(), result.getUuid(), result.getSatelliteTime());
            Map<String, Object> map = new HashMap<>();
            map.put("sn", MoGoAiCloudClientConfig.getInstance().getSn());
            map.put("data", GsonUtil.jsonFromObject(mockSocketSendData));
-            Logger.d(TAG, "data uuid : " + result.getUuid() + " duration : " + (System.currentTimeMillis() - result.getSatelliteTime()));
+            Logger.d(TAG, "mockSocketSendData : " + GsonUtil.jsonFromObject(mockSocketSendData));
+            Logger.d(TAG, "data uuid : " + result.getUuid() + " duration : " + (Long.parseLong(adasControllerApi.getSatelliteTime()) - result.getSatelliteTime()));
            timeDelayApiService.uploadDelayData(map)
                    .subscribeOn(Schedulers.io())
                    .observeOn(AndroidSchedulers.mainThread())
--- 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.*{*;}
--- 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);
--- 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());
--- 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);
--- 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;
@@ -110,11 +111,11 @@ public class V2XScenarioManager implements IV2XScenarioManager {
                                mV2XScenario = new V2XOptimalRouteVREventScenario();
                                break;
                            case V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_WEAKNESS:
-                                mV2XScenario = new V2XFrontWarningScenario();
-                                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
-                                } else {
-                                    mV2XScenario = null;
-                                }
+//                                mV2XScenario = new V2XFrontWarningScenario();
+//                                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+//                                } else {
+//                                    mV2XScenario = null;
+//                                }
                                break;
                            default:
                                mV2XScenario = null;
--- 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……");
-
    }
 }
--- 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 ||
--- 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;
--- 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());
    }

--- 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
@@ -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();
-        }
-    }
-}
--- 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();
        }
        // 如果获取不到，那么就用本地默认的
--- 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 代表清除最后一帧画面
--- 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模式下的导航信息
     */
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -203,7 +203,7 @@ public class MogoADASController implements IMogoADASController {

                    data.add(model);

-                    Log.d("ADAS数据延时", "uuid : " + bean.getUuid() + "systemTime : "  + System.currentTimeMillis()  + "  GPS time" +  Long.parseLong(bean.getSystemTime())
+                    Log.d("ADAS数据延时", "uuid : " + bean.getUuid() + " type : " + bean.getType() + "systemTime : "  + System.currentTimeMillis()  + "  GPS time" +  Long.parseLong(bean.getSystemTime())
                     + "  timeDelay : "  + (System.currentTimeMillis() - Long.parseLong(bean.getSystemTime())));

 //                    Log.d("ADAS原始数据", "uuid : " + bean.getUuid() + "   type : " + bean.getType());
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
@@ -73,7 +73,7 @@ public class IntentManager implements IMogoIntentManager {

    @Override
    public void invoke( String command, Intent intent ) {
-        List< IMogoIntentListener > listeners = mListeners.get( command );
+        CopyOnWriteArrayList< IMogoIntentListener > listeners = mListeners.get( command );
        if ( listeners != null && !listeners.isEmpty() ) {
            Iterator< IMogoIntentListener > iterator = listeners.iterator();
            while ( iterator.hasNext() ) {