diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt index 114e993a37..0dbd45eb70 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt @@ -3,7 +3,6 @@ package com.mogo.eagle.core.function.hmi.ui.widget import android.content.Context import android.os.CountDownTimer import android.util.AttributeSet -import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout @@ -92,7 +91,6 @@ class ConnectionProcessView @JvmOverloads constructor( status: AdasConstants.IpcConnectionStatus, reason: String? ) { - Log.i(TAG,"onAutopilotIpcConnectStatusChanged status="+status.name) if(HmiBuildConfig.isShowConnectionProgressView){ if(status == AdasConstants.IpcConnectionStatus.CONNECTED){ //域控连接成功 @@ -133,15 +131,11 @@ class ConnectionProcessView @JvmOverloads constructor( * HQ、M1 MAP350开始弃用,其他车型MAP360开始弃用 */ override fun onAutopilotStatusRespByQuery(status: SystemStatusInfo.StatusInfo) { - Log.i(TAG,"onAutopilotStatusRespByQuery status autoPilotReady="+status.autoPilotReady) if(HmiBuildConfig.isShowConnectionProgressView){ - Log.i(TAG,"HmiBuildConfig.isShowConnectionProgressView="+HmiBuildConfig.isShowConnectionProgressView) if(status.autoPilotReady){ - Log.i(TAG,"status.autoPilotReady 为true 冷启动成功") //冷启动成功 autopilotReady() }else{ - Log.i(TAG,"status.autoPilotReady 为false") //SSM连接成功 connectSSMSuccess() } @@ -155,15 +149,11 @@ class ConnectionProcessView @JvmOverloads constructor( * @param statusInf 数据 */ override fun onSystemStatus(statusInf: SsmInfo.SsmStatusInf) { - Log.i(TAG,"onSystemStatus status autoPilotReady="+statusInf.autoPilotReady) if(HmiBuildConfig.isShowConnectionProgressView){ - Log.i(TAG,"HmiBuildConfig.isShowConnectionProgressView="+HmiBuildConfig.isShowConnectionProgressView) if(statusInf.autoPilotReady){ - Log.i(TAG,"status.autoPilotReady 为true 冷启动成功") //冷启动成功 autopilotReady() }else{ - Log.i(TAG,"status.autoPilotReady 为false") //SSM连接成功 connectSSMSuccess() } @@ -202,9 +192,7 @@ class ConnectionProcessView @JvmOverloads constructor( * 冷启动成功 */ private fun autopilotReady(){ - Log.i(TAG,"autopilotReady autopilotReadyStatus="+autopilotReadyStatus) if(!autopilotReadyStatus){ - Log.i(TAG,"展示冷启动成功View") showAutopilotReadySuccessView() //取消冷启动超时等待倒计时 autopilotReadyTimer?.cancel() @@ -263,7 +251,6 @@ class ConnectionProcessView @JvmOverloads constructor( * 展示域控连接失败视图 */ private fun showIPCConnectFailView(){ - Log.i(TAG,"展示域控连接失败视图showIPCConnectFailView") ThreadUtils.runOnUiThread { this.visibility = View.VISIBLE pbConnectionProgress.setPadding(0,0,0,0) @@ -281,7 +268,6 @@ class ConnectionProcessView @JvmOverloads constructor( * 展示SSM连接失败视图 */ private fun showSSMConnectFailView(){ - Log.i(TAG,"展示SSM连接失败视图showSSMConnectFailView") ThreadUtils.runOnUiThread { this.visibility = View.VISIBLE pbConnectionProgress.setPadding(0,0,0,0) @@ -318,7 +304,9 @@ class ConnectionProcessView @JvmOverloads constructor( private fun updateProcess(){ if(currentProcess < 100){ currentProcess++ - pbConnectionProgress.progress = currentProcess + if(pbConnectionProgress.progress < currentProcess){ + pbConnectionProgress.progress = currentProcess + } } } @@ -389,13 +377,10 @@ class ConnectionProcessView @JvmOverloads constructor( } override fun onFinish() { - Log.i(TAG,"冷启动过程 onFinish") if(CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ssmAutoPilotReady){ //冷启动成功 - Log.i(TAG,"onFinish 冷启动成功") autopilotReady() }else{ - Log.i(TAG,"onFinish 展示冷启动失败视图") //展示冷启动失败视图 showAutopilotReadyFailView() } @@ -409,7 +394,6 @@ class ConnectionProcessView @JvmOverloads constructor( * 域控断连一分钟倒计时 */ private fun disconnectCountDown(){ - Log.i(TAG,"域控断连一分钟倒计时") ThreadUtils.runOnUiThread { disconnectTimer = object: CountDownTimer(RECONNECTION_TIME,RECONNECTION_TIME){ override fun onTick(millisUntilFinished: Long) {