From 97df0bda1e8e2baf5bc3f4908f347c76af55a8ba Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Wed, 13 Jul 2022 19:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96=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 ++++ .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index cc1686d7f7..9dc73116b5 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -54,6 +54,10 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, updateDriveStatusTask() //每次工控机连接成功后,需同步当前设置的美化模式状态 CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode) + //当连接状态是关闭美化模式时,同步给工控机 + if(!FunctionBuildConfig.isDemoMode){ + CallerAutoPilotManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode) + } //每次工控机连接成功后,需同步当前设置的雨天模式状态 CallerAutoPilotManager.setRainMode(FunctionBuildConfig.isRainMode) } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.DISCONNECTED) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index e2290c14e2..da810664a1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -541,6 +541,10 @@ class DebugSettingView @JvmOverloads constructor( // 演示模式 tbIsDemoMode.setOnCheckedChangeListener { _, isChecked -> CallerAutoPilotManager.setDemoMode(isChecked) + if(!isChecked){ + //关闭美化模式时,通知工控机 + CallerAutoPilotManager.setIPCDemoMode(isChecked) + } FunctionBuildConfig.isDemoMode = isChecked tbIsDrawAutopilotTrajectoryData.isEnabled = !isChecked FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = isChecked