From d64d0d90a7552a70edef0a948a28d85c192018da Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 23 May 2023 23:29:14 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0][=E5=BA=94=E7=94=A8=E5=8D=87=E7=BA=A7]?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binding/BindingCarManager.kt              | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 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 1acb64f7de..360649eabe 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
@@ -42,6 +42,9 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     @Volatile
     private var mAddress: String? = null
 
+    @Volatile
+    private var mObuVersion: String? = null
+
     @Volatile
     private var mWidevineIDWithMd5 //google 数字版权
             : String? = null
@@ -65,8 +68,20 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
         if (!TextUtils.isEmpty(carConfigResp.macAddress)) {
             Logger.d("${SceneConstant.M_BINDING}${TAG}",
                 "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} ")
+            var flag = false
+            if (mAddress.isNullOrEmpty()) {
+                flag = true
+            }
+            Logger.d("${SceneConstant.M_BINDING}${TAG}",
+                "onAutopilotCarConfig - triggerUpgrade -> $flag")
             getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
-            queryAppUpgrade()
+            if (flag) {
+                queryAppUpgrade()
+                val obuVersion = mObuVersion
+                if (obuVersion != null) {
+                    queryObuUpgrade(obuVersion)
+                }
+            }
         }
     }
 
@@ -182,12 +197,12 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
      * obu的升级,只需要司机屏连接
      */
     fun queryObuUpgrade(obuVersionName: String) {
+        mObuVersion = obuVersionName
         CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role")
         if (screenType == 1) {
             CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress")
             ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(mContext, if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC), obuVersionName)
         }
     }
-
 }