diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt index a08eb1494d..d7cff6cad0 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt @@ -51,7 +51,7 @@ enum class V2iEventTypeEnum( TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE( //车辆逆行 904.toString(), "逆行车辆", - poiTypeSrcVr = R.drawable.icon_warning_v2x_school, + poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米逆行车辆,影响路段%s米", tts = "前方%s米逆行车辆,影响路段%s米" ), @@ -83,7 +83,7 @@ enum class V2iEventTypeEnum( TYPE_ID_BRIDGE( 8.toString(), "桥梁", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, + poiTypeSrcVr = R.drawable.icon_warning_v2x_hump_bridge, content = "前方%s米桥梁", tts = "前方%s米桥梁" ), @@ -97,42 +97,42 @@ enum class V2iEventTypeEnum( TYPE_ID_SLIPPERY_ROAD( 17.toString(), "路滑", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, + poiTypeSrcVr = R.drawable.v2x_icon_jiebing_vr, content = "前方%s米路滑", tts = "前方%s米路滑" ), TYPE_ID_TUNNEL( 21.toString(), "隧道", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, + poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米隧道", tts = "前方%s米隧道" ), TYPE_ID_FERRY( 22.toString(), "渡轮", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, + poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米渡轮", tts = "前方%s米渡轮" ), TYPE_ID_UNEVEN_ROAD( 24.toString(), "路面不平", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, + poiTypeSrcVr = R.drawable.icon_warning_road_hollow, content = "前方%s米路面不平", tts = "前方%s米路面不平" ), TYPE_ID_NON_MOTOR_VEHICLE( 32.toString(), "非机动车", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, + poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike, content = "前方%s米有非机动车", tts = "前方%s米有非机动车" ), TYPE_ID_OBSTACLE( 36.toString(), "障碍", - poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, + poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米障碍", tts = "前方%s米障碍" ), @@ -146,21 +146,21 @@ enum class V2iEventTypeEnum( TYPE_VEHICLE_QUEUE( 47.toString(), "车队", - poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, + poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米车队", tts = "前方%s米车队" ), TYPE_NO_PASSING( 51.toString(), "不通", - poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, + poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr, content = "前方%s米不通", tts = "前方%s米不通" ), TYPE_NO_TURNING_AROUND( 75.toString(), "禁止掉头", - poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, + poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米禁止掉头", tts = "前方%s米禁止掉头" ), @@ -174,7 +174,7 @@ enum class V2iEventTypeEnum( TYPE_USECASE_ID_ROAD_NO_TOOTING( 80.toString(), "禁止鸣笛", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, + poiTypeSrcVr = R.drawable.icon_warning_v2x_no_tooting, content = "前方%s米禁止鸣笛", tts = "前方%s米禁止鸣笛" ), @@ -189,21 +189,21 @@ enum class V2iEventTypeEnum( TYPE_USECASE_ID_BUS_WARNING( 123.toString(), "公交提醒", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, + poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar, content = "前方%s米公交提醒", tts = "前方%s米公交提醒" ), TYPE_USECASE_ID_NARROW_RIGHT( 163.toString(), "右侧变窄/车道数减少", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, + poiTypeSrcVr = R.drawable.icon_default, content = "前方%s米右侧变窄/车道数减少", tts = "前方%s米右侧变窄/车道数减少" ), TYPE_USECASE_ID_GAS_STATION( 201.toString(), "加油站", - poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking, + poiTypeSrcVr = R.drawable.icon_warning_gas_station, content = "前方%s米加油站", tts = "前方%s米加油站" ), @@ -218,7 +218,7 @@ enum class V2iEventTypeEnum( TYPE_USECASE_ID_ACCIDENT( 244.toString(), "事故", - poiTypeSrcVr = R.drawable.icon_warning_v2x_school, + poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr, content = "前方%s米事故", tts = "前方%s米事故" ), diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_gas_station.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_gas_station.png new file mode 100755 index 0000000000..ca5494879d Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_gas_station.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_road_hollow.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_road_hollow.png new file mode 100755 index 0000000000..9cb6f7b9ac Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_road_hollow.png differ diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_v2x_no_tooting.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_v2x_no_tooting.png new file mode 100755 index 0000000000..32c0216294 Binary files /dev/null and b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_warning_v2x_no_tooting.png differ