[6.4.4]调整连接异常后逻辑,连接异常之后如再次连接正常则显示正常视图
This commit is contained in:
@@ -106,6 +106,10 @@ class ConnectionProcessView @JvmOverloads constructor(
|
||||
isDisconnectTimeout = false
|
||||
disconnectTimer?.cancel()
|
||||
disconnectTimer = null
|
||||
//如果之前IPC连接状态为未连接且当前显示异常状态,则改为显示域控连接成功状态
|
||||
if(!ipcConnectStatus && clConnectionTip.visibility == View.VISIBLE){
|
||||
connectIPCSuccess()
|
||||
}
|
||||
}else{
|
||||
//域控连接失败
|
||||
if(ipcConnectStatus && disconnectTimer == null && !isDisconnectTimeout){
|
||||
@@ -132,7 +136,7 @@ class ConnectionProcessView @JvmOverloads constructor(
|
||||
*/
|
||||
override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) {
|
||||
if(HmiBuildConfig.isShowConnectionProgressView){
|
||||
if(status.autoPilotReady){
|
||||
if(status.hasAutoPilotReady() && status.autoPilotReady){
|
||||
//冷启动成功
|
||||
autopilotReady()
|
||||
}else{
|
||||
@@ -150,7 +154,7 @@ class ConnectionProcessView @JvmOverloads constructor(
|
||||
*/
|
||||
override fun onSystemStatus(statusInf: SsmInfo.SsmStatusInf) {
|
||||
if(HmiBuildConfig.isShowConnectionProgressView){
|
||||
if(statusInf.autoPilotReady){
|
||||
if(statusInf.hasAutoPilotReady() && statusInf.autoPilotReady){
|
||||
//冷启动成功
|
||||
autopilotReady()
|
||||
}else{
|
||||
@@ -167,6 +171,7 @@ class ConnectionProcessView @JvmOverloads constructor(
|
||||
if(!ipcConnectStatus){
|
||||
showIPCConnectSuccessView()
|
||||
//开始连接SSM超时等待倒计时
|
||||
currentProcess = 25
|
||||
connectSSMProcess()
|
||||
}
|
||||
ipcConnectStatus = true
|
||||
@@ -182,6 +187,7 @@ class ConnectionProcessView @JvmOverloads constructor(
|
||||
//取消连接SSM超时等待倒计时
|
||||
connectSSMTimer?.cancel()
|
||||
//开始启动冷启动等待倒计时
|
||||
currentProcess = 50
|
||||
autopilotReadyProcess()
|
||||
}
|
||||
ssmConnectStatus = true
|
||||
@@ -357,6 +363,8 @@ class ConnectionProcessView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
override fun onFinish() {
|
||||
//将SSM连接状态置为false
|
||||
ssmConnectStatus = false
|
||||
//展示连接SSM失败视图
|
||||
showSSMConnectFailView()
|
||||
}
|
||||
@@ -377,6 +385,8 @@ class ConnectionProcessView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
override fun onFinish() {
|
||||
//将冷启动状态置为false
|
||||
autopilotReadyStatus = false
|
||||
if(CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ssmAutoPilotReady){
|
||||
//冷启动成功
|
||||
autopilotReady()
|
||||
|
||||
Reference in New Issue
Block a user