From dec0ce50095a1d16982e71fb4f751ff65d6c7645 Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Wed, 18 Sep 2024 11:06:55 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.2]=20default=20to=20send=20funsion=20mode?=
 =?UTF-8?q?=20to=202,=20=E7=9B=B2=E5=8C=BA=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt | 4 ++--
 .../mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt | 4 +++-
 2 files changed, 5 insertions(+), 3 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 fbb42ea0b2..f0a623775c 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,8 +137,8 @@ class MoGoAdasMsgConnectStatusListenerImpl :
                 }
                 //每次工控机连接成功后，需同步当前设置的雨天模式状态
                 CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode)
-                // 6.6.2 版本默认开启
-                CallerAutoPilotControlManager.sendFusionMode(1)
+                // 6.6.2 版本默认开启，与海江确认过，默认发盲区模式
+                CallerAutoPilotControlManager.sendFusionMode(2)
                 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 dbd0dfac7a..8d26abe38d 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
@@ -351,6 +351,7 @@ internal class SOPSettingView @JvmOverloads constructor(
             clickEventAnalytics("V2I场景进PNC",isChecked)
             hmiAction("SOP V2I场景进PNC, ", isChecked)
             FunctionBuildConfig.isFusionColor = isChecked //6.6.2版本基于运营需求-产品设计-v2i进pnc,感知目标颜色替换
+            FunctionBuildConfig.fusionMode = 2
             CallerHmiViewControlListenerManager.invokeFuncMode(FUNC_FUSION_COLOR,isChecked)
             CallerAutoPilotControlManager.sendV2iToPncCmd(isChecked)
             FunctionBuildConfig.v2iToPNC = isChecked
@@ -607,7 +608,8 @@ internal class SOPSettingView @JvmOverloads constructor(
             clickEventAnalytics("考试功能面板",isChecked)
         }
 
-        CallerAutoPilotControlManager.sendFusionMode(1)
+        // 6.6.2 与海江确认，默认发盲区模式
+        CallerAutoPilotControlManager.sendFusionMode(2)
         //融合模式
         rgFusionMode.setOnCheckedChangeListener { _, p1 ->
             when (p1) {