diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index b1f95be36b..a9f0f172b1 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -282,7 +282,7 @@ public class MogoApplication extends AbsMogoApplication {
             startService(intent);
         }
 
-        if (refWatcher != null){
+        if (refWatcher == null){
             refWatcher  = LeakCanary.install(this);
         }
 
diff --git a/gradle.properties b/gradle.properties
index cdae1eba49..995425e5dc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -187,4 +187,4 @@ applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.7
-MAP_SDK_VERSION=1.0.0-vr-8.5.47
\ No newline at end of file
+MAP_SDK_VERSION=1.0.0-vr-8.5.49
\ No newline at end of file
diff --git a/libraries/map-custom/map-version-update b/libraries/map-custom/map-version-update
index c3c68d29bb..58e04c8742 100644
--- a/libraries/map-custom/map-version-update
+++ b/libraries/map-custom/map-version-update
@@ -81,4 +81,11 @@ mapAutoView.getMapAutoViewHelper()?.setNearViewAnglePosition（LonLatPoint(112.5
 8.5.47
 修改绿化带相关
 修改crash bug
-更新衡阳数据
\ No newline at end of file
+更新衡阳数据
+
+8.5.48
+fix crash
+
+8.5.49
+1.更新衡阳数据（包含38Km和城区200km）
+2.新增路牌
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
index b86800b5ba..fc56d5c187 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
@@ -20,6 +20,8 @@ import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XObuEventEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
+import com.mogo.module.service.MarkerServiceHandler;
+import com.mogo.module.service.receiver.MogoReceiver;
 import com.mogo.module.v2x.listener.V2XLocationListener;
 import com.mogo.module.v2x.scenario.scene.obu.V2XObuEventScenario;
 import com.mogo.module.v2x.utils.ADASUtils;
@@ -96,6 +98,13 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
         NebulaObuClient.getInstance().registerObu(100);
         NebulaObuClient.getInstance().registerObuListener(listener);
 
+//        UiThreadHandler.postDelayed( () -> {
+//            //TODO 测试
+//            MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(3, MogoReceiver.ACTION_V2X_FRONT_WARNING);
+//            handleSdkObu(1);
+//
+//        }, 5_000L );
+
         IntentFilter filter = new IntentFilter("com.mogo.launcher.v2x.action.EXCHANGE_OBU_TYPE");
         context.registerReceiver(obuTypeExchangeReceiver, filter);
     }
@@ -137,7 +146,7 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
                     Logger.d("liyz", "onWarningInfo type ------> " + info.getWarningtype() + "--size = " + infoList.size());
                     if (info.getWarningtype() == 3) {
                         if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
-                            handleSdkObu();
+                            handleSdkObu(2);
                         }
                     }
                 }
@@ -145,14 +154,23 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
         }
     };
 
-    private void handleSdkObu() {
+
+    private void handleSdkObu(int type) {
         V2XMessageEntity<V2XObuEventEntity> messageEntity = new V2XMessageEntity<>();
         messageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_OBU_EVENT);
 
-        // 前车紧急制动预警
         V2XObuEventEntity urgencyEvent = new V2XObuEventEntity();
-        urgencyEvent.setType(ObuConstant.TYPE_URGENCY_COLLISION_WARNING);
-        urgencyEvent.setDesc(V2XObuEventScenario.URGENCY_COLLISION_WARN_TEXT);
+        if (type == 1) { //交叉路口碰撞预警 TODO
+            urgencyEvent.setType(ObuConstant.TYPE_CROSS_COLLISION_WARNING);
+            urgencyEvent.setDesc(V2XObuEventScenario.URGENCY_CROING_WARN_TEXT);
+        } else if (type == 2) { // 前车紧急制动预警
+            urgencyEvent.setType(ObuConstant.TYPE_URGENCY_COLLISION_WARNING);
+            urgencyEvent.setDesc(V2XObuEventScenario.URGENCY_COLLISION_WARN_TEXT);
+        } else {
+            urgencyEvent.setType(ObuConstant.TYPE_URGENCY_COLLISION_WARNING);
+            urgencyEvent.setDesc(V2XObuEventScenario.URGENCY_COLLISION_WARN_TEXT);
+        }
+
         messageEntity.setContent(urgencyEvent);
         V2XObuEventScenario.getInstance().init(messageEntity);
     }
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 0ff47b0d6e..c11fdb7201 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
@@ -61,6 +61,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
     private static CopyOnWriteArraySet<V2XRoadEventEntity> mV2XRoadEventEntityArrayList = new CopyOnWriteArraySet<>();
     // 上次的道路事件的预警Marker
     private static IMogoMarker mAlarmInfoMarker;
