yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.1.0]平行驾驶状态回调异常接管消息盒子标题和图标调整

Browse Source
This commit is contained in:
xuxinchao
2023-10-10 18:47:24 +08:00
parent 52aa46cda8
commit ab04465794
2 changed files with 86 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt
View File

@@ -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)
}
}
}

70
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
View File

@@ -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