From 6a0c49392f99c869a63d97cf4537bb6d849b8dce Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 19 Dec 2023 18:05:15 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6]=E8=B0=83=E6=95=B4C1=E5=B9=B3=E8=A1=8C?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E6=8E=A5=E7=AE=A1=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/vehicle/TakeOverView.kt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 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 d893406150..2b7366305f 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,8 +189,7 @@ class TakeOverView @JvmOverloads constructor( } //无法接管 "UNABLE_TAKEOVER"->{ - if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) - || AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ + if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.poiType, EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.content,EventTypeEnumNew.TYPE_UNABLE_TAKEOVER.tts) }else{ @@ -200,8 +199,7 @@ class TakeOverView @JvmOverloads constructor( } //同步异常结束 "EXCEPTION_EXIT_SYNC"->{ - if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) - || AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ + if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ showM1ParallelDrivingWarning(EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.poiType, EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.content, EventTypeEnumNew.TYPE_EXCEPTION_EXIT_SYNC.tts) }else{ @@ -215,8 +213,7 @@ class TakeOverView @JvmOverloads constructor( } //异常请人工驾驶 "PARALLEL_EXCEPTION_MANUAL_DRIVING"->{ - if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) - || AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ + if(AppIdentityModeUtils.isM1(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{ @@ -226,8 +223,7 @@ class TakeOverView @JvmOverloads constructor( } //平行驾驶异常结束 "EXCEPTION_EXIT_PARALLEL_DRIVING"->{ - if(AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) - || AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ + if(AppIdentityModeUtils.isM1(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{ @@ -240,7 +236,7 @@ class TakeOverView @JvmOverloads constructor( } /** - * M1、C1平行驾驶异常提示 + * M1平行驾驶异常提示 */ private fun showM1ParallelDrivingWarning(poiType: String,content: String,tts: String){ //异常提醒均在开启美化模式后不弹出、不语音提示