From 7d755877c17758b6696952243ad1f147365dde15 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 3 Jul 2024 14:59:03 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]refactor:=20=E7=BB=9F=E4=B8=80=E4=BB=96?= =?UTF-8?q?=E8=BD=A6=E5=80=92=E8=BD=A6/=E9=80=86=E8=A1=8C=20=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=91=BD=E5=90=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/data/enums/EventTypeEnumNew.kt | 22 +++++++++--------- ...n_v2x_other_retrograde_vehicle_driver.png} | Bin ...2x_other_retrograde_vehicle_passenger.png} | Bin 3 files changed, 11 insertions(+), 11 deletions(-) rename core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/{icon_v2x_wrong_direction_car_driver.png => icon_v2x_other_retrograde_vehicle_driver.png} (100%) rename core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/{icon_v2x_wrong_direction_car_passenger.png => icon_v2x_other_retrograde_vehicle_passenger.png} (100%) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index d4b5759162..a6d812c06a 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -511,10 +511,10 @@ enum class EventTypeEnumNew( content = "前方%s米道路施工", tts = "前方%s米道路施工" ), - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR( + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE( "100062", - "他车逆行", - poiTypeSrcVr = R.drawable.icon_v2x_wrong_direction_car_driver, + "他车倒车/逆行", + poiTypeSrcVr = R.drawable.icon_v2x_other_retrograde_vehicle_driver, content = "前方%s米有车辆异常倒车/逆行，蘑菇提醒您注意观察小心通过", tts = "前方%s米有车辆异常倒车/逆行，蘑菇提醒您注意观察小心通过" ), @@ -743,7 +743,7 @@ enum class EventTypeEnumNew( TYPE_SOCKET_ROAD_SHIGONG.poiType, TYPE_SOCKET_ROAD_JINGZHI.poiType, TYPE_SOCKET_ROAD_SHIGU.poiType, - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.poiType, + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType, TYPE_SOCKET_ROAD_CONGESTION.poiType -> true else -> false } @@ -764,7 +764,7 @@ enum class EventTypeEnumNew( TYPE_SOCKET_ROAD_JINGZHI.poiType -> TYPE_SOCKET_ROAD_JINGZHI.tts TYPE_SOCKET_ROAD_SHIGU.poiType -> TYPE_SOCKET_ROAD_SHIGU.tts TYPE_SOCKET_ROAD_CONGESTION.poiType -> TYPE_SOCKET_ROAD_CONGESTION.tts - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.poiType -> TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.tts + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.tts TYPE_USECASE_ROAD_BUS_STATION.poiType -> TYPE_USECASE_ROAD_BUS_STATION.tts else -> "道路事件" } @@ -787,7 +787,7 @@ enum class EventTypeEnumNew( TYPE_SOCKET_ROAD_JINGZHI.poiType -> TYPE_SOCKET_ROAD_JINGZHI.content TYPE_SOCKET_ROAD_SHIGU.poiType -> TYPE_SOCKET_ROAD_SHIGU.content TYPE_SOCKET_ROAD_CONGESTION.poiType -> TYPE_SOCKET_ROAD_CONGESTION.content - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.poiType -> TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.content + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.content TYPE_USECASE_ROAD_BUS_STATION.poiType -> TYPE_USECASE_ROAD_BUS_STATION.content else -> "道路事件" } @@ -1155,8 +1155,8 @@ enum class EventTypeEnumNew( TYPE_USECASE_ROAD_BUS_STATION.poiTypeStr } // 他车逆行 - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.poiType -> { - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.poiTypeStr + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> { + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiTypeStr } else ->{ "事件通知" @@ -1185,7 +1185,7 @@ enum class EventTypeEnumNew( TYPE_SOCKET_ROAD_SHIGU.poiType -> if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) R.drawable.icon_shigu_passenger else R.drawable.icon_shigu_driver TYPE_SOCKET_ROAD_CONGESTION.poiType -> R.drawable.v2x_icon_yongdu_vr // 他车逆行/倒车 - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.poiType -> if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) R.drawable.icon_v2x_wrong_direction_car_passenger else R.drawable.icon_v2x_wrong_direction_car_driver + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) R.drawable.icon_v2x_other_retrograde_vehicle_passenger else R.drawable.icon_v2x_other_retrograde_vehicle_driver // 通过公交站 TYPE_USECASE_ROAD_BUS_STATION.poiType -> if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) R.drawable.icon_v2x_bus_station_passenger else R.drawable.icon_v2x_bus_station_driver //拥堵 @@ -1431,7 +1431,7 @@ enum class EventTypeEnumNew( TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.content TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.content TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.content - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.poiType -> TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.content + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.content TYPE_USECASE_ROAD_BUS_STATION.poiType -> TYPE_USECASE_ROAD_BUS_STATION.content else -> TYPE_ERROR.content } @@ -1495,7 +1495,7 @@ enum class EventTypeEnumNew( TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.tts TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.tts TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.tts - TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.poiType -> TYPE_SOCKET_ROAD_WRONG_DIRECTION_CAR.tts + TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.tts TYPE_USECASE_ROAD_BUS_STATION.poiType -> TYPE_USECASE_ROAD_BUS_STATION.tts else -> TYPE_ERROR.tts } diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_wrong_direction_car_driver.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_other_retrograde_vehicle_driver.png similarity index 100% rename from core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_wrong_direction_car_driver.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_other_retrograde_vehicle_driver.png diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_wrong_direction_car_passenger.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_other_retrograde_vehicle_passenger.png similarity index 100% rename from core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_wrong_direction_car_passenger.png rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_v2x_other_retrograde_vehicle_passenger.png