From c0451f5f7a6eb1a642ed88396723b24af0a982d3 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Mon, 28 Feb 2022 14:24:25 +0800 Subject: [PATCH] upgrade fix bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、确认升级时，将角标设为“升级中”状态 2、优先判断“升级中”状态 --- .../function/hmi/ui/widget/SystemVersionView.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 cab7baf628..52faf45bb8 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 @@ -71,6 +71,12 @@ class SystemVersionView @JvmOverloads constructor( if(AdUpgradeStateHelper.isDownloading(downloadStatus)){ //点击Toast提示：下载剩余时间 ToastUtils.showShort("预计"+AdUpgradeStateHelper.getRemainingTime(totalProgress,previousProgress,currentProgress)+"下载完成") + }else if(AdUpgradeStateHelper.getUpgradeStatus()){ + //工控机状态为“升级中” + ToastUtils.showShort("新版本升级中，预计5分钟升级完成") + }else if(AdUpgradeStateHelper.isUpgradeFailed(upgradeStatus)){ + //如果升级失败，则Toast提示：升级失败，请联系运维人员 + ToastUtils.showShort("升级失败，请联系运维人员") }else if(AdUpgradeStateHelper.isHintUpgradeMode(upgradeMode) && AdUpgradeStateHelper.isDownloadFinish(downloadStatus,upgradeStatus)){ //如果升级模式为“提示升级”，并且下载状态为已经下载完成，点击弹出升级确认弹窗 if(adUpgradeDialog == null){ @@ -86,6 +92,10 @@ class SystemVersionView @JvmOverloads constructor( //设置当前状态为“升级中” AdUpgradeStateHelper.setUpgradeStatus(true) CallerAutoPilotManager.setIPCUpgradeAffirm() + //将角标设为升级中 + ivAdStatus?.setImageResource(R.drawable.icon_upgrading) + adCircularProgressView?.visibility = View.GONE + ivAdVersion?.setBackgroundResource(R.drawable.version_latest_background) } } @@ -99,12 +109,6 @@ class SystemVersionView @JvmOverloads constructor( }) } adUpgradeDialog?.showUpgradeDialog() - }else if(AdUpgradeStateHelper.getUpgradeStatus()){ - //工控机状态为“升级中” - ToastUtils.showShort("新版本升级中，预计5分钟升级完成") - }else if(AdUpgradeStateHelper.isUpgradeFailed(upgradeStatus)){ - //如果升级失败，则Toast提示：升级失败，请联系运维人员 - ToastUtils.showShort("升级失败，请联系运维人员") } }