[code_opt_3.3.0]merge 3.2.0

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt

@@ -102,8 +102,8 @@ enum class EventTypeEnumNew(
     ROAD_SLIPPERY("10021"),
 
     //鬼探头类型
-    GHOST_PROBE("10024", "前方盲区行人预警", "前方盲区行人预警", R.drawable.icon_warning_v2x_pedestrian_crossing,
-        "前方盲区行人通行，请注意", "前方盲区即将有行人通过，请减速慢行"),
+    GHOST_PROBE("10024", "前方盲区路人预警", "前方盲区路人预警", R.drawable.icon_warning_v2x_pedestrian_crossing,
+        "前方盲区路人通行，请注意", "前方盲区即将有路人通过，请减速慢行"),
 
     //接管
     TAKE_OVER_EVENT(
@@ -238,8 +238,8 @@ enum class EventTypeEnumNew(
         1003.toString(),
         "碰撞预警",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
-        content = "前方行人",
-        tts = "前方行人"
+        content = "前方路人",
+        tts = "前方路人"
     ),
     TYPE_ERROR_WEAKNESS(
         1006.toString(),
@@ -337,10 +337,10 @@ enum class EventTypeEnumNew(
     ),
     TYPE_ID_PEDESTRIAN(
         10.toString(),
-        "行人",
+        "路人",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
-        content = "前方%s米行人",
-        tts = "蘑菇路侧提醒您，前方%s米行人"
+        content = "前方%s米路人",
+        tts = "蘑菇路侧提醒您，前方%s米路人"
     ),
     TYPE_ID_SLIPPERY_ROAD(
         17.toString(),
@@ -463,10 +463,10 @@ enum class EventTypeEnumNew(
     ),
     TYPE_ATTENTION_CONFLUENCE(
         44.toString(),
-        "注意合流",
+        "前方车辆汇流",
         poiTypeSrcVr = R.drawable.icon_warning_v2x_attention_confluence,
-        content = "前方%s米注意合流",
-        tts = "蘑菇路侧提醒您，前方%s米注意合流"
+        content = "前方%s米注意车辆汇流",
+        tts = "蘑菇路侧提醒您，前方%s米注意车辆汇流"
     ),
     TYPE_PEDESTRIAN_CROSSING(
         114.toString(),
@@ -901,7 +901,7 @@ enum class EventTypeEnumNew(
                 TYPE_ID_BRIDGE.poiType ->{
                     TYPE_ID_BRIDGE.poiTypeStr
                 }
-                //行人
+                //路人
                 TYPE_ID_PEDESTRIAN.poiType ->{
                     TYPE_ID_PEDESTRIAN.poiTypeStr
                 }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeHelper.kt

@@ -130,8 +130,8 @@ class EventTypeHelper {
         fun getVRURI(data: ((appId: Int, tts: String, content: String) -> Unit)) {
             data.invoke(
                 EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt(),
-                "行人逆行预警",
-                "行人逆行预警"
+                "路人逆行预警",
+                "路人逆行预警"
             )
         }