From 6ef982d27077cac4b0af004e59605481c514504c Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 23 Oct 2024 15:55:06 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E5=86=B7=E5=90=AF=E5=8A=A8=E5=8F=AA=E5=9C=A8=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E5=B1=8F=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coldstart/ColdStartManager.kt | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartManager.kt index 72810d66b4..1b309fd59d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartManager.kt @@ -2,12 +2,14 @@ package com.zhjt.mogo_core_function_devatools.coldstart import android.content.Context import android.util.Log +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizListener import com.mogo.eagle.core.function.api.och.IOchFunctionCallNotify import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String import com.zhjt.mogo.adas.data.AdasConstants @@ -44,23 +46,26 @@ object ColdStartManager: IMoGoAutopilotStatusListener, IDataCenterBizListener { status: AdasConstants.IpcConnectionStatus, reason: String? ){ - //域控连接异常 - if(status != AdasConstants.IpcConnectionStatus.CONNECTED){ - //当前进入主页方式为立即用车，则在主页面不再展示冷启动页面 - if(isColdStartNow && !isColdStartSuccess){ - return - } - if(isColdStartNow && ColdStartConfig.getColdStartNowTime() > ColdStartConfig.getColdStartSuccessTime()){ - return - } - //已登录且距离上次冷启动成功超过1分钟，再次展示冷启动页面 - if(!ColdStartConfig.getShowWindowStatus() && loginStatus && System.currentTimeMillis().minus(ColdStartConfig.getColdStartSuccessTime())>60000){ - if(System.currentTimeMillis().minus(ipcConnectedTime) > 60000){ - CallerHmiManager.showColdStartWindow() + //冷启动只上司机屏 + if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + //域控连接异常 + if(status != AdasConstants.IpcConnectionStatus.CONNECTED){ + //当前进入主页方式为立即用车，则在主页面不再展示冷启动页面 + if(isColdStartNow && !isColdStartSuccess){ + return } + if(isColdStartNow && ColdStartConfig.getColdStartNowTime() > ColdStartConfig.getColdStartSuccessTime()){ + return + } + //已登录且距离上次冷启动成功超过1分钟，再次展示冷启动页面 + if(!ColdStartConfig.getShowWindowStatus() && loginStatus && System.currentTimeMillis().minus(ColdStartConfig.getColdStartSuccessTime())>60000){ + if(System.currentTimeMillis().minus(ipcConnectedTime) > 60000){ + CallerHmiManager.showColdStartWindow() + } + } + }else{ + ipcConnectedTime = System.currentTimeMillis() } - }else{ - ipcConnectedTime = System.currentTimeMillis() } }