From fba470c98caa77e1858d2168c30d400aea5af1e1 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 28 Oct 2020 10:55:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/V2XMessageListener_401003.java   |   6 +
 .../scene/test/V2XTestConsoleWindow.java      |  13 +++
 .../module/v2x/utils/TestOnLineCarUtils.java  |  34 ++++++
 .../main/res/layout/window_test_console.xml   |  12 ++
 .../res/raw/scenario_push_vr_event_data.json  | 104 ++++++++++++++++++
 5 files changed, 169 insertions(+)
 create mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data.json

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
index fcceadaf2e..2e3d60fc90 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
@@ -101,6 +101,12 @@ public class V2XMessageListener_401003 implements IMogoOnMessageListener<V2XPush
                 showTip(alarmMessage.getTts());
                 ADASUtils.broadcastToADAS_TTS(V2XServiceManager.getContext(), alarmMessage);
                 break;
+            case "100019":
+                v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING);
+                v2XMessageEntity.setContent(alarmMessage);
+                v2XMessageEntity.setShowState(true);
+                V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
+                break;
             default:
                 ADASUtils.broadcastToADAS_TTS(V2XServiceManager.getContext(), alarmMessage);
                 break;
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
index 317fab173f..a7b03d721c 100644
--- 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
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.Button;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -49,6 +50,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
     private Button mBtnTriggerSeekHelpEvent;
     private Button mBtnTriggerParkEvent;
     private Button mBtnTriggerCallUserInfo;
+    private Button mBtnTriggerCallVRMsg;
 
     private Button btnTriggerRearVIPCarTip,
             btnTriggerVehicleBrakes,
@@ -98,6 +100,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
         mBtnTriggerSeekHelpEvent = findViewById(R.id.btnTriggerSeekHelpEvent);
         mBtnTriggerParkEvent = findViewById(R.id.btnTriggerParkEvent);
         mBtnTriggerCallUserInfo = findViewById(R.id.btnTriggerCallUserInfo);
+        mBtnTriggerCallVRMsg = findViewById(R.id.btnTriggerCallVRMsg);
 
         btnTriggerRearVIPCarTip = findViewById(R.id.btnTriggerRearVIPCarTip);
         btnTriggerVehicleBrakes = findViewById(R.id.btnTriggerVehicleBrakes);
@@ -195,6 +198,16 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
             intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
             LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
         });
+
+        mBtnTriggerCallVRMsg.setOnClickListener(v -> {
+            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);
+        });
+
     }
 
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
index 7aa6196a58..3e2f276418 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -289,4 +289,38 @@ public class TestOnLineCarUtils {
         }
         return null;
     }
