From ab04465794182acac6c6587755e30b65d3722551 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 10 Oct 2023 18:47:24 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0]=E5=B9=B3=E8=A1=8C=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=9B=9E=E8=B0=83=E5=BC=82=E5=B8=B8=E6=8E=A5?= =?UTF-8?q?=E7=AE=A1=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=92=8C=E5=9B=BE=E6=A0=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/vehicle/TakeOverView.kt | 24 ++++--- .../eagle/core/data/enums/EventTypeEnumNew.kt | 70 +++++++++++++++++++ 2 files changed, 86 insertions(+), 8 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt index 88abe4e5e8..a63be4c512 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt @@ -192,17 +192,21 @@ class TakeOverView @JvmOverloads constructor( //无法接管 "UNABLE_TAKEOVER"->{ if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ - showM1ParallelDrivingWarning("UNABLE_TAKEOVER","远程无法介入，注意随时接管","远程无法介入，注意随时接管") + showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.poiType, + EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.content,EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.tts) }else{ - showParallelDrivingWarning("UNABLE_TAKEOVER","远程无法介入，注意随时接管","远程无法介入，注意随时接管") + showParallelDrivingWarning(EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.poiType, + EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.content,EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.tts) } } //同步异常结束 "EXCEPTION_EXIT_SYNC"->{ if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ - showM1ParallelDrivingWarning("EXCEPTION_EXIT_SYNC","远程介入失败，注意随时接管", "远程介入失败，注意随时接管") + showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.poiType, + EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.content, EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.tts) }else{ - showParallelDrivingWarning("EXCEPTION_EXIT_SYNC","远程介入失败，注意随时接管", "远程介入失败，注意随时接管") + showParallelDrivingWarning(EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.poiType, + EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.content, EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.tts) } } //任务已被拒绝 @@ -212,17 +216,21 @@ class TakeOverView @JvmOverloads constructor( //异常请人工驾驶 "PARALLEL_EXCEPTION_MANUAL_DRIVING"->{ if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ - showM1ParallelDrivingWarning("PARALLEL_EXCEPTION_MANUAL_DRIVING","即将靠边停车，注意随时接管","即将靠边停车，注意随时接管") + showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.poiType, + EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.content,EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.tts) }else{ - showParallelDrivingWarning("PARALLEL_EXCEPTION_MANUAL_DRIVING","即将靠边停车，注意随时接管","即将靠边停车，注意随时接管") + showParallelDrivingWarning(EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.poiType, + EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.content,EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.tts) } } //平行驾驶异常结束 "EXCEPTION_EXIT_PARALLEL_DRIVING"->{ if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ - showM1ParallelDrivingWarning("EXCEPTION_EXIT_PARALLEL_DRIVING","可能应急停车，注意随时接管","可能应急停车，注意随时接管") + showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.poiType, + EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.content,EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.tts) }else{ - showParallelDrivingWarning("EXCEPTION_EXIT_PARALLEL_DRIVING","可能应急停车，注意随时接管","可能应急停车，注意随时接管") + showParallelDrivingWarning(EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.poiType, + EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.content,EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.tts) } } } 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 b75b52388f..4c993d936a 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,6 +511,44 @@ enum class EventTypeEnumNew( tts = "" ), + //平行驾驶状态异常状态 + //无法接管 + TYPE_UNABLE_TAKEOVER( + "UNABLE_TAKEOVER", + "平行驾驶无法接管", + "远程无法介入，注意随时接管", + R.drawable.icon_warning_take_over, + "远程无法介入，注意随时接管", + "远程无法介入，注意随时接管" + ), + //同步异常结束 + TYPE_EXCEPTION_EXIT_SYNC( + "EXCEPTION_EXIT_SYNC", + "同步异常结束", + "远程介入失败，注意随时接管", + R.drawable.icon_warning_take_over, + "远程介入失败，注意随时接管", + "远程介入失败，注意随时接管" + ), + //异常请人工驾驶 + TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING( + "PARALLEL_EXCEPTION_MANUAL_DRIVING", + "异常请人工驾驶", + "即将靠边停车，注意随时接管", + R.drawable.icon_warning_take_over, + "即将靠边停车，注意随时接管", + "即将靠边停车，注意随时接管" + ), + //平行驾驶异常结束 + TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING( + "EXCEPTION_EXIT_PARALLEL_DRIVING", + "平行驾驶异常结束", + "可能应急停车，注意随时接管", + R.drawable.icon_warning_take_over, + "可能应急停车，注意随时接管", + "可能应急停车，注意随时接管" + ), + TYPE_VIP_IDENTIFICATION_PASS("20022", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您变为绿灯", "VIP车辆优先通行，已为您变为绿灯"), TYPE_VIP_IDENTIFICATION_EXTEND("20023", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行，已为您延长绿灯", "VIP车辆优先通行，已为您延长绿灯"), TYPE_VIP_ERROR_IDENTIFICATION("20024", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "请求失败，", "请求失败,稍后重试"), @@ -828,6 +866,22 @@ enum class EventTypeEnumNew( NETWORK_WEAK_EVENT.poiType ->{ NETWORK_WEAK_EVENT.poiTypeStr } + //平行驾驶无法接管 + TYPE_UNABLE_TAKEOVER.poiType->{ + TYPE_UNABLE_TAKEOVER.poiTypeStr + } + //平行驾驶同步异常结束 + TYPE_EXCEPTION_EXIT_SYNC.poiType->{ + TYPE_EXCEPTION_EXIT_SYNC.poiTypeStr + } + //平行驾驶异常请人工驾驶 + TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.poiType->{ + TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.poiTypeStr + } + //平行驾驶异常结束 + TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.poiType->{ + TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.poiTypeStr + } //机动车 TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType ->{ TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiTypeStr @@ -1127,6 +1181,22 @@ enum class EventTypeEnumNew( NETWORK_WEAK_EVENT.poiType -> { R.drawable.icon_warning_take_over } + //平行驾驶无法接管 + TYPE_UNABLE_TAKEOVER.poiType->{ + R.drawable.icon_warning_take_over + } + //平行驾驶同步异常结束 + TYPE_EXCEPTION_EXIT_SYNC.poiType->{ + R.drawable.icon_warning_take_over + } + //异常请人工驾驶 + TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.poiType->{ + R.drawable.icon_warning_take_over + } + //平行驾驶异常结束 + TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.poiType->{ + R.drawable.icon_warning_take_over + } //机动车 TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> { R.drawable.icon_warning_v2x_motorcycle_collision