From ca866be2721d9fe1bf7fa1595262da938092b4fc Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Fri, 19 Jan 2024 11:50:28 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.8][=E5=BA=94=E7=94=A8=E5=8D=87=E7=BA=A7]?=
 =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../upgrade/UpgradeAppNetWorkManager.kt          |  6 ------
 .../function/hmi/ui/tools/UpgradeAppDialog.kt    | 16 +++++++++++++---
 .../function/hmi/ui/widget/SystemVersionView.kt  |  7 +++++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt
index bcafa4b272..660526fd19 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt
@@ -55,12 +55,6 @@ class UpgradeAppNetWorkManager private constructor() {
     fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) {
         upgradeJob?.safeCancel()
         scope.launch {
-            if (provider?.isDownloading() == true) {
-                withContext(Dispatchers.Main) {
-                    ToastUtils.showShort("正在下载最新版本，不要重复下载...")
-                }
-                return@launch
-            }
             val sn = SharedPrefsMgr.getInstance().sn
             val macAddress = mac //"48:b0:2d:4d:31:7f"
             val type = screenType //"10"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt
index 044bf86256..2d366c507f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/UpgradeAppDialog.kt
@@ -69,15 +69,25 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
         verticalLineView = findViewById(R.id.view_vertical_line)
         confirmForceTv = findViewById(R.id.tv_upgrade_confirm_force)
 
-        confirmTv?.setOnClickListener {
+        confirmTv?.onClick {
+            val provider = CallerDevaToolsManager.upgradeProvider()
+            if (provider?.isDownloading() == true) {
+                ToastUtils.showShort("正在下载最新版本，请稍候再试...")
+                return@onClick
+            }
             downloadApp()
         }
 
-        cancelTv?.setOnClickListener {
+        cancelTv?.onClick {
             dismiss()
         }
 
-        confirmForceTv?.setOnClickListener {
+        confirmForceTv?.onClick {
+            val provider = CallerDevaToolsManager.upgradeProvider()
+            if (provider?.isDownloading() == true) {
+                ToastUtils.showShort("正在下载最新版本，请稍候再试...")
+                return@onClick
+            }
             downloadApp()
         }
 
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 3372261d27..41b7ba8c83 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
@@ -26,6 +26,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.map.MogoData.Companion.mogoMapData
 import kotlinx.android.synthetic.main.view_system_version.view.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import system_master.SsmInfo
 import system_master.SystemStatusInfo
 
@@ -69,6 +71,11 @@ class SystemVersionView @JvmOverloads constructor(
         //鹰眼版本视图点击事件
         ivPadVersion.setOnClickListener {
             hmiAction("$M_HMI$$TAG", "pad version view clicked")
+            val provider = CallerDevaToolsManager.upgradeProvider()
+            if (provider?.isDownloading() == true) {
+                ToastUtils.showShort("正在下载最新版本，请稍候再试...")
+                return@setOnClickListener
+            }
             CallerDevaToolsManager.queryAppUpgrade()
         }