fixed conflict

core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt

@@ -398,7 +398,7 @@ class MogoPrivateObuManager private constructor() {
                     ObuConstants.STATUS.ADD,
                     ObuConstants.STATUS.UPDATE// 更新
                     -> {
-                        if (level == 2 || level == 3) {
+//                        if (level == 2 || level == 3) { //不考虑level
                             //显示警告红边
                             CallerHmiManager.showWarning(direction)
                             CallerHmiManager.showWarningV2X(
@@ -413,7 +413,7 @@ class MogoPrivateObuManager private constructor() {
                                     }
                                 }
                             )
-                        }
+//                        }
                         // 更新数据
                         TrafficDataConvertUtils.cvxPtcThreatIndInfo2TrafficData(info)?.let {
                             TrafficMarkerDrawer.updateITrafficInfo(it)
@@ -775,7 +775,7 @@ class MogoPrivateObuManager private constructor() {
                 }
             }
 
-            // 这里处理固定的提示信息
+            // 这里处理固定的提示信息,包括了<紧急车辆提醒>
             else -> {
                 ttsContent = EventTypeEnum.getWarningTts(appId.toString())
                 alertContent = EventTypeEnum.getWarningContent(appId.toString())