diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt index d09eeb6f81..d3e9c4ecbf 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt @@ -250,19 +250,19 @@ enum class WarningTypeEnum( ObuConstants.USE_CASE_ID.IVS -> TYPE_USECASE_ID_IVS ObuConstants.USE_CASE_ID.TJW -> TYPE_USECASE_ID_TJW ObuConstants.USE_CASE_ID.IVP -> TYPE_USECASE_ID_IVP - 0x2B091 -> TYPE_USECASE_ID_IVP_GREEN + TYPE_USECASE_ID_IVP_GREEN.useCaseId -> TYPE_USECASE_ID_IVP_GREEN ObuConstants.USE_CASE_ID.COC -> TYPE_USECASE_ID_COC - 0x2C01 -> TYPE_USECASE_ID_ROAD_TRAMCAR - 0x2C02 -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP - 0x2C03 -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP - 0x2C04 -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING - 0x2C05 -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL - 0x2C06 -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING - 0x2C07 -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG - 0x2C08 -> TYPE_USECASE_ID_ROAD_TEST_SECTION - 0x2C09 -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE - 0x2C0A -> TYPE_USECASE_ID_ROAD_NO_PARKING - 0x2C11 -> TYPE_USECASE_ID_ROAD_GIVE_WAY + TYPE_USECASE_ID_ROAD_TRAMCAR.useCaseId -> TYPE_USECASE_ID_ROAD_TRAMCAR + TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP + TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP + TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL + TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING + TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.useCaseId -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG + TYPE_USECASE_ID_ROAD_TEST_SECTION.useCaseId -> TYPE_USECASE_ID_ROAD_TEST_SECTION + TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE + TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId -> TYPE_USECASE_ID_ROAD_NO_PARKING + TYPE_USECASE_ID_ROAD_GIVE_WAY.useCaseId -> TYPE_USECASE_ID_ROAD_GIVE_WAY ObuConstants.USE_CASE_ID.ERROR -> TYPE_ERROR else -> TYPE_USECASE_ID_AVW } @@ -287,19 +287,19 @@ enum class WarningTypeEnum( ObuConstants.USE_CASE_ID.IVS -> TYPE_USECASE_ID_IVS.warningIconId ObuConstants.USE_CASE_ID.TJW -> TYPE_USECASE_ID_TJW.warningIconId ObuConstants.USE_CASE_ID.IVP -> TYPE_USECASE_ID_IVP.warningIconId - 0x2B091 -> TYPE_USECASE_ID_IVP_GREEN.warningIconId + TYPE_USECASE_ID_IVP_GREEN.useCaseId -> TYPE_USECASE_ID_IVP_GREEN.warningIconId ObuConstants.USE_CASE_ID.COC -> TYPE_USECASE_ID_COC.warningIconId - 0x2C01 -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningIconId - 0x2C02 -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningIconId - 0x2C03 -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningIconId - 0x2C04 -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningIconId - 0x2C05 -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningIconId - 0x2C06 -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningIconId - 0x2C07 -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningIconId - 0x2C08 -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningIconId - 0x2C09 -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningIconId - 0x2C0A -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningIconId - 0x2C11 -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningIconId + TYPE_USECASE_ID_ROAD_TRAMCAR.useCaseId -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningIconId + TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningIconId + TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningIconId + TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningIconId + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningIconId + TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningIconId + TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.useCaseId -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningIconId + TYPE_USECASE_ID_ROAD_TEST_SECTION.useCaseId -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningIconId + TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningIconId + TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningIconId + TYPE_USECASE_ID_ROAD_GIVE_WAY.useCaseId -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningIconId ObuConstants.USE_CASE_ID.ERROR -> TYPE_ERROR.warningIconId else -> TYPE_USECASE_ID_AVW.warningIconId } @@ -323,19 +323,19 @@ enum class WarningTypeEnum( ObuConstants.USE_CASE_ID.IVS -> TYPE_USECASE_ID_IVS.warningContent ObuConstants.USE_CASE_ID.TJW -> TYPE_USECASE_ID_TJW.warningContent ObuConstants.USE_CASE_ID.IVP -> TYPE_USECASE_ID_IVP.warningContent - 0x2B091 -> TYPE_USECASE_ID_IVP_GREEN.warningContent + TYPE_USECASE_ID_IVP_GREEN.useCaseId -> TYPE_USECASE_ID_IVP_GREEN.warningContent ObuConstants.USE_CASE_ID.COC -> TYPE_USECASE_ID_COC.warningContent - 0x2C01 -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningContent - 0x2C02 -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningContent - 0x2C03 -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningContent - 0x2C04 -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningContent - 0x2C05 -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningContent - 0x2C06 -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningContent - 0x2C07 -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningContent - 0x2C08 -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningContent - 0x2C09 -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningContent - 0x2C0A -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningContent - 0x2C11 -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningContent + TYPE_USECASE_ID_ROAD_TRAMCAR.useCaseId -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningContent + TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningContent + TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningContent + TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningContent + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningContent + TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningContent + TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.useCaseId -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningContent + TYPE_USECASE_ID_ROAD_TEST_SECTION.useCaseId -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningContent + TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningContent + TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningContent + TYPE_USECASE_ID_ROAD_GIVE_WAY.useCaseId -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningContent ObuConstants.USE_CASE_ID.ERROR -> TYPE_ERROR.warningContent else -> TYPE_USECASE_ID_AVW.warningContent } @@ -359,19 +359,19 @@ enum class WarningTypeEnum( ObuConstants.USE_CASE_ID.IVS -> TYPE_USECASE_ID_IVS.warningTts ObuConstants.USE_CASE_ID.TJW -> TYPE_USECASE_ID_TJW.warningTts ObuConstants.USE_CASE_ID.IVP -> TYPE_USECASE_ID_IVP.warningTts - 0x2B091 -> TYPE_USECASE_ID_IVP_GREEN.warningTts + TYPE_USECASE_ID_IVP_GREEN.useCaseId -> TYPE_USECASE_ID_IVP_GREEN.warningTts ObuConstants.USE_CASE_ID.COC -> TYPE_USECASE_ID_COC.warningTts - 0x2C01 -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningTts - 0x2C02 -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningTts - 0x2C03 -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningTts - 0x2C04 -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningTts - 0x2C05 -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningTts - 0x2C06 -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningTts - 0x2C07 -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningTts - 0x2C08 -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningTts - 0x2C09 -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningTts - 0x2C0A -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningTts - 0x2C11 -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningTts + TYPE_USECASE_ID_ROAD_TRAMCAR.useCaseId -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningTts + TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningTts + TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningTts + TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningTts + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningTts + TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningTts + TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.useCaseId -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningTts + TYPE_USECASE_ID_ROAD_TEST_SECTION.useCaseId -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningTts + TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningTts + TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningTts + TYPE_USECASE_ID_ROAD_GIVE_WAY.useCaseId -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningTts ObuConstants.USE_CASE_ID.ERROR -> TYPE_ERROR.warningTts else -> TYPE_USECASE_ID_AVW.warningTts } diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index b5d70bff15..d16556466f 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -135,10 +135,12 @@ class MogoPrivateObuManager private constructor() { // 特殊处理左、右方向的 when (direction) { 3 -> { - appId = 0x2C02 + appId = + WarningTypeEnum.TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId } 4 -> { - appId = 0x2C03 + appId = + WarningTypeEnum.TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId } } } @@ -152,7 +154,8 @@ class MogoPrivateObuManager private constructor() { } //事故 0xC -> { - appId = 0x2C06 + appId = + WarningTypeEnum.TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId } //拥堵 0xD -> { @@ -160,19 +163,21 @@ class MogoPrivateObuManager private constructor() { } //行人 0xF -> { - appId = 0x2C04 + appId = + WarningTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId } //禁止停车 0x13 -> { - appId = 0x2C10 + appId = WarningTypeEnum.TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId } //学校 0x14 -> { - appId = 0x2C05 + appId = + WarningTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId } //桥梁 0x17 -> { - appId = 0x2C09 + appId = WarningTypeEnum.TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId } } alertContent = WarningTypeEnum.getWarningContent(appId) @@ -463,13 +468,19 @@ class MogoPrivateObuManager private constructor() { "${currentLight.glosa_suggested_speed_min.toInt()}到${currentLight.glosa_suggested_speed_max.toInt()}" ttsContent = - String.format(WarningTypeEnum.getWarningTts(0x2B091), adviceSpeedTts) + String.format( + WarningTypeEnum.getWarningTts(WarningTypeEnum.TYPE_USECASE_ID_IVP_GREEN.useCaseId), + adviceSpeedTts + ) alertContent = - String.format(WarningTypeEnum.getWarningContent(0x2B091), adviceSpeed) + String.format( + WarningTypeEnum.getWarningContent(WarningTypeEnum.TYPE_USECASE_ID_IVP_GREEN.useCaseId), + adviceSpeed + ) mIMoGoWaringProvider!!.showWarningV2X( - 0x2B091, + WarningTypeEnum.TYPE_USECASE_ID_IVP_GREEN.useCaseId, alertContent, ttsContent, appId.toString() @@ -573,7 +584,7 @@ class MogoPrivateObuManager private constructor() { ObuConstants.STATUS.ADD -> { //显示警告红边 mMogoServiceApis!!.v2XListenerManager.warningChangedForListenerWithDirection( - direction, + direction, "ACTION_V2X_FRONT_WARNING" ) //显示弹框，语音提示