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 70e54a5877..ea96c1ae3e 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 @@ -24,6 +24,7 @@ import com.mogo.eagle.core.data.biz.trafficlight.toTrafficLightDetail 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.map.collect.IMoGoMapDataCollectProvider +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasListenerImpl import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl import com.mogo.eagle.core.function.datacenter.autopilot.server.AsyncDataToAutopilotServer @@ -54,6 +55,7 @@ import com.zhidao.support.adas.high.common.Constants import com.zhidao.support.adas.high.common.Constants.IPC_CONNECTION_STATUS import com.zhidao.support.adas.high.common.CupidLogUtils import com.zhidao.support.adas.high.common.MessageType +import com.zhidao.support.adas.high.common.autopilot.ability.AutopilotAbilityManager import com.zhjt.mogo.adas.data.bean.MogoReport import com.zhjt.service.chain.ChainLog import com.zhjt.service.chain.TracingConstants @@ -216,8 +218,6 @@ class MoGoAutopilotControlProvider : CallerLogger.i("$M_ADAS_IMPL$TAG", "initServer……") // 同步数据给工控机的服务 AsyncDataToAutopilotServer.INSTANCE.initServer() - // 同步是否开启雨天模式 - setRainMode(FunctionBuildConfig.isRainMode) } private fun directConnect() { @@ -803,6 +803,18 @@ class MoGoAutopilotControlProvider : CallerDevaToolsManager.getBindingCarInfo( carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn) invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为:${carConfigResp.macAddress}") } + + if(carConfigResp.dockVersion.isNotEmpty()){ + if(carConfigResp.dockVersion.contains("taxi")){ + //修改雨天模式开关默认状态为开启(仅针对taxi320及以上的版本)-sop 215 + val num = AutopilotAbilityManager.getInstance().parseVersion(true,carConfigResp.dockVersion) + if(num >= 320){ + FunctionBuildConfig.isRainMode = true + } + } + //每次工控机连接成功后,需同步当前设置的雨天模式状态 + setRainMode(FunctionBuildConfig.isRainMode) + } } @ChainLog( diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index 54de5f1730..6bd9988f4c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -21,7 +21,6 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.* @@ -206,7 +205,7 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis }) passiveBadCaseWindow.showFloatWindow() if (countdown) { - val countDownTimer = object : CountDownTimer(10000, 1000) { + val countDownTimer = object : CountDownTimer(10000, 10000) { override fun onTick(p0: Long) { }