+    private static IMogoMarker m3DMarker;
 
     @Override
     public void drawableLastAllPOI() {
@@ -274,6 +275,14 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                     optionsRipple.icons(V2XMarkerAdapter.getV2XRoadEventViewGif(context, roadEventEntity));
                     optionsRipple.period(100);
                     mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
+
+                    MogoMarkerOptions options = new MogoMarkerOptions().object(roadEventEntity)
+                            .latitude(roadEventEntity.getLocation().getLat()).longitude(roadEventEntity.getLocation().getLon());
+                    options.anchor(0.5f, 0.5f);
+                    options.zIndex(MarkerDrawer.MARKER_Z_INDEX_HIGH);
+                    options.icon3DRes(com.mogo.module.common.R.raw.othercar);
+                    options.anchorColor("#C6D83EFF");
+                    m3DMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, options);
                 }
                 // 当前Marker设置为最上面
                 mAlarmInfoMarker.setToTop();
@@ -302,6 +311,9 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
             if (mAlarmInfoMarker != null) {
                 mAlarmInfoMarker.remove();
             }
+            if (m3DMarker != null) {
+                m3DMarker.remove();
+            }
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
index 7647f6b026..e2233b6551 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
@@ -8,6 +8,7 @@ import com.mogo.module.common.entity.V2XPoiTypeEnum;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.v2x.R;
+import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.utils.ImageUtil;
 import com.mogo.module.v2x.utils.V2XUtils;
 
@@ -131,44 +132,74 @@ public class V2XMarkerAdapter {
      */
     public static ArrayList<Bitmap> getV2XRoadEventOrangeMarkerView(Context context, V2XRoadEventEntity alarmInfo) {
         ArrayList<Bitmap> icons = new ArrayList<>();
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00011));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00012));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00013));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00014));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00015));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00016));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00017));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00018));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00019));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00020));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00021));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00022));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00023));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00024));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00025));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00026));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00027));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00028));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00029));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00030));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00031));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00032));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00033));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00034));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00035));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00036));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00037));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00038));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00039));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00040));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00041));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00042));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00043));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00044));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00045));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00046));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00047));
-        icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00048));
+        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0000));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0001));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0002));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0003));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0004));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0005));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0006));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0007));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0008));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0009));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0010));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0011));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0012));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0013));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0014));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0015));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0016));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0017));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0018));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0019));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0020));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0021));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0022));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0023));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, com.mogo.module.service.R.drawable.module_service_ic_car_for_help_0024));
+
+        } else {
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00011));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00012));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00013));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00014));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00015));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00016));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00017));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00018));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00019));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00020));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00021));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00022));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00023));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00024));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00025));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00026));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00027));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00028));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00029));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00030));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00031));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00032));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00033));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00034));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00035));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00036));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00037));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00038));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00039));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00040));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00041));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00042));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00043));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00044));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00045));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00046));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00047));
+            icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00048));
+        }
+
         return icons;
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt
index 1e3ac99c1f..10aeff917a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt
@@ -10,6 +10,7 @@ import com.mogo.module.common.entity.MarkerExploreWay
 import com.mogo.module.common.entity.V2XPoiTypeEnum
 import com.mogo.module.common.entity.V2XRoadEventEntity
 import com.mogo.module.v2x.R
+import com.mogo.module.v2x.V2XServiceManager
 import com.mogo.utils.ViewUtils
 import kotlinx.android.synthetic.main.view_marker_event_car.view.*
 
