From 7e646afc9af52789efb5de610a4ee70191168b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 9 Apr 2021 18:41:33 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=A7=82?=
 =?UTF-8?q?=E5=AF=9F=E8=80=85=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=90=8E=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=9A=E5=B0=86V2X=E4=B8=AD=E7=9A=84=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E9=87=87=E7=94=A8=E8=A7=82=E5=AF=9F=E8=80=85?=
 =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=BC=8F=E8=BF=9B=E8=A1=8C=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=20=E5=AE=8C=E6=88=90=E4=BA=86=E6=9C=80=E4=BC=98=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=E6=8E=A8=E8=8D=90=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=AE=E6=8E=A5=E5=8F=A3=E8=BF=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/inspectionProfiles/Project_Default.xml  |  2 +-
 .../com/mogo/module/v2x/V2XStatusManager.java |  2 +-
 .../module/v2x/entity/net/V2XRouteRes.java    | 27 ++++++++
 .../v2x/listener/V2XLocationListener.java     | 47 ++++++++-----
 .../v2x/manager/IMoGoV2XPolylineManager.java  |  2 +
 .../manager/impl/MoGoV2XPolylineManager.java  |  6 +-
 .../v2x/observer/CarLocationObserver.java     | 13 ++++
 .../v2x/observer/CarLocationSubject.java      | 63 ++++++++++++++++++
 .../v2x/observer/V2XOptimalRouteObserver.java | 50 ++++++++++++++
 .../v2x/overlay/V2XOptimalRouteOverlay.java   | 66 +++++++++++++++++++
 .../v2x/scenario/impl/V2XScenarioManager.java | 11 ++--
 .../route/V2XOptimalRouteVREventMarker.java   | 36 +---------
 .../mogo/module/v2x/utils/LocationUtils.java  | 43 ++++++++++--
 ...ario_push_vr_event_data_yongdu_gongsi.json | 12 ++++
 14 files changed, 316 insertions(+), 64 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRouteRes.java
 create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationObserver.java
 create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationSubject.java
 create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java
 create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index ba46533d1a..5279db84d2 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -30,7 +30,7 @@
       <option name="IGNORE_JAVADOC_PERIOD" value="true" />
       <option name="IGNORE_DUPLICATED_THROWS" value="false" />
       <option name="IGNORE_POINT_TO_ITSELF" value="false" />
-      <option name="myAdditionalJavadocTags" value="description,since:" />
+      <option name="myAdditionalJavadocTags" value="description,since:,date" />
     </inspection_tool>
   </profile>
 </component>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java
