diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index ba087b5ba7..fb5258738e 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -27,9 +27,11 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_SO import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_STATUS import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotControlProvider +import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.FUNC_MODE_RAIN import com.mogo.eagle.core.function.api.map.collect.IMoGoMapDataCollectProvider import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicStatusListenerManager import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasListenerImpl @@ -92,6 +94,8 @@ class MoGoAutopilotControlProvider : @Volatile private var isInit = false + @Volatile + private var isRainModeInit = false override val functionName: String get() = TAG @@ -1000,7 +1004,7 @@ class MoGoAutopilotControlProvider : invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为:${carConfigResp.macAddress}") } - if (carConfigResp.dockVersion.isNotEmpty()) { + if (carConfigResp.dockVersion.isNotEmpty() && !isRainModeInit) { if (carConfigResp.dockVersion.toLowerCase(Locale.getDefault()).contains("taxi")) { //修改雨天模式开关默认状态为开启(仅针对taxi320及以上的版本)-sop 215 val num = ParseVersionUtils.parseVersion(true, carConfigResp.dockVersion) @@ -1008,8 +1012,11 @@ class MoGoAutopilotControlProvider : FunctionBuildConfig.isRainMode = true } } + //将雨天模式显示状态同步给UI展示 + CallerHmiViewControlListenerManager.invokeFuncMode(FUNC_MODE_RAIN, FunctionBuildConfig.isRainMode) //每次工控机连接成功后,需同步当前设置的雨天模式状态 setRainMode(FunctionBuildConfig.isRainMode) + isRainModeInit = true } } 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 ca5e052b96..8309c7f478 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 @@ -254,7 +254,7 @@ internal class DebugSettingView @JvmOverloads constructor( // 开启定时查询速度 isRunCheck = true Timer().schedule(timerTaskRefresh, Date(), 500) - if (AppConfigInfo.isConnectAutopilot && (AppConfigInfo.plateNumber.isNullOrEmpty() || AppConfigInfo.iPCMacAddress.isNullOrEmpty())) { + if (AppConfigInfo.isConnectAutopilot && (AppConfigInfo.plateNumber.isEmpty() || AppConfigInfo.iPCMacAddress.isEmpty())) { //查询工控机基础配置信息 CallerAutoPilotControlManager.getCarConfig() }