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

[6.3.0]修复雨天模式连接域控Taxi3.2.0及以上版本显示问题

Browse Source
This commit is contained in:
xuxinchao
2024-03-11 16:25:34 +08:00
parent aaae166d72
commit a62f126b6a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
View File

@@ -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
}
}

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

@@ -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()
}