From 657baf0999e1abc2ead2a3bf044932d02c985b00 Mon Sep 17 00:00:00 2001
From: xuxinchao <13522809046@163.com>
Date: Thu, 26 May 2022 14:51:45 +0800
Subject: [PATCH] =?UTF-8?q?MAP=E6=8E=A8=E6=8B=89=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、修复断电再次升级进度条未重置问题
2、增加升级成功后吐司提示
3、增加确认升级后吐司提示“最新版本下载中”
---
 .../eagle/core/function/hmi/ui/MoGoHmiFragment.kt    | 12 ++++++++++++
 .../core/function/hmi/ui/widget/SystemVersionView.kt |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index b1dd4f5f1a..86457f01f3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -968,6 +968,12 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
 
     }
 
+    /**
+     * 工控机镜像升级确认窗
+     * @param images 镜像列表
+     * @param padSn SN
+     * @param releaseId 任务ID
+     */
     override fun showAdUpgradeDialog(
         images: List<String>,
         padSn: String,
@@ -981,6 +987,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                         //确认升级
                         CallerBindingcarManager.getBindingcarProvider().upgradeConfirm(images, padSn, releaseId)
                         AdUpgradeStateHelper.setConfirmUpgrade(true)
+                        ToastUtils.showLong("最新版本下载中...")
                         adUpgradeDialog?.dismiss()
                         adUpgradeDialog = null
                     }
@@ -999,6 +1006,11 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     override fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo) {
         ThreadUtils.runOnUiThread{
             toolsView?.showAdUpgradeStatus(ipcUpgradeStateInfo)
+            ipcUpgradeStateInfo.status.let {
+                if(AdUpgradeStateHelper.isUpgradeSuccess(it)){
+                    ToastUtils.showLong("升级成功")
+                }
+            }
         }
     }
 
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 a517fc4ac1..ef030b5530 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
@@ -319,6 +319,8 @@ class SystemVersionView @JvmOverloads constructor(
         ivAdVersion?.setBackgroundResource(R.drawable.version_latest_background)
         //设置状态为不可升级
         AdUpgradeStateHelper.setUpgradeableStatus(false)
+        //设置进度条为隐藏
+        adCircularProgressView?.visibility = View.GONE
     }
 
 }
\ No newline at end of file