Merge branch 'dev_robotaxi-d_241112_6.8.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_241112_6.8.0

This commit is contained in:
xinfengkun
2024-11-22 19:32:20 +08:00

View File

@@ -77,8 +77,6 @@ class ColdStartProcessView @JvmOverloads constructor(
}
private fun initView(){
coldStartProcessNormalAnim = FrameAnimatorContainerUtils(R.array.cold_start_process_normal,40,ivColdStartProcess)
coldStartProcessAbnormalAnim = FrameAnimatorContainerUtils(R.array.cold_start_process_abnormal,40,ivColdStartProcess)
transition = TransitionDrawable(
arrayOf(
@@ -116,6 +114,8 @@ class ColdStartProcessView @JvmOverloads constructor(
ThreadUtils.runOnUiThread {
if(this.visibility != View.VISIBLE){
this.visibility = View.VISIBLE
coldStartProcessNormalAnim = FrameAnimatorContainerUtils(R.array.cold_start_process_normal,40,ivColdStartProcess)
coldStartProcessAbnormalAnim = FrameAnimatorContainerUtils(R.array.cold_start_process_abnormal,40,ivColdStartProcess)
}
}
}
@@ -127,16 +127,16 @@ class ColdStartProcessView @JvmOverloads constructor(
status: AdasConstants.IpcConnectionStatus,
reason: String?
) {
if(status == AdasConstants.IpcConnectionStatus.CONNECTED){
ipcConnectStatus = if(status == AdasConstants.IpcConnectionStatus.CONNECTED){
//域控连接成功
coldStartNormalView()
//开启连接SSM倒计时
connectSSMProcess()
ipcConnectStatus = true
true
}else{
//域控连接失败
coldStartAbnormalView()
ipcConnectStatus = false
false
}
}