From 2f87b40d0e5770461f1d327d3aee58633769242a Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Fri, 21 Jun 2024 09:54:44 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.4][=E5=BA=94=E7=94=A8=E5=8D=87=E7=BA=A7][b?=
 =?UTF-8?q?ugfix]=20=E9=85=8D=E7=BD=AE=E5=8A=A8=E6=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=8D=87=E7=BA=A7=E8=AF=B7=E6=B1=82=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f0a7901658ec066cef06f3f5e939fe1591edf21e)
---
 .../binding/BindingCarManager.kt              |  4 +++
 .../upgrade/UpgradeAppNetWorkManager.kt       | 29 +++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt
index e448a75ea4..892b3dd8b7 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt
@@ -252,5 +252,9 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
             )
         }
     }
+
+    fun getMacAddress(): String? {
+        return mAddress
+    }
 }
 
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 660526fd19..72db69103d 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
@@ -1,6 +1,7 @@
 package com.zhjt.mogo_core_function_devatools.upgrade
 
 import android.content.*
+import android.text.TextUtils
 import android.util.*
 import android.widget.Toast
 import com.mogo.commons.constants.*
@@ -22,8 +23,10 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.*
 import com.mogo.commons.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.eagle.core.utilcode.util.FileUtils
+import com.zhjt.mogo_core_function_devatools.binding.BindingCarManager
 import kotlinx.coroutines.*
 import okhttp3.*
 import java.util.TreeMap
@@ -55,9 +58,25 @@ class UpgradeAppNetWorkManager private constructor() {
     fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) {
         upgradeJob?.safeCancel()
         scope.launch {
-            val sn = SharedPrefsMgr.getInstance().sn
-            val macAddress = mac //"48:b0:2d:4d:31:7f"
-            val type = screenType //"10"
+            var sn = SharedPrefsMgr.getInstance().sn
+            var macAddress = mac //"48:b0:2d:4d:31:7f"
+            var type = screenType //"10"
+            while (sn == null || TextUtils.isEmpty(sn)) {
+                Logger.d(TAG, "sn is null or empty.")
+                delay(TimeUnit.MINUTES.toMillis(1))
+                sn = SharedPrefsMgr.getInstance().sn
+            }
+            while (TextUtils.isEmpty(macAddress)) {
+                Logger.d(TAG, "mac address is null or empty.")
+                delay(TimeUnit.MINUTES.toMillis(1))
+                macAddress = BindingCarManager.getMacAddress() ?: ""
+            }
+            while (type == "0") {
+                Logger.d(TAG, "type is 0")
+                delay((TimeUnit.MINUTES.toMillis(1)))
+                type = AppIdentityModeUtils.getMisChannelCode(FunctionBuildConfig.appIdentityMode).toString()
+            }
+            Logger.d(TAG, "start upgrade request ...")
             SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.HOST_ADDRESS, HostConst.getHost())
             try {
                 val records = provider?.getUpgradeRecords()?.also {
@@ -67,7 +86,7 @@ class UpgradeAppNetWorkManager private constructor() {
                                 "${ it.first } -> ${ it.second }"
                             }
                         }
-                        itx["role"] = AppIdentityModeUtils.getMisChannelCode(FunctionBuildConfig.appIdentityMode)
+                        itx["role"] = type
                     })
                 }
                 Log.d(TAG, "getAppUpgradeInfo: -> records:" + records?.entries?.joinToString(",") { itx -> "key:${itx.key} -> value:[${itx.value.joinToString(",") { "${it.first},${it.second}" } }]"})
@@ -98,7 +117,7 @@ class UpgradeAppNetWorkManager private constructor() {
             if (mDownloadRequested) {
                 mDownloadRequested = false
             }
-            getAppUpgradeInfo(context, mac, screenType)
+            getAppUpgradeInfo(context, macAddress, type)
         }.also {
             upgradeJob = it
         }