@@ -101,7 +102,9 @@ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) :
             }
             // 故障车辆
             V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING.toString() -> {
-                ivCar.setImageResource(R.drawable.icon_car_red)
+                if (!V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+                    ivCar.setImageResource(R.drawable.icon_car_red)
+                }
             }
             // 取快递
             V2XPoiTypeEnum.ALERT_TRAFFIC_EXPRESS -> {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java
index 8cec04c52e..ec962d4b1b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java
@@ -44,6 +44,8 @@ public class V2XObuEventScenario extends AbsV2XScenario<V2XObuEventEntity> imple
 
     public static final String URGENCY_COLLISION_WARN_TEXT_ONE = "前车急刹，注意保持安全距离！";
     public static final String URGENCY_COLLISION_WARN_TEXT = "前车急刹";
+    public static final String URGENCY_CROING_WARN_TEXT = "交叉路口碰撞预警";
+
     private static final int MSG_CLOSE_OBU_WINDOW = 1001;
     private static final int DEFAULT_EXPIRE_TIME = 20_000;
 
@@ -110,7 +112,12 @@ public class V2XObuEventScenario extends AbsV2XScenario<V2XObuEventEntity> imple
             } else {
                 optimalSpeedMarker.clearPOI();
             }
+        } else if (v2XMessageEntity.getContent().getType() == ObuConstant.TYPE_CROSS_COLLISION_WARNING) {
+            AIAssist.getInstance(V2XServiceManager.getContext()).speakTTSVoice(URGENCY_CROING_WARN_TEXT);
+        } else if (v2XMessageEntity.getContent().getType() == ObuConstant.TYPE_URGENCY_COLLISION_WARNING) {
+            AIAssist.getInstance(V2XServiceManager.getContext()).speakTTSVoice(URGENCY_COLLISION_WARN_TEXT_ONE);
         }
+
         show();
     }
 
