From 0153bf59ba266b0b1b35cad48bd7883234b448d0 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 18 Dec 2023 15:04:02 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6]=E8=B0=83=E6=95=B4=E5=B9=B3=E8=A1=8C?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E5=9B=9E=E8=B0=83=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/vehicle/TakeOverView.kt | 12 ++++++---- .../eagle/core/data/enums/EventTypeEnumNew.kt | 24 +++++++++---------- 2 files changed, 20 insertions(+), 16 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 adfc3f1438..b364ff36fb 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 @@ -189,7 +189,8 @@ class TakeOverView @JvmOverloads constructor( } //无法接管 "UNABLE_TAKEOVER"->{ - if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ + if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) + || AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.poiType, EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.content,EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.tts) }else{ @@ -199,7 +200,8 @@ class TakeOverView @JvmOverloads constructor( } //同步异常结束 "EXCEPTION_EXIT_SYNC"->{ - if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ + if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) + || AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.poiType, EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.content, EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.tts) }else{ @@ -213,7 +215,8 @@ class TakeOverView @JvmOverloads constructor( } //异常请人工驾驶 "PARALLEL_EXCEPTION_MANUAL_DRIVING"->{ - if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ + if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) + || AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.poiType, EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.content,EventTypeEnumNew.TYPE_PARALLEL_EXCEPTION_MANUAL_DRIVING.tts) }else{ @@ -223,7 +226,8 @@ class TakeOverView @JvmOverloads constructor( } //平行驾驶异常结束 "EXCEPTION_EXIT_PARALLEL_DRIVING"->{ - if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ + if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) + || AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.poiType, EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.content,EventTypeEnumNew.TYPE_EXCEPTION_EXIT_PARALLEL_DRIVING.tts) }else{ 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 1b75421eb7..2045cba883 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 @@ -516,37 +516,37 @@ enum class EventTypeEnumNew( TYPE_UNABLE_TAKEOVER( "UNABLE_TAKEOVER", "平行驾驶无法接管", - "远程无法介入，注意随时接管", + "远程无法介入，注意随时接管!可尝试重启app", R.drawable.icon_warning_take_over, - "远程无法介入，注意随时接管", - "远程无法介入，注意随时接管" + "远程无法介入，注意随时接管!可尝试重启app", + "远程无法介入，注意随时接管!可尝试重启app" ), //同步异常结束 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车辆优先通行，已为您变为绿灯"),