213 pm修改需求 去掉个别标牌

This commit is contained in:
lixiaopeng
2022-11-23 10:30:58 +08:00
parent 60974e33a5
commit 96268d37cb
2 changed files with 27 additions and 27 deletions

View File

@@ -284,9 +284,9 @@ class MogoPrivateObuNewManager private constructor() {
//车内标牌
V2iEventTypeEnum.TYPE_USECASE_ID_IVS.poiType -> {
when (data.warningMsg[0].eventSerialNum) {
MogoObuConstants.RTS.RTI_TYPE_INTERSECTION -> { //十字路口
appId = V2iEventTypeEnum.TYPE_ID_NTERSECTION.poiType
}
// MogoObuConstants.RTS.RTI_TYPE_INTERSECTION -> { //十字路口
// appId = V2iEventTypeEnum.TYPE_ID_NTERSECTION.poiType
// }
MogoObuConstants.RTS.RTI_TYPE_SHAPR_TURNS -> { //急转弯
appId = V2iEventTypeEnum.TYPE_ID_SHAPR_TURNS.poiType
}
@@ -335,10 +335,10 @@ class MogoPrivateObuNewManager private constructor() {
MogoObuConstants.RTS.RTI_TYPE_SPEED_LIMIT -> { //限速
appId = V2iEventTypeEnum.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType
}
MogoObuConstants.RTS.RTI_TYPE_GO_STRAIGHT_TURN_RIGHT -> { //直行或右转
appId =
V2iEventTypeEnum.TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType
}
// MogoObuConstants.RTS.RTI_TYPE_GO_STRAIGHT_TURN_RIGHT -> { //直行或右转
// appId =
// V2iEventTypeEnum.TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType
// }
MogoObuConstants.RTS.RTI_TYPE_BUS_WARNING -> { //公交提醒
appId = V2iEventTypeEnum.TYPE_USECASE_ID_BUS_WARNING.poiType
}

View File

@@ -58,13 +58,13 @@ enum class V2iEventTypeEnum(
//------------道路危险情况预警 end ----------->
//------------车内标牌 start -------------->
TYPE_ID_NTERSECTION(
1.toString(),
"十字路口",
poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
content = "前方%s米十字路口影响路段%s米",
tts = "前方%s米十字路口影响路段%s米"
),
// TYPE_ID_NTERSECTION(
// 1.toString(),
// "十字路口",
// poiTypeSrcVr = R.drawable.icon_warning_v2x_tramcar,
// content = "前方%s米十字路口影响路段%s米",
// tts = "前方%s米十字路口影响路段%s米"
// ),
TYPE_ID_SHAPR_TURNS(
2.toString(),
"急转弯",
@@ -177,13 +177,13 @@ enum class V2iEventTypeEnum(
content = "前方%s米限速影响路段%s米",
tts = "前方%s米限速影响路段%s米"
),
TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT(
100.toString(),
"直行或右转",
poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
content = "前方%s米直行或右转影响路段%s米",
tts = "前方%s米直行或右转影响路段%s米"
),
// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT(
// 100.toString(),
// "直行或右转",
// poiTypeSrcVr = R.drawable.icon_warning_v2x_no_parking,
// content = "前方%s米直行或右转影响路段%s米",
// tts = "前方%s米直行或右转影响路段%s米"
// ),
TYPE_USECASE_ID_BUS_WARNING(
123.toString(),
"公交提醒",
@@ -303,7 +303,7 @@ enum class V2iEventTypeEnum(
FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeSrcVr
TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.poiTypeSrcVr
TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiTypeSrcVr
TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.poiTypeSrcVr
// TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.poiTypeSrcVr
TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.poiTypeSrcVr
TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.poiTypeSrcVr
TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.poiTypeSrcVr
@@ -320,7 +320,7 @@ enum class V2iEventTypeEnum(
TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr
TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.poiTypeSrcVr
TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiTypeSrcVr
TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiTypeSrcVr
// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiTypeSrcVr
TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.poiTypeSrcVr
TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.poiTypeSrcVr
TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.poiTypeSrcVr
@@ -349,7 +349,7 @@ enum class V2iEventTypeEnum(
FOURS_PONDING.poiType -> FOURS_PONDING.content
TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.content
TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.content
TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.content
// TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.content
TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.content
TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.content
TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.content
@@ -366,7 +366,7 @@ enum class V2iEventTypeEnum(
TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content
TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.content
TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.content
TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.content
// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.content
TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.content
TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.content
TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.content
@@ -396,7 +396,7 @@ enum class V2iEventTypeEnum(
FOURS_PONDING.poiType -> FOURS_PONDING.tts
TYPE_USECASE_ID_ROAD_PARKING.poiType -> TYPE_USECASE_ID_ROAD_PARKING.tts
TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType -> TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.tts
TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.tts
// TYPE_ID_NTERSECTION.poiType -> TYPE_ID_NTERSECTION.tts
TYPE_ID_SHAPR_TURNS.poiType -> TYPE_ID_SHAPR_TURNS.tts
TYPE_ID_BRIDGE.poiType -> TYPE_ID_BRIDGE.tts
TYPE_ID_PEDESTRIAN.poiType -> TYPE_ID_PEDESTRIAN.tts
@@ -413,7 +413,7 @@ enum class V2iEventTypeEnum(
TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts
TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.tts
TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.tts
TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.tts
// TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.poiType -> TYPE_USECASE_ID_GO_STRAIGHT_TURN_RIGHT.tts
TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.tts
TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.tts
TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.tts