@@ -121,7 +128,7 @@ public class V2XObuEventScenario extends AbsV2XScenario<V2XObuEventEntity> imple
      */
     @Override
     public void show() {
-        AIAssist.getInstance(V2XServiceManager.getContext()).speakTTSVoice(URGENCY_COLLISION_WARN_TEXT_ONE);
+//        AIAssist.getInstance(V2XServiceManager.getContext()).speakTTSVoice(URGENCY_COLLISION_WARN_TEXT_ONE);
         showWindow();
         if (handler.hasMessages(MSG_CLOSE_OBU_WINDOW)) {
             handler.removeMessages(MSG_CLOSE_OBU_WINDOW);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventWindow.java
index fca42116b3..44b5f8a400 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventWindow.java
@@ -66,7 +66,7 @@ public class V2XObuEventWindow extends FrameLayout implements IV2XWindow<V2XObuE
     @Override
     public void show(V2XObuEventEntity entity) {
         Logger.d(MODULE_NAME, "ObuEventWindow show " + entity);
-        Logger.d("liyz", "ObuEventWindow show " + entity + "--type = " + entity.getType());
+        Logger.d("liyz", "ObuEventWindow show " + entity);
         switch (entity.getType()) {
             case ObuConstant
                     .TYPE_OPTIMAL_SPEED_ADVISORY:
@@ -83,6 +83,13 @@ public class V2XObuEventWindow extends FrameLayout implements IV2XWindow<V2XObuE
                 tvType.setText("前车急刹");
                 tvType.setBackgroundResource(R.drawable.bg_v2x_event_type_read);
                 break;
+            case ObuConstant.TYPE_CROSS_COLLISION_WARNING:
+                // 交叉路口碰撞预警
+                ivTypeIcon.setImageResource(R.drawable.v2x_icon_ahead_car_brake);
+                tvDesc.setText(entity.getDesc());
+                tvType.setText("交叉路口碰撞预警");
+                tvType.setBackgroundResource(R.drawable.bg_v2x_event_type_read);
+                break;
             case ObuConstant.TYPE_CHANGE_LIGHT_FOR_VIP:
                 // vip变灯提醒
                 ivTypeIcon.setImageResource(R.drawable.v2x_icon_obu_traffic_light);
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
index 419ca482a3..06c4b23743 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
@@ -39,7 +39,7 @@
             android:paddingBottom="@dimen/dp_5"
             android:text="求助"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/sp_20"
+            android:textSize="@dimen/module_v2x_fault_help_img_content_text_size"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@id/ivFaultHelpHead"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car_vr.xml
new file mode 100644
index 0000000000..1cd5f8ca8a
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car_vr.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/ivBg"
+        android:layout_width="@dimen/dp_300"
+        android:layout_height="@dimen/dp_300"
+        android:gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/v_to_x_warning_circle_red_00040" />
+
+    <ImageView
+        android:id="@+id/ivCar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:rotation="45"
+        app:layout_constraintBottom_toBottomOf="@+id/ivBg"
+        app:layout_constraintEnd_toEndOf="@+id/ivBg"
+        app:layout_constraintStart_toStartOf="@+id/ivBg"
+        app:layout_constraintTop_toTopOf="@+id/ivBg"
+        tools:src="@drawable/v_to_x_warning_car_red" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml
index 46ae9749b3..37971199fb 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_simple_obu_event_detail_vr.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="@dimen/module_v2x_brake_tip_width"
+    android:layout_width="wrap_content"
     android:layout_height="@dimen/module_v2x_brake_tip_height"
     android:layout_marginTop="@dimen/dp_20"
     android:layout_gravity="center_horizontal"
     android:background="@drawable/v2x_front_warning_bg">
-
+<!--    @dimen/module_v2x_brake_tip_width-->
     <ImageView
         android:id="@+id/ivObuTypeIcon"
         android:layout_width="@dimen/module_v2x_brake_image_width"
@@ -46,6 +46,7 @@
         android:text="前车急刹"
         android:textColor="@color/v2x_white"
         android:textSize="@dimen/dp_32"
+        android:paddingRight="@dimen/module_v2x_brake_image_margin_left"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="@+id/tvObuType"
         app:layout_constraintTop_toBottomOf="@+id/tvObuType" />
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
index bd5d9c6937..c2a11f02b6 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -21,6 +21,7 @@
     <dimen name="module_v2x_fatigue_driving_window_height_ground">234px</dimen>
     <dimen name="module_v2x_fault_help_width">1067px</dimen>
     <dimen name="module_v2x_fault_help_height">187px</dimen>
+    <dimen name="module_v2x_fault_help_img_content_text_size">28px</dimen>
 
     <dimen name="module_v2x_fault_help_img_content_width">107px</dimen>
     <dimen name="module_v2x_fault_help_img_content_height">47px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 6fc0fe97ff..b4eb41ebb2 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -147,6 +147,7 @@
 
     <dimen name="module_v2x_fault_help_width">800px</dimen>
     <dimen name="module_v2x_fault_help_height">140px</dimen>
+    <dimen name="module_v2x_fault_help_img_content_text_size">20px</dimen>
 
     <dimen name="module_v2x_fault_help_img_content_width">80px</dimen>
     <dimen name="module_v2x_fault_help_img_content_height">35px</dimen>
diff --git a/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java b/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
index 327cc49842..d016bc43b1 100644
--- a/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
+++ b/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
@@ -41,7 +41,6 @@ class BuglyCrashReportProvider implements ITestCrashReportProvider {
         CrashReport.initCrashReport( context, "f3f8b0b2f1", true, strategy );
         CrashReport.putUserData( context, "serial", MoGoAiCloudClientConfig.getInstance().getSn() );
         String mapSDKVersion =  AppUtils.getCustomMapSDKVersion(context);
-        Log.e("lianglihui", "init: "+mapSDKVersion);
         CrashReport.putUserData( context, "MAP_SDK_VERSION",mapSDKVersion );
     }
 
diff --git a/test/crashreport-upgrade/src/main/java/com/mogo/test/crashreport/upgrade/UpgradeReportProvider.java b/test/crashreport-upgrade/src/main/java/com/mogo/test/crashreport/upgrade/UpgradeReportProvider.java
index d510835ac5..579c6704cc 100644
--- a/test/crashreport-upgrade/src/main/java/com/mogo/test/crashreport/upgrade/UpgradeReportProvider.java
+++ b/test/crashreport-upgrade/src/main/java/com/mogo/test/crashreport/upgrade/UpgradeReportProvider.java
@@ -2,11 +2,13 @@ package com.mogo.test.crashreport.upgrade;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.facade.template.IProvider;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.network.Utils;
+import com.mogo.utils.AppUtils;
 import com.mogo.utils.logger.Logger;
 import com.tencent.bugly.Bugly;
 import com.tencent.bugly.crashreport.CrashReport;
@@ -41,6 +43,8 @@ public class UpgradeReportProvider implements IProvider {
         CrashReport.putUserData(context, "serial", MoGoAiCloudClientConfig.getInstance().getSn());
 
         Bugly.init(context, "f3f8b0b2f1", true, strategy);
+        String mapSDKVersion =  AppUtils.getCustomMapSDKVersion(context);
+        CrashReport.putUserData( context, "MAP_SDK_VERSION",mapSDKVersion );
     }
 
     /**