fixed conflict

2021-08-10 16:54:29 +08:00
parent 228413344f
commit 3d6661b603
3 changed files with 92 additions and 78 deletions
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enum/WarningTypeEnum.kt
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enum/WarningTypeEnum.kt
@@ -44,7 +44,7 @@ enum class WarningTypeEnum(
        ObuConstants.USE_CASE_ID.CLW,
        "车辆失控预警",
        "前车失控预警",
-        "前车失控预警",
+        "%s前车失控预警",
        R.drawable.icon_warning_v2x_vehicle_control
    ),
    TYPE_USECASE_ID_DNPW(
@@ -58,14 +58,14 @@ enum class WarningTypeEnum(
        ObuConstants.USE_CASE_ID.AVW,
        "异常车辆提醒",
        "前车异常",
-        "前车异常",
+        "%s前车辆异常",
        R.drawable.icon_warning_v2x_abnormal_vehicle
    ),
    TYPE_USECASE_ID_BSW(
        ObuConstants.USE_CASE_ID.BSW,
        "盲区预警",
        "盲区碰撞预警",
-        "",
+        "注意%s后车辆",
        R.drawable.icon_warning_v2x_blind_area_collision
    ),
    TYPE_USECASE_ID_LCW(