Merge branch 'dev_minibus-d_230425_3.2.0' into code_opt_3.3.0

This commit is contained in:
zhongchao
2023-05-31 11:28:45 +08:00
12 changed files with 214 additions and 141 deletions

View File

@@ -224,22 +224,22 @@ enum class EventTypeEnumNew(
1001.toString(),
"碰撞预警",
poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision,
content = "前方摩托车",
tts = "前方摩托车"
content = "前方摩托车闯入",
tts = "前方摩托车闯入"
),
TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES(
1002.toString(),
"碰撞预警",
poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike,
content = "前方非机动车",
tts = "前方非机动车"
content = "前方非机动车闯入",
tts = "前方非机动车闯入"
),
TYPE_USECASE_ID_VRUCW_PERSON(
1003.toString(),
"碰撞预警",
poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing,
content = "前方路人",
tts = "前方路人"
content = "前方路人闯入",
tts = "前方路人闯入"
),
TYPE_ERROR_WEAKNESS(
1006.toString(),