+
+    /**
+     * 模拟 前方障碍物
+     */
+    public static V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> getV2XScenarionVRData() {
+        try {
+            InputStream inputStream = V2XUtils.getApp()
+                    .getResources()
+                    .openRawResource(R.raw.scenario_push_vr_event_data);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            int len = -1;
+            byte[] buffer = new byte[1024];
+            while ((len = inputStream.read(buffer)) != -1) {
+                baos.write(buffer, 0, len);
+            }
+            inputStream.close();
+
+            // 加载数据源
+            V2XSpecialCarRes v2xRoadEventEntity =
+                    GsonUtil.objectFromJson(baos.toString(), V2XSpecialCarRes.class);
+
+            V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> v2xMessageEntity = new V2XMessageEntity<>();
+            // 控制类型
+            v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING);
+            // 设置数据
+            v2xMessageEntity.setContent(v2xRoadEventEntity.getCoordinates());
+            // 控制展示状态
+            v2xMessageEntity.setShowState(true);
+            return v2xMessageEntity;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
index 7b52dcf96f..be3a11a952 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
@@ -337,5 +337,17 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
+        <Button
+            android:id="@+id/btnTriggerCallVRMsg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="#E91451"
+            android:padding="@dimen/dp_10"
+            android:text="测试VR推送消息"
+            android:textColor="#FFFFFF"
+            android:textSize="@dimen/dp_22"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
     </com.google.android.flexbox.FlexboxLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data.json
new file mode 100644
index 0000000000..04f52d1f38
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data.json
@@ -0,0 +1,104 @@
+{
+  "result":{
+    "dataType":[
+      "CARD_TYPE_ROAD_CONDITION"
+    ],
+    "exploreWay":[
+      {
+        "addr":"北三环麻家什字",
+        "type":"CARD_TYPE_ROAD_CONDITION",
+        "poiType":"10016",
+        "infoId":"100243059",
+        "items":[
+          {
+            "content":"违法停车",
+            "illegalCount":2
+          }
+        ],
+        "location":{
+          "address":"北三环麻家什字",
+          "angle":0,
+          "lat":40.203659,
+          "lon":116.742392
+        },
+        "generateTime":0,
+        "distance":0,
+        "fileType":3,
+        "direction":0,
+        "canLive":false
+      },
+      {
+        "addr":"北三环全段",
+        "type":"CARD_TYPE_ROAD_CONDITION",
+        "poiType":"10016",
+        "infoId":"100911795",
+        "items":[
+          {
+            "content":"违法停车",
+            "illegalCount":13
+          }
+        ],
+        "location":{
+          "address":"北三环全段",
+          "angle":0,
+          "lat":40.200468,
+          "lon":116.744447
+        },
+        "generateTime":0,
+        "distance":0,
+        "fileType":3,
+        "direction":0,
+        "canLive":false
+      },
+      {
+        "addr":"北三环",
+        "type":"CARD_TYPE_ROAD_CONDITION",
+        "poiType":"10016",
+        "infoId":"101844924",
+        "items":[
+          {
+            "content":"违法停车",
+            "illegalCount":4
+          }
+        ],
+        "location":{
+          "address":"北三环",
+          "angle":0,
+          "lat":40.202885,
+          "lon":116.745691
+        },
+        "generateTime":0,
+        "distance":0,
+        "fileType":3,
+        "direction":0,
+        "canLive":false
+      },
+      {
+        "addr":"北三环（经开段）吕小寨立交－店子立交",
+        "type":"CARD_TYPE_ROAD_CONDITION",
+        "poiType":"10016",
+        "infoId":"102265470",
+        "items":[
+          {
+            "content":"违法停车",
+            "illegalCount":1
+          }
+        ],
+        "location":{
+          "address":"北三环（经开段）吕小寨立交－店子立交",
+          "angle":0,
+          "lat":40.201902,
+          "lon":116.73552
+        },
+        "generateTime":0,
+        "distance":0,
+        "fileType":3,
+        "direction":0,
+        "canLive":false
+      }
+    ],
+    "code":-1
+  },
+  "msg":"success",
+  "code":0
+}
\ No newline at end of file

From 89e628197ab65a7d59e57f9cb0aa096c08d729c6 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 28 Oct 2020 11:53:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=90=91?=
 =?UTF-8?q?=E6=9D=A5=E8=BD=A6=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/test/V2XTestConsoleWindow.java      |  10 +-
 .../module/v2x/utils/TestOnLineCarUtils.java  |  40 ++++++-
 .../main/res/layout/window_test_console.xml   |  12 --
 .../res/raw/scenario_push_vr_event_data.json  | 104 ------------------
 .../raw/scenario_push_vr_hehind_vip_data.json |  22 ++++
 .../scenario_push_vr_reverse_car_data.json    |  22 ++++
 6 files changed, 90 insertions(+), 120 deletions(-)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data.json
 create mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json
 create mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json

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
index a7b03d721c..047e3b886d 100644
--- 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
@@ -100,7 +100,6 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
         mBtnTriggerSeekHelpEvent = findViewById(R.id.btnTriggerSeekHelpEvent);
         mBtnTriggerParkEvent = findViewById(R.id.btnTriggerParkEvent);
         mBtnTriggerCallUserInfo = findViewById(R.id.btnTriggerCallUserInfo);
-        mBtnTriggerCallVRMsg = findViewById(R.id.btnTriggerCallVRMsg);
 
         btnTriggerRearVIPCarTip = findViewById(R.id.btnTriggerRearVIPCarTip);
         btnTriggerVehicleBrakes = findViewById(R.id.btnTriggerVehicleBrakes);
@@ -208,6 +207,15 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
             LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
         });
 
+        btnTriggerReverseVehicleRoutePrediction.setOnClickListener(v -> {
+            V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> 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);
+        });
+
     }
 
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
index 3e2f276418..350b76c6d6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -291,13 +291,47 @@ public class TestOnLineCarUtils {
     }
 
     /**
-     * 模拟 前方障碍物
+     * 模拟 后方VIP
      */