index eca9f0f957..1dfdf64b5a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java
@@ -54,7 +54,7 @@ public class V2XStatusManager {
         if (mLocation == null) {
             mLocation = new MogoLocation();
         }
-        //Logger.d(V2XConst.MODULE_NAME, "当前车辆位置：" + mLocation.toString());
+        Logger.d(V2XConst.MODULE_NAME, "当前车辆位置：" + mLocation.toString());
         return mLocation;
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRouteRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRouteRes.java
new file mode 100644
index 0000000000..2f79305dbb
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRouteRes.java
@@ -0,0 +1,27 @@
+package com.mogo.module.v2x.entity.net;
+
+import java.util.List;
+
+/**
+ * @author donghongyu
+ * @date 4/8/21 4:52 PM
+ * 最优路线推荐
+ */
+public class V2XRouteRes {
+    private String sn;//车机SN
+    private String roadId;//当前道路唯一标识
+    private int laneNum;//当前车道唯一标识
+    private int mostLaneNum;//最优车道号
+    private double mostSpeed;//最优车道平均速度
+    private List locusList;//线性经纬度轨迹列表
+    private double locusLat;
+    private double locusLon;
+
+    private double heading;// 车头朝向
+    private long satelliteTime;//定位卫星时间
+    private long showTime;//展示时间
+
+    private int warningType;// 1-最优车道，2-安全距离，3-交通预警
+
+
+}
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
index 411ee5efba..8b1a112edc 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
@@ -23,6 +23,8 @@ import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.alarm.V2XAlarmServer;
 import com.mogo.module.v2x.network.V2XRefreshCallback;
+import com.mogo.module.v2x.observer.CarLocationSubject;
+import com.mogo.module.v2x.observer.V2XOptimalRouteObserver;
 import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.scenario.scene.obu.V2XObuEventScenario;
 import com.mogo.module.v2x.utils.ADASUtils;
@@ -50,7 +52,10 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
  * desc   : V2X中用到的位置监听。处理刷新频率，以及位置改变是否触发道路事件警报
  * version: 1.0
  */
-public class V2XLocationListener implements IMogoLocationListener, CarStatusListener, IMogoCarLocationChangedListener2 {
+public class V2XLocationListener
+        implements IMogoLocationListener,
+        CarStatusListener,
+        IMogoCarLocationChangedListener2 {
     private String TAG = "V2XLocationListener";
 
     private MogoLocation mLastCarLocation;
@@ -61,7 +66,14 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
 
     private static V2XLocationListener mV2XLocationListener;
 
+    private CarLocationSubject mCarLocationSubject;
+
     private V2XLocationListener() {
+        mCarLocationSubject = new CarLocationSubject();
+        // 注册最优路线的推荐观察者
+        mCarLocationSubject.registerObserver(
+                V2XOptimalRouteObserver.TYPE,
+                V2XOptimalRouteObserver.getInstance());
     }
 
     public synchronized static V2XLocationListener getInstance() {
@@ -74,22 +86,22 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
     }
 
     @Override
-    public void onCarLocationChanged( MogoLatLng latLng ) {
+    public void onCarLocationChanged(MogoLatLng latLng) {
         // do not impl
     }
 
     @Override
-    public void onCarLocationChanged2( Location location ) {
+    public void onCarLocationChanged2(Location location) {
         MogoLocation loc = new MogoLocation();
-        loc.setTime( loc.getTime());
-        loc.setAccuracy( location.getAccuracy() );
-        loc.setSpeed( location.getSpeed());
-        loc.setLongitude( location.getLongitude() );
-        loc.setLatitude( location.getLatitude() );
-        loc.setAltitude( location.getAltitude() );
-        loc.setBearing( location.getBearing() );
-        loc.setProvider( location.getProvider() );
-        onLocationChangedImpl( loc );
+        loc.setTime(loc.getTime());
+        loc.setAccuracy(location.getAccuracy());
+        loc.setSpeed(location.getSpeed());
+        loc.setLongitude(location.getLongitude());
+        loc.setLatitude(location.getLatitude());
+        loc.setAltitude(location.getAltitude());
+        loc.setBearing(location.getBearing());
+        loc.setProvider(location.getProvider());
+        onLocationChangedImpl(loc);
     }
 
     @Override
@@ -97,8 +109,9 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
 //        onLocationChangedImpl(location);
     }
 
-    private void onLocationChangedImpl(MogoLocation location){
+    private void onLocationChangedImpl(MogoLocation location) {
         try {
+            mCarLocationSubject.setCarLocation(location);
             //Logger.d(V2XConst.MODULE_NAME, "V2X预警--onLocationChanged: " + GsonUtil.jsonFromObject(location));
             // 刷新角度
             getCurrentCarAngle(location);
@@ -143,8 +156,12 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
         if (mMogoPolyline != null && (V2XServiceManager.getMoGoV2XStatusManager().isRoadEventPOIShow()
                 || V2XServiceManager.getMoGoV2XStatusManager().isOtherSeekHelpPOIShow())
                 && V2XServiceManager.getV2XStatusManager().getTargetMoGoLatLng() != null) {
-            mMogoPolyline.setPoints(Arrays.asList(new MogoLatLng(location.getLatitude(), location.getLongitude()),
-                    V2XServiceManager.getV2XStatusManager().getTargetMoGoLatLng()));
+
+            // 取出原有的绘制线的经纬度点
+            List<MogoLatLng> pointsOdl = mMogoPolyline.getPoints();
+            // 重新设置第一个坐标，也就是当前车辆位置
+            pointsOdl.set(0, new MogoLatLng(location.getLatitude(), location.getLongitude()));
+            mMogoPolyline.setPoints(pointsOdl);
 
             float zoomLevel = V2XServiceManager.getMapUIController().getZoomLevel();
             //Logger.d(V2XConst.MODULE_NAME, "当前地图的缩放比例为：" + zoomLevel);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoV2XPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoV2XPolylineManager.java
index 237dd6d0f3..8ff7acf02a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoV2XPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoV2XPolylineManager.java
@@ -6,6 +6,8 @@ import com.alibaba.android.arouter.facade.template.IProvider;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
 
+import java.util.List;
+
 /**
  * author : donghongyu
  * e-mail : 1358506549@qq.com
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
index a8184cce51..4e678071b6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
@@ -6,10 +6,10 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
-import com.mogo.module.v2x.MoGoV2XServicePaths;
-import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.common.entity.V2XPoiTypeEnum;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.v2x.MoGoV2XServicePaths;
+import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager;
 
 import java.util.ArrayList;
@@ -66,7 +66,7 @@ public class MoGoV2XPolylineManager implements IMoGoV2XPolylineManager {
                 } else {
                     options.add(V2XServiceManager.getV2XStatusManager().getLocation());
                 }
-                // 目标车辆位置
+                // 目标车辆、道路事件位置
                 options.add(V2XServiceManager.getV2XStatusManager().getTargetMoGoLatLng());
 
                 // 绘制线的对象
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationObserver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationObserver.java
new file mode 100644
index 0000000000..e0e414b6dc
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationObserver.java
@@ -0,0 +1,13 @@
+package com.mogo.module.v2x.observer;
+
+import com.mogo.map.location.MogoLocation;
+
+/**
+ * @author donghongyu
+ * @date 4/9/21 2:14 PM
+ * 当前车辆位置观察者接口
+ */
+public abstract class CarLocationObserver {
+    // 更新状态
+    public abstract void update(MogoLocation carLocation);
+}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationSubject.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationSubject.java
new file mode 100644
index 0000000000..1f238875ad
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationSubject.java
@@ -0,0 +1,63 @@
+package com.mogo.module.v2x.observer;
+
+import com.mogo.map.location.MogoLocation;
+
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * @author donghongyu
+ * @date 4/9/21 2:12 PM
+ * 当前车辆订阅
+ */
+public class CarLocationSubject {
+
+    // 车辆位置
+    public MogoLocation carLocation;
+    // 观察者集合
+    private HashMap<String, CarLocationObserver> observers = new HashMap<String, CarLocationObserver>();
+
+
+    /**
+     * 设置新的车辆位置
+     *
+     * @param carLocation 车辆位置
+     */
+    public void setCarLocation(MogoLocation carLocation) {
+        this.carLocation = carLocation;
+        notifyAllObservers();
+    }
+
+    /**
+     * 添加观察者
+     *
+     * @param observerType 观察者类型
+     * @param observer     新的观察者
+     */
+    public void registerObserver(String observerType, CarLocationObserver observer) {
+        observers.put(observerType, observer);
+    }
+
+    /**
+     * 移除指定类型的观察者
+     *
+     * @param observerType 观察者类型
+     */
+    public void removeObserver(String observerType) {
+        observers.remove(observerType);
+    }
+
+    /**
+     * 通知所有观察者更新
+     */
+    private void notifyAllObservers() {
+        Set<String> keySet = observers.keySet();
+        for (String s : keySet) {
+            CarLocationObserver observer = observers.get(s);
+            if (observer != null) {
+                observer.update(carLocation);
+            }
+        }
+    }
+
+}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java
new file mode 100644
index 0000000000..3cb63df494
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java
@@ -0,0 +1,50 @@
+package com.mogo.module.v2x.observer;
+
+import com.mogo.map.location.MogoLocation;
+import com.mogo.module.v2x.overlay.V2XOptimalRouteOverlay;
+
+import java.util.List;
+
+/**
+ * @author donghongyu
+ * @date 4/9/21 2:38 PM
+ * 最优路线推荐
+ */
+public class V2XOptimalRouteObserver extends CarLocationObserver {
+    public static String TYPE = "V2XOptimalRouteObserver";
+
+    private static V2XOptimalRouteObserver v2XOptimalRouteObserver;
+    //最优路线覆盖物绘制
+    private V2XOptimalRouteOverlay mV2XOptimalRouteOverlay;
+    // 要绘制的数据
+    private List<double[]> polylinePoint;
+
+    public static V2XOptimalRouteObserver getInstance() {
+        if (v2XOptimalRouteObserver == null) {
+            synchronized (V2XOptimalRouteObserver.class) {
+                if (v2XOptimalRouteObserver == null) {
+                    v2XOptimalRouteObserver = new V2XOptimalRouteObserver();
+                }
+            }
+        }
+        return v2XOptimalRouteObserver;
+    }
+
+    private V2XOptimalRouteObserver() {
+        mV2XOptimalRouteOverlay = new V2XOptimalRouteOverlay();
+    }
+
+    /**
+     * 设置推荐路线
+     *
+     * @param polylinePoint 推荐的路线
+     */
+    public void setPolylinePoint(List<double[]> polylinePoint) {
+        this.polylinePoint = polylinePoint;
+    }
+
+    @Override
+    public void update(MogoLocation carLocation) {
+        mV2XOptimalRouteOverlay.draw(carLocation, polylinePoint);
+    }
+}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java
new file mode 100644
index 0000000000..9fc0e80b67
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java
@@ -0,0 +1,66 @@
+package com.mogo.module.v2x.overlay;
+
+import com.mogo.map.MogoLatLng;
+import com.mogo.map.location.MogoLocation;
+import com.mogo.map.overlay.IMogoPolyline;
+import com.mogo.map.overlay.MogoPolylineOptions;
+import com.mogo.module.v2x.V2XServiceManager;
+import com.mogo.module.v2x.utils.LocationUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 最优路线推荐的图覆盖物
+ *
+ * @author donghongyu
+ * @date 4/8/21 6:06 PM
+ */
+public class V2XOptimalRouteOverlay {
+    private IMogoPolyline mMoGoPolyline;
+    // 连接线参数
+    private MogoPolylineOptions mPolylineOptions;
+    // 线路径集合
+    private List<MogoLatLng> mPolylinePointList;
+
+    public V2XOptimalRouteOverlay() {
+        mPolylineOptions = new MogoPolylineOptions();
+        // 渐变色
+        List<Integer> colors = new ArrayList<>();
+        colors.add(0xFFF95959);
+        // 线条粗细，渐变，渐变色值
+        mPolylineOptions.width(25).useGradient(true).colorValues(colors);
+        // 绘制路径集合
+        mPolylinePointList = new ArrayList<>();
+    }
+
+    /**
+     * 绘制最优路线
+     *
+     * @param polylinePoint 要绘制的经纬度度集合
+     */
+    public IMogoPolyline draw(MogoLocation carLocal, List<double[]> polylinePoint) {
+        if (mMoGoPolyline != null) {
+            mMoGoPolyline.remove();
+            mPolylinePointList.clear();
+        }
+        if (polylinePoint != null) {
+            // 将当前车辆位置放进去
+            mPolylinePointList.add(new MogoLatLng(carLocal.getLatitude(), carLocal.getLongitude()));
+            // 过滤后台推送的推荐路线集合
+            for (double[] polyline : polylinePoint) {
+                MogoLatLng pointMoGoLatLng = new MogoLatLng(polyline[1], polyline[0]);
+                //需要剔除已经行驶过的经纬度，这里需要比对推荐路线集合中的点是否在当前车辆行驶方向前面如果不在则抛弃
+                if (LocationUtils.isPointOnCarFront(carLocal, pointMoGoLatLng)) {
+                    mPolylinePointList.add(pointMoGoLatLng);
+                }
+            }
+        }
+        // 替换路径集合
+        mPolylineOptions.points(mPolylinePointList);
+        // 绘制线
+        mMoGoPolyline = V2XServiceManager.getMogoOverlayManager().addPolyline(mPolylineOptions);
+        return mMoGoPolyline;
+    }
+
+}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
index 4b45679502..222dd1aa0e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -104,11 +104,12 @@ public class V2XScenarioManager implements IV2XScenarioManager {
                                 mV2XScenario = new V2XRecommendRouteScenario();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_VR_SHOW:
-                                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
-                                    mV2XScenario = new V2XOptimalRouteVREventScenario();
-                                } else {
-                                    mV2XScenario = null;
-                                }
+//                                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+//
+//                                } else {
+//                                    mV2XScenario = null;
+//                                }
+                                mV2XScenario = new V2XOptimalRouteVREventScenario();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_TOP:
                             case V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_LEFT:
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
index 4dd538fe59..cc0754cbd6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
@@ -1,17 +1,13 @@
 package com.mogo.module.v2x.scenario.scene.route;
 
-import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
+import com.mogo.module.v2x.observer.V2XOptimalRouteObserver;
 import com.mogo.module.v2x.scenario.view.IV2XMarker;
 import com.mogo.module.v2x.utils.MarkerUtils;
 import com.mogo.utils.logger.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * author : donghongyu
  * e-mail : 1358506549@qq.com
@@ -22,8 +18,6 @@ import java.util.List;
 public class V2XOptimalRouteVREventMarker implements IV2XMarker<V2XPushMessageEntity> {
     private final String TAG = "V2XPushVREventMarker";
 
-    private static IMogoPolyline mMogoPolyline;
-
     @Override
     public void drawPOI(V2XPushMessageEntity entity) {
         Logger.w(V2XConst.MODULE_NAME + "_" + TAG, "drawPOI 绘制VR Marker");
@@ -32,10 +26,6 @@ public class V2XOptimalRouteVREventMarker implements IV2XMarker<V2XPushMessageEn
             // 清除道路事件
             V2XServiceManager
                     .getMoGoV2XMarkerManager().clearALLPOI();
-
-            if (mMogoPolyline != null) {
-                mMogoPolyline.remove();
-            }
             // 绘制引导线
             drawableRecommendPolyline(entity);
         } catch (Exception e) {
@@ -49,23 +39,7 @@ public class V2XOptimalRouteVREventMarker implements IV2XMarker<V2XPushMessageEn
      * @param entity
      */
     void drawableRecommendPolyline(V2XPushMessageEntity entity) {
-        // 连接线参数
-        MogoPolylineOptions options = new MogoPolylineOptions();
-
-        // 渐变色
-        List<Integer> colors = new ArrayList<>();
-
-        colors.add(0xFFF95959);
-
-        // 线条粗细，渐变，渐变色值
-        options.width(20).useGradient(true).colorValues(colors);
-
-        for (double[] doubles : entity.getRecommendPolyline()) {
-            options.add(doubles[0], doubles[1]);
-        }
-
-        // 绘制线的对象
-        mMogoPolyline = V2XServiceManager.getMogoOverlayManager().addPolyline(options);
+        V2XOptimalRouteObserver.getInstance().setPolylinePoint(entity.getRecommendPolyline());
     }
 
     @Override
@@ -79,10 +53,6 @@ public class V2XOptimalRouteVREventMarker implements IV2XMarker<V2XPushMessageEn
     }
 
     public void clearLine() {
-        if (mMogoPolyline != null) {
-            mMogoPolyline.remove();
-            mMogoPolyline = null;
-            V2XServiceManager.getV2XStatusManager().setAlarmInfo(null);
-        }
+        V2XOptimalRouteObserver.getInstance().setPolylinePoint(null);
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
index fd2d26506d..6f6dbc047a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
@@ -1,13 +1,12 @@
 package com.mogo.module.v2x.utils;
 
 import android.location.Location;
+import android.util.Log;
 
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
-import com.mogo.map.search.geo.MogoGeocodeResult;
 import com.mogo.map.search.geo.MogoPoiItem;
-import com.mogo.map.search.geo.MogoRegeocodeResult;
 import com.mogo.map.search.geo.query.MogoRegeocodeQuery;
 import com.mogo.map.search.poisearch.IMogoPoiSearch;
 import com.mogo.map.search.poisearch.IMogoPoiSearchListener;
@@ -69,6 +68,11 @@ public class LocationUtils {
         poiSearch.searchPOIAsyn();
     }
 
+    /**
+     * 获取当前位置
+     *
+     * @return 当前位置
+     */
     public static MogoLatLng getCurrentLatLon() {
         MogoLatLng latLon = V2XServiceManager.getNavi().getCarLocation();
         if (latLon == null) {
@@ -89,9 +93,9 @@ public class LocationUtils {
         return latLon;
     }
 
-    /*
+    /**
      * 计算两点间的角度
-     * */
+     */
     public static double getAngle(double lon1, double lat1, double lon2,
                                   double lat2) {
         double fLat = Math.PI * (lat1) / 180.0;
@@ -108,9 +112,9 @@ public class LocationUtils {
         }
     }
 
-    /*
+    /**
      * 根据角度获取指定距离点的经纬度
-     * */
+     */
     public static MogoLatLng getNewLocation(MogoLatLng st, double distance, double angle) {
         mRadLo = st.getLon() * Math.PI / 180.;
         mRadLa = st.getLat() * Math.PI / 180.;
@@ -124,4 +128,31 @@ public class LocationUtils {
         return new MogoLatLng(lat_new, lon_new);
     }
 
+
+    /**
+     * 获取传入的经纬度在车辆的什么位置
+     *
+     * @return 顺时针，true-前，false-后
+     */
+    public static boolean isPointOnCarFront(MogoLocation carLocal, MogoLatLng pointLocal) {
+        double carLon = carLocal.getLongitude();
+        double carLat = carLocal.getLatitude();
+        double poiLon = pointLocal.getLon();
+        double poiLat = pointLocal.getLat();
+        float carAngle = carLocal.getBearing();
+
+        // 计算车辆与点之间的夹角
+        int diffAngle = DrivingDirectionUtils.getDegreeOfCar2Poi(
+                carLon, carLat, poiLon, poiLat, (int) carAngle);
+
+        if (diffAngle <= 90) {
+            Log.i(TAG, "目标点在车辆--前方");
+            return true;
+        } else {
+            Log.i(TAG, "目标点在车辆--后方");
+            return false;
+        }
+    }
+
+
 }
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
index c4a47a5b64..c993011696 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
@@ -34,6 +34,12 @@
     ],
     [
       116.424272,39.983397
+    ],
+    [
+      116.425948,39.983465
+    ],
+    [
+      116.42628,39.983399
     ]
   ],
   "recommendPolyline": [
@@ -54,6 +60,12 @@
     ],
     [
       116.424272,39.983397
+    ],
+    [
+      116.425948,39.983465
+    ],
+    [
+      116.42628,39.983399
     ]
   ]
 }
\ No newline at end of file

From eaeafaed09b3ae78a2154f83065afa7a2f7d5b44 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 9 Apr 2021 19:23:41 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E7=BA=BF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=B0CloundManager=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |   1 -
 .../common/entity/V2XWarningEntity.java       |   8 +++++++
 .../impl/MoGoV2XCloundDataManager.java        |  21 +++++++++++------
 .../scene/warning/V2XWarningMarker.java       |  22 ++----------------
 .../v2x_warning_marker_target.png             | Bin 8929 -> 0 bytes
 5 files changed, 24 insertions(+), 28 deletions(-)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_warning_marker_target.png

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4ff10f68a5..83405b8de1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -91,7 +91,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java
index 532dca9d7a..b4a0bd6382 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java
@@ -126,6 +126,14 @@ public class V2XWarningEntity implements Serializable {
         this.speed = speed;
     }
 
+    public long getShowTime() {
+        return showTime;
+    }
+
+    public void setShowTime(long showTime) {
+        this.showTime = showTime;
+    }
+
 
     public void setStopLineDistance(double stopLineDistance) {
         this.stopLineDistance = stopLineDistance;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
index e9b15b4f78..f5d8fe193e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
 import static com.mogo.module.v2x.V2XConst.V2X_FRONT_WARNING_MARKER;
 import static com.mogo.module.v2x.V2XServiceManager.getContext;
 
@@ -47,7 +48,6 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
     private boolean isSelfLineClear;
     private List fillPoints = new ArrayList();//停止线经纬度合集
 
-
     @Override
     public void init(Context context) {
         MogoApisHandler.getInstance().getApis().getRegisterCenterApi()
@@ -69,7 +69,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
         Log.d(V2XConst.LOG_NAME_WARN, "direction = " + cloundWarningInfo.getDirection());
         if (cloundWarningInfo.getDirection() == 1) { //前方
             //停止线前方画线
-            MogoLatLng newLocation = LocationUtils.getNewLocation((MogoLatLng) fillPoints.get(0), 80, cloundWarningInfo.heading);
+            MogoLatLng newLocation = LocationUtils.getNewLocation((MogoLatLng) fillPoints.get(0), 80, cloundWarningInfo.getAngle());
             WorkThreadHandler.getInstance().postDelayed(() -> {
                 //二轮车和行人的渲染和移动
                 V2XWarnDataDrawer.getInstance().renderWarnData(cloundWarningInfo);
@@ -83,7 +83,6 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
                 V2XServiceManager.getMoGoPersonWarnPolylineManager().clearLine();
                 V2XServiceManager.getMoGoWarnPolylineManager().clearLine();
                 V2XServiceManager.getMoGoStopPolylineManager().clearLine();
-
                 isSelfLineClear = true;
             }, 8000);
 
@@ -125,15 +124,19 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
      * 2D资源绘制停止线
      * */
     private void drawStopLineWith2Resource() {
-        mCloundWarningInfo.setCarLocation(new MogoLatLng(39.976866,116.417622));//测试数据
+
+        //自车位置39.97665425796924--116.41769983329762
+        mCloundWarningInfo.setCarLocation(new MogoLatLng(39.97665425796924,116.41769983329762));//测试数据
+
         MogoLatLng carlo = mCloundWarningInfo.getCarLocation();
-        if (carlo == null){
+        if (carlo == null) {
             double lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon();
             double lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat();
             carlo = new MogoLatLng(lat, lon);
         }
+        //自车行驶方向的前方*米的经纬度,该经纬度在停止线上
         MogoLatLng drawStopLineLon = LocationUtils.getNewLocation(carlo, mCloundWarningInfo.getStopLineDistance(), mCloundWarningInfo.getAngle());
-
+        Log.d(TAG, "2D资源绘制停止线"+drawStopLineLon);
         MogoMarkerOptions optionsRipple = new MogoMarkerOptions()
                 .latitude(drawStopLineLon.getLat())
                 .longitude(drawStopLineLon.getLon())
@@ -142,9 +145,12 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
 
         optionsRipple
                 .icon(ViewUtils.fromView(new EmptyMarkerView(V2XServiceManager.getContext())));
-        IMogoMarker stopLine = V2XServiceManager.getMarkerManager().addMarker(V2X_FRONT_WARNING_MARKER, optionsRipple);
+        IMogoMarker stopLine = V2XServiceManager.getMarkerManager().addMarker(TYPE_MARKER_CLOUD_STOP_LINE_DATA, optionsRipple);
         stopLine.setInfoWindowAdapter(new SimpleWindow3DAdapter(new V2XFrontTargetMarkerView(V2XServiceManager.getContext())));
         stopLine.showInfoWindow();
+//        UiThreadHandler.postDelayed(() -> {
+//            stopLine.hideInfoWindow();
+//        }, 8000);
     }
 
     /**
@@ -224,6 +230,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
     public void onCarLocationChanged2(Location latLng) {
         Log.e(V2XConst.LOG_NAME_WARN, "onCarLocationChanged2 latLng = " + latLng.getLatitude() + "--" + latLng.getLongitude() + "---isSelfLineClear = " + isSelfLineClear);
         //当行人经纬度交点 开始画线，否则清理
+        mCloundWarningInfo.setCarLocation(new MogoLatLng(latLng.getLatitude(), latLng.getLongitude()));
         drawSlefCarLine(latLng);
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
index 2b44bef806..6470241db7 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
@@ -60,13 +60,10 @@ public class V2XWarningMarker implements IV2XMarker {
                     .longitude(mMarkerEntity.getLon())
                     .anchor(0.5f, 0.5f)
                     .zIndex(MarkerDrawer.MARKER_Z_INDEX_HIGH);
-
-            if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
-            }
             optionsRipple
-                    .icon(ViewUtils.fromView(new EmptyMarkerView(V2XServiceManager.getContext())));
+                    .icon(ViewUtils.fromView(new EmptyMarkerView(mContext)));
             optimalMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_FRONT_WARNING_MARKER, optionsRipple);
-            optimalMarker.setInfoWindowAdapter(new SimpleWindow3DAdapter(new V2XFrontTargetMarkerView(V2XServiceManager.getContext())));
+            optimalMarker.setInfoWindowAdapter(new SimpleWindow3DAdapter(new V2XFrontTargetMarkerView(mContext)));
             optimalMarker.showInfoWindow();
 
         } catch (Exception e) {
@@ -76,21 +73,6 @@ public class V2XWarningMarker implements IV2XMarker {
     }
 
 
-    private void drawMarkerWithLocation(MogoLatLng latLng, String tag) {
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .object(markerShowEntity)
-                .latitude(latLng.lat)
-                .longitude(latLng.lon);
-        IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options);
-        options.icon3DRes(com.mogo.module.service.R.raw.people);
-        options.anchor(0.5f, 0.5f);
-        options.anchorColor("#FF4040");
-        IMogoMarker marker = V2XServiceManager.getMarkerManager().addMarker(tag, options);
-        iMarkerView.setMarker(marker);
-        marker.setToTop();
-    }
-
-
     @Override
     public void clearPOI() {
         V2XServiceManager.getMarkerManager().removeMarkers(V2X_FRONT_WARNING_MARKER);
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_warning_marker_target.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_warning_marker_target.png
deleted file mode 100644
index be6da047d09af9da4cb879e906d19c2522116d1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8929
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


From f0f4f2c12f326f860a058c65aa060512903d4ead Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 9 Apr 2021 19:40:44 +0800
Subject: [PATCH 3/6] no message

---
 .../module/v2x/manager/impl/MoGoV2XCloundDataManager.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
index f5d8fe193e..23fd49041f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
@@ -71,12 +71,12 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
             //停止线前方画线
             MogoLatLng newLocation = LocationUtils.getNewLocation((MogoLatLng) fillPoints.get(0), 80, cloundWarningInfo.getAngle());
             WorkThreadHandler.getInstance().postDelayed(() -> {
+                //添加停止线marker
+                drawStopLineWith2Resource();
                 //二轮车和行人的渲染和移动
                 V2XWarnDataDrawer.getInstance().renderWarnData(cloundWarningInfo);
                 //绘制识别物与交汇点连线，并且更新连线数据
                 drawStopLine(cloundWarningInfo, newLocation);
-                //添加停止线marker
-                drawStopLineWith2Resource();
             }, 200);
 
             UiThreadHandler.postDelayed(() -> {

From d9798f51837a7472011f9079ef14b6a241dbc9e5 Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Fri, 9 Apr 2021 19:45:27 +0800
Subject: [PATCH 4/6] =?UTF-8?q?new#v2x=E4=BA=8B=E4=BB=B6=E4=BA=A4=E9=80=9A?=
 =?UTF-8?q?=E4=BA=8B=E6=95=85=E7=B4=B0=E5=88=865=E5=90=84=E7=B4=9A?=
 =?UTF-8?q?=E5=88=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/entity/MarkerPoiTypeEnum.java      | 10 ++++
 .../common/entity/V2XRoadEventEntity.java     | 15 +++++
 .../module/common/utils/CloudPoiManager.java  | 57 +++++++++++--------
 .../v2x/adapter/V2XSurroundingAdapter.java    | 16 ++++++
 .../adapter/V2XSurroundingDetailAdapter.java  |  5 ++
 .../entity/panel/SurroundingConstruction.java |  5 ++
 .../manager/impl/MoGoV2XMarkerManager.java    |  6 ++
 .../scene/road/V2XRoadEventWindow.java        |  6 ++
 .../mogo/module/v2x/utils/EventTypeUtils.java | 40 +++++++++++++
 9 files changed, 137 insertions(+), 23 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java
index 435dd0f2fd..ead583110a 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java
@@ -34,6 +34,16 @@ public interface MarkerPoiTypeEnum {
     String FOURS_PARKING = "10012";
     //事故
     String FOURS_ACCIDENT = "10013";
+    //重大事故
+    String FOURS_ACCIDENT_01 = "1001301";
+    //特大事故
+    String FOURS_ACCIDENT_02 = "1001302";
+    //较大事故
+    String FOURS_ACCIDENT_03 = "1001303";
+    //一般事故
+    String FOURS_ACCIDENT_04 = "1001304";
+    //轻微事故
+    String FOURS_ACCIDENT_05 = "1001305";
     //身边
     String FOURS_NEALY = "10014";
     //实时路况
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRoadEventEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRoadEventEntity.java
index 80039b4244..a950a82ba0 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRoadEventEntity.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRoadEventEntity.java
@@ -96,6 +96,11 @@ public class V2XRoadEventEntity implements Serializable {
                 break;
             // 事故
             case V2XPoiTypeEnum.FOURS_ACCIDENT:
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 tts += "交通事故";
                 break;
             default:
@@ -156,6 +161,11 @@ public class V2XRoadEventEntity implements Serializable {
                 break;
             // 事故
             case V2XPoiTypeEnum.FOURS_ACCIDENT:
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 tts += "交通事故";
                 break;
             default:
@@ -222,6 +232,11 @@ public class V2XRoadEventEntity implements Serializable {
                 break;
             // 事故
             case V2XPoiTypeEnum.FOURS_ACCIDENT:
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 alarmContent = "前方交通事故";
                 break;
             default:
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
index 13508a8fb6..a67b8a791f 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
@@ -23,7 +23,8 @@ public class CloudPoiManager {
 
     private Map<String, PoiWrapper> poiWrapper = new ArrayMap<>();
     private static CloudPoiManager instance = null;
-    public static CloudPoiManager getInstance(){
+
+    public static CloudPoiManager getInstance() {
         if (instance == null) {
             synchronized (CloudPoiManager.class) {
                 if (instance == null) {
@@ -34,43 +35,53 @@ public class CloudPoiManager {
         return instance;
     }
 
-    public void generateDefault(){
+    public void generateDefault() {
         if (poiWrapper.isEmpty()) {
-            poiWrapper.put(MarkerPoiTypeEnum.GAS_STATION, new PoiWrapper(MarkerPoiTypeEnum.GAS_STATION,R.drawable.module_common_icon_map_marker_refuel,
+            poiWrapper.put(MarkerPoiTypeEnum.GAS_STATION, new PoiWrapper(MarkerPoiTypeEnum.GAS_STATION, R.drawable.module_common_icon_map_marker_refuel,
                     R.drawable.module_common_icon_map_marker_refuel, "加油站"));
             poiWrapper.put(MarkerPoiTypeEnum.TRAFFIC_CHECK, new PoiWrapper(MarkerPoiTypeEnum.TRAFFIC_CHECK,
-                    R.drawable.module_common_icon_map_marker_road_check2,R.drawable.module_common_icon_map_marker_road_check2_white, "交通检查"));
+                    R.drawable.module_common_icon_map_marker_road_check2, R.drawable.module_common_icon_map_marker_road_check2_white, "交通检查"));
             poiWrapper.put(MarkerPoiTypeEnum.ROAD_CLOSED, new PoiWrapper(MarkerPoiTypeEnum.ROAD_CLOSED,
-                    R.drawable.module_common_icon_map_marker_road_block_off2,R.drawable.module_common_icon_map_marker_road_block_off2_white, "封路"));
+                    R.drawable.module_common_icon_map_marker_road_block_off2, R.drawable.module_common_icon_map_marker_road_block_off2_white, "封路"));
             poiWrapper.put(MarkerPoiTypeEnum.SHOP_DISCOUNT, new PoiWrapper(MarkerPoiTypeEnum.SHOP_DISCOUNT,
-                    R.drawable.module_common_icon_map_marker_shop_discount,R.drawable.module_common_icon_map_marker_shop_discount, "商场打折"));
+                    R.drawable.module_common_icon_map_marker_shop_discount, R.drawable.module_common_icon_map_marker_shop_discount, "商场打折"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_4S, new PoiWrapper(MarkerPoiTypeEnum.FOURS_4S,
-                    R.drawable.module_common_icon_map_marker_4s,R.drawable.module_common_icon_map_marker_4s, "4S店"));
+                    R.drawable.module_common_icon_map_marker_4s, R.drawable.module_common_icon_map_marker_4s, "4S店"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_ROAD_WORK, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ROAD_WORK,
-                    R.drawable.module_common_icon_map_marker_road_work2,R.drawable.module_common_icon_map_marker_road_work2_white, "施工"));
+                    R.drawable.module_common_icon_map_marker_road_work2, R.drawable.module_common_icon_map_marker_road_work2_white, "施工"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_BLOCK_UP, new PoiWrapper(MarkerPoiTypeEnum.FOURS_BLOCK_UP,
-                    R.drawable.module_common_icon_map_marker_road_block_up2,R.drawable.module_common_icon_map_marker_road_block_up2_white, "拥堵"));
+                    R.drawable.module_common_icon_map_marker_road_block_up2, R.drawable.module_common_icon_map_marker_road_block_up2_white, "拥堵"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_PONDING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_PONDING,
-                    R.drawable.module_common_icon_map_marker_pondingl2,R.drawable.module_common_icon_map_marker_pondingl2_white, "积水"));
+                    R.drawable.module_common_icon_map_marker_pondingl2, R.drawable.module_common_icon_map_marker_pondingl2_white, "积水"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_SHOP_FREE, new PoiWrapper(MarkerPoiTypeEnum.FOURS_SHOP_FREE,
-                    R.drawable.module_common_icon_map_marker_shop,R.drawable.module_common_icon_map_marker_shop, "超时打折"));
+                    R.drawable.module_common_icon_map_marker_shop, R.drawable.module_common_icon_map_marker_shop, "超时打折"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_FOG, new PoiWrapper(MarkerPoiTypeEnum.FOURS_FOG,
-                    R.drawable.module_common_ic_rc_dark_frog2,R.drawable.module_common_ic_rc_dark_frog2_white, "浓雾"));
+                    R.drawable.module_common_ic_rc_dark_frog2, R.drawable.module_common_ic_rc_dark_frog2_white, "浓雾"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_ICE, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ICE,
-                    R.drawable.module_common_ic_rc_freeze2,R.drawable.module_common_ic_rc_freeze2_white, "结冰"));
+                    R.drawable.module_common_ic_rc_freeze2, R.drawable.module_common_ic_rc_freeze2_white, "结冰"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_PARKING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_PARKING,
-                    R.drawable.module_common_ic_rc_parking2,R.drawable.module_common_ic_rc_parking2, "停车场"));
+                    R.drawable.module_common_ic_rc_parking2, R.drawable.module_common_ic_rc_parking2, "停车场"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT,
-                    R.drawable.module_common_ic_rc_accident3,R.drawable.module_common_ic_rc_accident3_white, "事故"));
+                    R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "事故"));
+            poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_01, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_01,
+                    R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "重大事故"));
+            poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_02, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_02,
+                    R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "特大事故"));
+            poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_03, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_03,
+                    R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "较大事故"));
+            poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_04, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_04,
+                    R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "一般事故"));
+            poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_05, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_05,
+                    R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "轻微事故"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_NEALY, new PoiWrapper(MarkerPoiTypeEnum.FOURS_NEALY,
-                    R.drawable.module_common_icon_map_marker_shear_news,R.drawable.module_common_icon_map_marker_shear_news, "身边"));
+                    R.drawable.module_common_icon_map_marker_shear_news, R.drawable.module_common_icon_map_marker_shear_news, "身边"));
             poiWrapper.put(MarkerPoiTypeEnum.FOURS_LIVING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_LIVING,
-                    R.drawable.module_common_icon_map_marker_living,R.drawable.module_common_icon_map_marker_living_white, "实时路况"));
+                    R.drawable.module_common_icon_map_marker_living, R.drawable.module_common_icon_map_marker_living_white, "实时路况"));
             poiWrapper.put(MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING, new PoiWrapper(MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING,
-                    R.drawable.module_common_ic_rc_illegal_park,R.drawable.module_common_ic_rc_illegal_park_white, "违章停车"));
+                    R.drawable.module_common_ic_rc_illegal_park, R.drawable.module_common_ic_rc_illegal_park_white, "违章停车"));
             // 分享里用到的故障求助
             poiWrapper.put("9999", new PoiWrapper("9999",
-                    R.drawable.module_common_icon_seek_help,R.drawable.module_common_icon_seek_help, "故障求助"));
+                    R.drawable.module_common_icon_seek_help, R.drawable.module_common_icon_seek_help, "故障求助"));
         }
     }
 
@@ -81,13 +92,13 @@ public class CloudPoiManager {
         if (!config.isEmpty()) {
             List<PoiWrapper> configWrappers = GsonUtil.arrayFromJson(config, PoiWrapper.class);
             Logger.d(TAG, "config: " + configWrappers);
-            if(configWrappers!=null) {
+            if (configWrappers != null) {
                 for (PoiWrapper wrapper : configWrappers) {
                     wrapper.setIconInfoRes(R.drawable.module_common_icon_map_marker_road_block_up2_white);
                     wrapper.setIconRes(R.drawable.module_common_icon_map_marker_road_block_up2);
-                    if(poiWrapper.containsKey(wrapper.getPoiType())) {
+                    if (poiWrapper.containsKey(wrapper.getPoiType())) {
                         PoiWrapper defWrapper = poiWrapper.get(wrapper.getPoiType());
-                        if(defWrapper!=null) {
+                        if (defWrapper != null) {
                             wrapper.setIconRes(defWrapper.getIconRes());
                             wrapper.setIconInfoRes(defWrapper.getIconInfoRes());
                         }
@@ -95,7 +106,7 @@ public class CloudPoiManager {
                     Logger.d(TAG, "put===" + wrapper);
                     poiWrapper.put(wrapper.getPoiType(), wrapper);
                 }
-            }else{
+            } else {
                 Logger.e(TAG, "解析configWrapper异常: " + config);
             }
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
index 9514f894ce..5f1b226064 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.module.common.entity.MarkerPoiTypeEnum;
+import com.mogo.module.common.entity.V2XPoiTypeEnum;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.adapter.holder.V2XSurroundingViewHolder;
 import com.mogo.module.v2x.entity.panel.SurroundingConstruction;
@@ -130,6 +131,11 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
                 resId = R.drawable.mogo_image_nongwu_small;
                 break;
             case MarkerPoiTypeEnum.FOURS_ACCIDENT:
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 resId = R.drawable.mogo_image_accident_small;
                 break;
             case MarkerPoiTypeEnum.FOURS_LIVING:
@@ -167,6 +173,11 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
                 resId = R.drawable.mogo_image_nongwu_nor;
                 break;
             case MarkerPoiTypeEnum.FOURS_ACCIDENT:
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 resId = R.drawable.mogo_image_jiaotongshigu_nor;
                 break;
             case MarkerPoiTypeEnum.FOURS_LIVING:
@@ -195,6 +206,11 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
                 typeName = "交通检查";
                 break;
             case MarkerPoiTypeEnum.FOURS_ACCIDENT:
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 typeName = "交通事故";
                 break;
             case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java
index 69dac71345..353868f6dc 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java
@@ -151,6 +151,11 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter<V2XSurroun
                 typeName = "交通检查";
                 break;
             case MarkerPoiTypeEnum.FOURS_ACCIDENT:
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 typeName = "交通事故";
                 break;
             case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java
index 2cd7c87742..2637607859 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java
@@ -53,6 +53,11 @@ public class SurroundingConstruction implements Serializable {
                 typeName += "交通检查";
                 break;
             case MarkerPoiTypeEnum.FOURS_ACCIDENT:
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 typeName += "交通事故";
                 break;
             case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
index 6bcd120cee..0986ac3deb 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
@@ -20,6 +20,7 @@ import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.MarkerNoveltyInfo;
 import com.mogo.module.common.entity.MarkerOnlineCar;
+import com.mogo.module.common.entity.MarkerPoiTypeEnum;
 import com.mogo.module.common.entity.MarkerShowEntity;
 import com.mogo.module.common.entity.V2XPoiTypeEnum;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
@@ -395,6 +396,11 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                         case V2XPoiTypeEnum.FOURS_ICE:
                         case V2XPoiTypeEnum.FOURS_FOG:
                         case V2XPoiTypeEnum.FOURS_ACCIDENT:
+                        case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+                        case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+                        case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+                        case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+                        case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                             drawableMarker(
                                     V2XServiceManager.getContext(),
                                     markerShowEntity,
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
index e0a68ba46d..d76b2356a3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.PagerSnapHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.mogo.module.common.entity.MarkerPoiTypeEnum;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPoiTypeEnum;
@@ -179,6 +180,11 @@ public class V2XRoadEventWindow extends V2XBasWindow
                 case V2XPoiTypeEnum.FOURS_FOG://浓雾
                 case V2XPoiTypeEnum.FOURS_ICE://结冰
                 case V2XPoiTypeEnum.FOURS_ACCIDENT://事故
+                case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+                case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+                case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+                case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+                case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 case V2XPoiTypeEnum.FOURS_LIVING://实时路况
                 case V2XPoiTypeEnum.FOURS_NEALY://身边
                     // 展示道路事件本身详情
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
index c8d2e6b766..c3b54799ea 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
@@ -70,6 +70,11 @@ public class EventTypeUtils {
                 break;
             // 事故
             case V2XPoiTypeEnum.FOURS_ACCIDENT:
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 str = "交通事故";
                 break;
             // 实时路况
@@ -113,6 +118,11 @@ public class EventTypeUtils {
                 break;
             // 事故
             case V2XPoiTypeEnum.FOURS_ACCIDENT:
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 src = R.drawable.v2x_icon_jiaotongshigu_vr;
                 break;
             // 交通检查
@@ -151,6 +161,11 @@ public class EventTypeUtils {
                 break;
             // 事故
             case V2XPoiTypeEnum.FOURS_ACCIDENT:
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 str = "前方交通事故";
                 break;
             // 交通检查
@@ -189,6 +204,11 @@ public class EventTypeUtils {
             case V2XPoiTypeEnum.FOURS_FOG: // 浓雾
             case V2XPoiTypeEnum.FOURS_ICE: // 结冰
             case V2XPoiTypeEnum.FOURS_ACCIDENT: // 事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 strBg = V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.drawable.bg_v2x_event_type_red_vr : R.drawable.bg_v2x_event_type_read;
                 break;
             default:
@@ -220,6 +240,11 @@ public class EventTypeUtils {
             case V2XPoiTypeEnum.FOURS_FOG: // 浓雾
             case V2XPoiTypeEnum.FOURS_ICE: // 结冰
             case V2XPoiTypeEnum.FOURS_ACCIDENT: // 事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 strBg = R.drawable.bg_v2x_event_type_read;
                 break;
             default:
@@ -247,6 +272,11 @@ public class EventTypeUtils {
             case V2XPoiTypeEnum.FOURS_FOG://浓雾
             case V2XPoiTypeEnum.FOURS_ICE://结冰
             case V2XPoiTypeEnum.FOURS_ACCIDENT://事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 isRoadEvent = true;
                 break;
         }
@@ -268,6 +298,11 @@ public class EventTypeUtils {
             case V2XPoiTypeEnum.FOURS_ROAD_WORK://施工
             case V2XPoiTypeEnum.FOURS_BLOCK_UP://拥堵
             case V2XPoiTypeEnum.FOURS_ACCIDENT://事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 isRoadEvent = true;
                 break;
         }
@@ -309,6 +344,11 @@ public class EventTypeUtils {
                 break;
             // 事故
             case V2XPoiTypeEnum.FOURS_ACCIDENT:
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
+            case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
                 str[0] = "你刚经过 #### \n有事故发生吗？";
                 str[1] = "你刚路过的路段有交通事故吗？您可以直接对我说有事故、或者没有事故。";
                 str[2] = R.drawable.v_to_x_event_ugc_shigu;

From c7621f37807832a1529162b63384232f6c5b44fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 12 Apr 2021 11:34:11 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/v2x/utils/TestOnLineCarUtils.java  |  2 +-
 ...io_push_vr_event_data_yongdu_gongsi_1.json | 71 +++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json

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 33eafe8543..e47a234730 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
@@ -430,7 +430,7 @@ public class TestOnLineCarUtils {
         try {
             InputStream inputStream = V2XUtils.getApp()
                     .getResources()
-                    .openRawResource(R.raw.scenario_push_vr_event_data_yongdu_gongsi);
+                    .openRawResource(R.raw.scenario_push_vr_event_data_yongdu_gongsi_1);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             int len = -1;
             byte[] buffer = new byte[1024];
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json
new file mode 100644
index 0000000000..1f41a45323
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi_1.json
@@ -0,0 +1,71 @@
+{
+  "sceneId": "200008",
+  "alarmContent": "拥堵路线推荐",
+  "expireTime": 10000,
+  "sceneCategory": 0,
+  "sceneDescription": "拥堵路线推荐",
+  "sceneName": "拥堵路线推荐",
+  "sceneLevel": 0,
+  "videoUrl": "",
+  "videoChannel": "",
+  "videoSn": "",
+  "tts": "发现前方拥堵，最优路线快6分钟",
+  "zoom": false,
+  "zoomScale": 15,
+  "userHead": "",
+  "msgImgUrl": "",
+  "lat":39.969088,
+  "lon":116.41808,
+  "polyline": [
+    [
+      116.417388,39.983351
+    ],
+    [
+      116.417351,39.9841
+    ],
+    [
+      116.417286,39.985423
+    ],
+    [
+      116.417233,39.98673
+    ],
+    [
+      116.417179,39.988156
+    ],
+    [
+      116.417158,39.988493
+    ],
+    [
+      116.417142,39.989245
+    ],
+    [
+      116.417174,39.990199
+    ]
+  ],
+  "recommendPolyline": [
+    [
+      116.417388,39.983351
+    ],
+    [
+      116.417351,39.9841
+    ],
+    [
+      116.417286,39.985423
+    ],
+    [
+      116.417233,39.98673
+    ],
+    [
+      116.417179,39.988156
+    ],
+    [
+      116.417158,39.988493
+    ],
+    [
+      116.417142,39.989245
+    ],
+    [
+      116.417174,39.990199
+    ]
+  ]
+}
\ No newline at end of file

From c61ed0930d1ce1442c24323b6746615db0c45ff7 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 12 Apr 2021 12:21:57 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E7=BA=BF=E7=BB=98?=
 =?UTF-8?q?=E5=88=B6=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MoGoV2XCloundDataManager.java        | 26 ++++++++-----------
 .../scene/warning/V2XWarningMarker.java       |  4 +++
 .../res/raw/scenario_warning_event_data.json  | 10 ++++---
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
index 23fd49041f..d30a11282e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
@@ -47,6 +47,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
     private static String TAG = "MoGoV2XCloundDataManager";
     private boolean isSelfLineClear;
     private List fillPoints = new ArrayList();//停止线经纬度合集
+    private static long showTime = 0;
 
     @Override
     public void init(Context context) {
@@ -59,6 +60,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
         Log.d(V2XConst.LOG_NAME_WARN, "analysisV2XCloundDataEvent -----> ");
 
         mCloundWarningInfo = cloundWarningInfo;
+        showTime = mCloundWarningInfo.getShowTime();
         pointsBetween();
 
         //发送预警提示
@@ -68,10 +70,10 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
 
         Log.d(V2XConst.LOG_NAME_WARN, "direction = " + cloundWarningInfo.getDirection());
         if (cloundWarningInfo.getDirection() == 1) { //前方
-            //停止线前方画线
             MogoLatLng newLocation = LocationUtils.getNewLocation((MogoLatLng) fillPoints.get(0), 80, cloundWarningInfo.getAngle());
+            //停止线前方画线
             WorkThreadHandler.getInstance().postDelayed(() -> {
-                //添加停止线marker
+                //添加停止线
                 drawStopLineWith2Resource();
                 //二轮车和行人的渲染和移动
                 V2XWarnDataDrawer.getInstance().renderWarnData(cloundWarningInfo);
@@ -84,7 +86,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
                 V2XServiceManager.getMoGoWarnPolylineManager().clearLine();
                 V2XServiceManager.getMoGoStopPolylineManager().clearLine();
                 isSelfLineClear = true;
-            }, 8000);
+            }, showTime);
 
         } else { //左侧或者右侧
             WorkThreadHandler.getInstance().postDelayed(() -> {
@@ -98,9 +100,8 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
             UiThreadHandler.postDelayed(() -> {
                 V2XServiceManager.getMoGoPersonWarnPolylineManager().clearLine();
                 V2XServiceManager.getMoGoWarnPolylineManager().clearLine();
-
                 isSelfLineClear = true;
-            }, 8000);
+            }, showTime);
         }
 
     }
@@ -124,10 +125,6 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
      * 2D资源绘制停止线
      * */
     private void drawStopLineWith2Resource() {
-
-        //自车位置39.97665425796924--116.41769983329762
-        mCloundWarningInfo.setCarLocation(new MogoLatLng(39.97665425796924,116.41769983329762));//测试数据
-
         MogoLatLng carlo = mCloundWarningInfo.getCarLocation();
         if (carlo == null) {
             double lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon();
@@ -136,11 +133,11 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
         }
         //自车行驶方向的前方*米的经纬度,该经纬度在停止线上
         MogoLatLng drawStopLineLon = LocationUtils.getNewLocation(carlo, mCloundWarningInfo.getStopLineDistance(), mCloundWarningInfo.getAngle());
-        Log.d(TAG, "2D资源绘制停止线"+drawStopLineLon);
+        Log.d(TAG, "2D资源绘制停止线" + drawStopLineLon);
         MogoMarkerOptions optionsRipple = new MogoMarkerOptions()
                 .latitude(drawStopLineLon.getLat())
                 .longitude(drawStopLineLon.getLon())
-                .anchor(0.5f, 0.5f)
+                .anchor(1.0f, 1.0f)
                 .zIndex(MarkerDrawer.MARKER_Z_INDEX_HIGH);
 
         optionsRipple
@@ -148,9 +145,9 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
         IMogoMarker stopLine = V2XServiceManager.getMarkerManager().addMarker(TYPE_MARKER_CLOUD_STOP_LINE_DATA, optionsRipple);
         stopLine.setInfoWindowAdapter(new SimpleWindow3DAdapter(new V2XFrontTargetMarkerView(V2XServiceManager.getContext())));
         stopLine.showInfoWindow();
-//        UiThreadHandler.postDelayed(() -> {
-//            stopLine.hideInfoWindow();
-//        }, 8000);
+        UiThreadHandler.postDelayed(() -> {
+            stopLine.hideInfoWindow();
+        }, showTime);
     }
 
     /**
@@ -302,7 +299,6 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
 
     private MogoLatLng getMogoLat(MogoLatLng latlng) {
         MogoLatLng newLocation = LocationUtils.getNewLocation(latlng, mCloundWarningInfo.getDistance(), mCloundWarningInfo.getDirection());
-
         return newLocation;
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
index 6470241db7..c6b26b9c3a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
@@ -24,6 +24,7 @@ import com.mogo.module.v2x.marker.OptimalSpeedMarkerView;
 import com.mogo.module.v2x.marker.V2XFrontTargetMarkerView;
 import com.mogo.module.v2x.scenario.view.IV2XMarker;
 import com.mogo.module.v2x.utils.LocationUtils;
+import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.ViewUtils;
 import com.mogo.utils.WorkThreadHandler;
 
@@ -65,6 +66,9 @@ public class V2XWarningMarker implements IV2XMarker {
             optimalMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_FRONT_WARNING_MARKER, optionsRipple);
             optimalMarker.setInfoWindowAdapter(new SimpleWindow3DAdapter(new V2XFrontTargetMarkerView(mContext)));
             optimalMarker.showInfoWindow();
+            UiThreadHandler.postDelayed(() -> {
+                optimalMarker.hideInfoWindow();
+            }, 8000);
 
         } catch (Exception e) {
 
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
index 5963e668f3..62454570d9 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
@@ -20,9 +20,13 @@
   "direction": 1,
   "speed": 11.108121,
   "targetColor": "#FF4040",
-  "stopLineDistance": 15,
+  "stopLineDistance": 20,
   "warningContent": "小心行人",
   "heading": 0,
-  "showTime": 3000,
-  "roadwidth": 60.0
+  "showTime": 8000,
+  "roadwidth": 60.0,
+  "carLocation": {
+    "lat": 39.97665425,
+    "lon": 116.41769983
+  }
 }
\ No newline at end of file