diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 52faf45bb8..aaf4dbac60 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -161,15 +161,18 @@ class SystemVersionView @JvmOverloads constructor( it.setProgress(AdUpgradeStateHelper.downloadProgress(currentProgress,totalProgress)) } }else if(AdUpgradeStateHelper.isDownloadFinish(downloadStatus,upgradeStatus)){ - //下载完成,处于可升级状态,展示“可升级”角标,将AD背景变为蓝色,并隐藏下载进度条 - ivAdStatus?.setImageResource(R.drawable.icon_upgradeable) - ivAdVersion?.setBackgroundResource(R.drawable.version_upgradeable_background) - adCircularProgressView?.visibility = View.GONE - if(AdUpgradeStateHelper.isQuietUpgradeMode(upgradeMode)){ - //如果升级模式为“静默升级”,则下载完成后,调用升级命令进行升级 - CallerAutoPilotManager.setIPCUpgradeAffirm() - AdUpgradeStateHelper.setUpgradeStatus(true) + //下载完成,处于可升级状态,展示“可升级”角标,将AD背景变为蓝色,并隐藏下载进度条(当状态为“升级中”时,不进行设置(存在升级命令已下发,但工控机未立即升级现象)) + if(!AdUpgradeStateHelper.getUpgradeStatus()){ + ivAdStatus?.setImageResource(R.drawable.icon_upgradeable) + ivAdVersion?.setBackgroundResource(R.drawable.version_upgradeable_background) + adCircularProgressView?.visibility = View.GONE + if(AdUpgradeStateHelper.isQuietUpgradeMode(upgradeMode)){ + //如果升级模式为“静默升级”,则下载完成后,调用升级命令进行升级 + CallerAutoPilotManager.setIPCUpgradeAffirm() + AdUpgradeStateHelper.setUpgradeStatus(true) + } } + }else if(AdUpgradeStateHelper.isDownloadFailed(downloadStatus)){ //下载失败,将状态设为“最新版”角标,并隐藏进度条 ivAdStatus?.setImageResource(R.drawable.icon_latest_version) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml index 8ed352878a..a3c3f0e935 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml @@ -108,13 +108,15 @@