From 6f70b0130b3a271af48a606718e730602c77054f Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 18 Feb 2022 17:10:33 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20DebugSettingView.kt=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=BC=94=E7=A4=BA=E6=A8=A1=E5=BC=8F=E4=B8=8E=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE=E5=BF=BD=E7=95=A5=20=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=BD=93=E5=89=8Dapp=E7=BD=91=E7=BB=9C=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E7=BB=99=E5=B7=A5=E6=8E=A7=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../adapter/MoGoAdasMsgConnectStatusListenerImpl.kt | 6 ++++++ .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 c365e23c55..91731111c7 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 @@ -1,8 +1,11 @@ package com.mogo.eagle.core.function.autopilot.adapter import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.debug.DebugConfig +import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo +import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.autopilot.network.AdasServiceModel import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -78,7 +81,10 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasMsgConnectStatusListener, IMo private fun syncBasicInfoToAutopilot() { Logger.d(TAG, "同步PAD的SN给工控机……") val info = BasicInfo() + // 设置PAD-SN给工控 info.setSn(MoGoAiCloudClientConfig.getInstance().sn) + // 设置网络环境 + info.setNetEnvironment(DebugConfig.getNetMode()) AdasManager.getInstance().setBasicInfo(info) } 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 7556670591..b99e6b1030 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 @@ -299,7 +299,7 @@ class DebugSettingView @JvmOverloads constructor( CallerAutoPilotManager.setDemoMode(isChecked) FunctionBuildConfig.isDemoMode = isChecked if (!FunctionBuildConfig.isDemoMode) { - FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false + cbIsDrawAutopilotTrajectoryData.isChecked = false } SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked) }