From f0a5adac29011ef6c5fec4af811def502428e074 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Thu, 12 Sep 2024 12:11:55 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.2]=20=E9=BB=98=E8=AE=A4=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=B7=A5=E6=8E=A7=E6=89=93=E5=BC=80=E5=85=A8=E8=9E=8D=E5=90=88?= =?UTF-8?q?=EF=BC=8Cv2i=E9=BB=98=E8=AE=A4=E5=BC=80=E5=90=AF=EF=BC=8Cv2i->p?= =?UTF-8?q?nc=E6=89=93=E5=BC=80fusion=E8=9E=8D=E5=90=88=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/MoGoAdasMsgConnectStatusListenerImpl.kt | 2 ++ .../eagle/core/function/hmi/ui/setting/SOPSettingView.kt | 2 ++ .../function/business/roadcross/RoadCrossCameraManager.kt | 3 --- .../com/mogo/eagle/core/function/view/RoadCrossRoamView.kt | 7 +++++-- .../java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 827b95f475..be3b0611bc 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -137,6 +137,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : } //每次工控机连接成功后，需同步当前设置的雨天模式状态 CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode) + // 6.6.2 版本默认开启 + CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode) connectToast("域控已连接") } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index b4646a4443..5807548bcc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -250,6 +250,7 @@ internal class SOPSettingView @JvmOverloads constructor( if (isChecked) { //V2I场景进PNC scV2iPnc.isChecked = FunctionBuildConfig.v2iToPNC + FunctionBuildConfig.isFusionColor = true //6.6.2版本基于运营需求-产品设计-开启v2i进pnc,开启感知目标颜色替换 hmiAction("SOP V2I场景进PNC, ", FunctionBuildConfig.v2iToPNC) CallerAutoPilotControlManager.sendV2iToPncCmd(FunctionBuildConfig.v2iToPNC) //闯红灯预警 @@ -265,6 +266,7 @@ internal class SOPSettingView @JvmOverloads constructor( } else { //V2I场景进PNC scV2iPnc.isChecked = false + FunctionBuildConfig.isFusionColor = false //6.6.2版本基于运营需求-产品设计-关闭v2i进pnc,关闭感知目标颜色替换 CallerAutoPilotControlManager.sendV2iToPncCmd(false) hmiAction("SOP V2I场景进PNC, ", false) //闯红灯预警 diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt index ff4eb251f4..007f9dc927 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt @@ -81,9 +81,6 @@ class RoadCrossCameraManager : IMoGoMapRoadListener { ) } - if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ - AIAssist.getInstance(mContext).speakTTSVoice("蘑菇检测到前方${distance.toInt()}米您将通过路口，已为您切换展示路口全息影像") - } if (roadCrossEnd != null) { ndeRoadCameraNetWorkModel.getRoadCrossInfo(roadCrossEnd, onSuccess = { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt index b684118d87..1dede72e9c 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt @@ -211,8 +211,11 @@ class RoadCrossRoamView @JvmOverloads constructor( //播放语音 val dis = CallerMapRoadListenerManager.getStopLineDistance()?.toInt() ?: 0 if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { - AIAssist.getInstance(context) - .speakTTSVoice("前方${dis}米将通过路口，蘑菇为您提供路口全息影像，助力出行") + var disStr = "前方即将通过路口，蘑菇为您提供路口全息影像，助力出行" + if(dis >= 80){ + disStr = "前方${dis}米将通过路口，蘑菇为您提供路口全息影像，助力出行" + } + AIAssist.getInstance(context).speakTTSVoice(disStr) } CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG) bringToFront() diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt index 75b890726b..30abf04f9c 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt @@ -70,6 +70,7 @@ object HmiBuildConfig { /** * 是否展示obu的v2i + * //6.6.2版本根据运营需求-产品设计默认开启 */ @JvmField @Volatile