-    public static V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> getV2XScenarionVRData() {
+    public static V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> getV2XScenarionVRBehindVIPData() {
         try {
             InputStream inputStream = V2XUtils.getApp()
                     .getResources()
-                    .openRawResource(R.raw.scenario_push_vr_event_data);
+                    .openRawResource(R.raw.scenario_push_vr_hehind_vip_data);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            int len = -1;
+            byte[] buffer = new byte[1024];
+            while ((len = inputStream.read(buffer)) != -1) {
+                baos.write(buffer, 0, len);
+            }
+            inputStream.close();
+
+            // 加载数据源
+            V2XSpecialCarRes v2xRoadEventEntity =
+                    GsonUtil.objectFromJson(baos.toString(), V2XSpecialCarRes.class);
+
+            V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> v2xMessageEntity = new V2XMessageEntity<>();
+            // 控制类型
+            v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING);
+            // 设置数据
+            v2xMessageEntity.setContent(v2xRoadEventEntity.getCoordinates());
+            // 控制展示状态
+            v2xMessageEntity.setShowState(true);
+            return v2xMessageEntity;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 逆向车辆路线预判
+     */
+    public static V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> getV2XScenarionVRReverseCarData() {
+        try {
+            InputStream inputStream = V2XUtils.getApp()
+                    .getResources()
+                    .openRawResource(R.raw.scenario_push_vr_reverse_car_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             int len = -1;
             byte[] buffer = new byte[1024];
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
index be3a11a952..7b52dcf96f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
@@ -337,17 +337,5 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
-        <Button
-            android:id="@+id/btnTriggerCallVRMsg"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="#E91451"
-            android:padding="@dimen/dp_10"
-            android:text="测试VR推送消息"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/dp_22"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
     </com.google.android.flexbox.FlexboxLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data.json
deleted file mode 100644
index 04f52d1f38..0000000000
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "result":{
-    "dataType":[
-      "CARD_TYPE_ROAD_CONDITION"
-    ],
-    "exploreWay":[
-      {
-        "addr":"北三环麻家什字",
-        "type":"CARD_TYPE_ROAD_CONDITION",
-        "poiType":"10016",
-        "infoId":"100243059",
-        "items":[
-          {
-            "content":"违法停车",
-            "illegalCount":2
-          }
-        ],
-        "location":{
-          "address":"北三环麻家什字",
-          "angle":0,
-          "lat":40.203659,
-          "lon":116.742392
-        },
-        "generateTime":0,
-        "distance":0,
-        "fileType":3,
-        "direction":0,
-        "canLive":false
-      },
-      {
-        "addr":"北三环全段",
-        "type":"CARD_TYPE_ROAD_CONDITION",
-        "poiType":"10016",
-        "infoId":"100911795",
-        "items":[
-          {
-            "content":"违法停车",
-            "illegalCount":13
-          }
-        ],
-        "location":{
-          "address":"北三环全段",
-          "angle":0,
-          "lat":40.200468,
-          "lon":116.744447
-        },
-        "generateTime":0,
-        "distance":0,
-        "fileType":3,
-        "direction":0,
-        "canLive":false
-      },
-      {
-        "addr":"北三环",
-        "type":"CARD_TYPE_ROAD_CONDITION",
-        "poiType":"10016",
-        "infoId":"101844924",
-        "items":[
-          {
-            "content":"违法停车",
-            "illegalCount":4
-          }
-        ],
-        "location":{
-          "address":"北三环",
-          "angle":0,
-          "lat":40.202885,
-          "lon":116.745691
-        },
-        "generateTime":0,
-        "distance":0,
-        "fileType":3,
-        "direction":0,
-        "canLive":false
-      },
-      {
-        "addr":"北三环（经开段）吕小寨立交－店子立交",
-        "type":"CARD_TYPE_ROAD_CONDITION",
-        "poiType":"10016",
-        "infoId":"102265470",
-        "items":[
-          {
-            "content":"违法停车",
-            "illegalCount":1
-          }
-        ],
-        "location":{
-          "address":"北三环（经开段）吕小寨立交－店子立交",
-          "angle":0,
-          "lat":40.201902,
-          "lon":116.73552
-        },
-        "generateTime":0,
-        "distance":0,
-        "fileType":3,
-        "direction":0,
-        "canLive":false
-      }
-    ],
-    "code":-1
-  },
-  "msg":"success",
-  "code":0
-}
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json
new file mode 100644
index 0000000000..8f623f4746
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json
@@ -0,0 +1,22 @@
+{
+  "sceneId": "200009",
+  "alarmContent": "发现后方VIP车辆,请注意避让",
+  "expireTime": 30000,
+  "sceneCategory": 0,
+  "sceneDescription": "VIP车辆，请避让",
+  "sceneName": "后方VIP车辆",
+  "sceneLevel": 0,
+  "sceneChannel": "",
+  "sceneSn": "",
+  "tts": "发现后方VIP车辆,注意避让",
+  "zoom": false,
+  "zoomScale": 15,
+  "location": {
+    "lat": 40.968678,
+    "lon": 116.405467
+  },
+  "lat": 40.968678,
+  "lon": 116.405467,
+  "userHead": "",
+  "msgImgUrl": ""
+}
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json
new file mode 100644
index 0000000000..ac92b789f2
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json
@@ -0,0 +1,22 @@
+{
+  "sceneId": "200008",
+  "alarmContent": "发现逆向来车,注意减速慢行",
+  "expireTime": 30000,
+  "sceneCategory": 0,
+  "sceneDescription": "逆向车辆对主车行驶影响预判功能",
+  "sceneName": "逆向车辆路线预判",
+  "sceneLevel": 0,
+  "sceneChannel": "",
+  "sceneSn": "",
+  "tts": "对向来车注意减速",
+  "zoom": false,
+  "zoomScale": 15,
+  "location": {
+    "lat": 40.968678,
+    "lon": 116.405467
+  },
+  "lat": 40.968678,
+  "lon": 116.405467,
+  "userHead": "",
+  "msgImgUrl": ""
+}
\ No newline at end of file

From a9d99d5a7853954874ea3e47baa6765da88ca218 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 28 Oct 2020 11:56:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/scenario/scene/test/V2XTestConsoleWindow.java  | 10 ----------
 1 file changed, 10 deletions(-)

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
index 047e3b886d..3c886f4d0a 100644
--- 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
@@ -50,7 +50,6 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
     private Button mBtnTriggerSeekHelpEvent;
     private Button mBtnTriggerParkEvent;
     private Button mBtnTriggerCallUserInfo;
-    private Button mBtnTriggerCallVRMsg;
 
     private Button btnTriggerRearVIPCarTip,
             btnTriggerVehicleBrakes,
@@ -198,15 +197,6 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
             LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
         });
 
-        mBtnTriggerCallVRMsg.setOnClickListener(v -> {
-            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);
-        });
-
         btnTriggerReverseVehicleRoutePrediction.setOnClickListener(v -> {
             V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> v2XMessageEntity =
                     TestOnLineCarUtils.getV2XScenarionVRReverseCarData();

From 8ca5639a2f48b72e26eae9da52e80ee13342e723 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 28 Oct 2020 14:17:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AF=B9=E5=90=91=E6=9D=A5=E8=BD=A6id?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/v2x/listener/V2XMessageListener_401003.java     | 7 ++-----
 .../main/res/raw/scenario_push_vr_reverse_car_data.json    | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
index 2e3d60fc90..b8ff8aec5d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
@@ -101,11 +101,8 @@ public class V2XMessageListener_401003 implements IMogoOnMessageListener<V2XPush
                 showTip(alarmMessage.getTts());
                 ADASUtils.broadcastToADAS_TTS(V2XServiceManager.getContext(), alarmMessage);
                 break;
-            case "100019":
-                v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING);
-                v2XMessageEntity.setContent(alarmMessage);
-                v2XMessageEntity.setShowState(true);
-                V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
+            case "200006"://对向来车
+                showTip(alarmMessage.getTts());
                 break;
             default:
                 ADASUtils.broadcastToADAS_TTS(V2XServiceManager.getContext(), alarmMessage);
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json
index ac92b789f2..12af687bdc 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json
@@ -1,5 +1,5 @@
 {
-  "sceneId": "200008",
+  "sceneId": "200006",
   "alarmContent": "发现逆向来车,注意减速慢行",
   "expireTime": 30000,
   "sceneCategory": 0,