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

[6.6.2] default to send funsion mode to 2, 盲区模式

Browse Source
This commit is contained in:
EmArrow
2024-09-18 11:06:55 +08:00
parent ec6b4d6798
commit dec0ce5009
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
View File

@@ -137,8 +137,8 @@ class MoGoAdasMsgConnectStatusListenerImpl :
}
//每次工控机连接成功后，需同步当前设置的雨天模式状态
CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode)
// 6.6.2 版本默认开启
CallerAutoPilotControlManager.sendFusionMode(1)
// 6.6.2 版本默认开启，与海江确认过，默认发盲区模式
CallerAutoPilotControlManager.sendFusionMode(2)
connectToast("域控已连接")
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
View File

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