From da884659040c0561cddd92bd6861e81378480660 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Fri, 19 May 2023 15:54:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[3.2.0][Fix]Catch=E6=8B=92=E7=BB=9D?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index eb690d7c56..808ba62f5e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4
 LOGLIB_VERSION=1.5.27
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
-MOGO_NETWORK_VERSION=1.4.7.3
+MOGO_NETWORK_VERSION=1.4.7.4
 # 鉴权
-MOGO_PASSPORT_VERSION=1.4.7.3
+MOGO_PASSPORT_VERSION=1.4.7.4
 # 常链接
-MOGO_SOCKET_VERSION=1.4.7.3
+MOGO_SOCKET_VERSION=1.4.7.4
 # 数据采集
-MOGO_REALTIME_VERSION=1.4.7.3
+MOGO_REALTIME_VERSION=1.4.7.4
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.4.7.3
+MOGO_TANLU_VERSION=1.4.7.4
 # 直播推流
-MOGO_LIVE_VERSION=1.4.7.3
+MOGO_LIVE_VERSION=1.4.7.4
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.4.7.3
+MOGO_TRAFFICLIVE_VERSION=1.4.7.4
 # 定位服务
-MOGO_LOCATION_VERSION=1.4.7.3
+MOGO_LOCATION_VERSION=1.4.7.4
 # 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.4.7.3
+MOGO_TELEMATIC_VERSION=1.4.7.4
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 MAP_SDK_VERSION=2.12.1.1

From 953eddac9980747bb10b1c659194f83ba58ccf62 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 19 May 2023 16:37:53 +0800
Subject: [PATCH 2/2] [dev_minibus-d_230425_3.2.0] add log

---
 .../binding/BindingCarManager.kt                     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 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 eafb44af42..7a2c17b937 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
@@ -17,7 +17,6 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isDriver
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager
 import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager
@@ -61,9 +60,9 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     }
 
     override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
+        CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", "onAutopilotCarConfig ----------> ")
         if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.macAddress)) {
-            CallerLogger.d(
-                "$M_DEVA$TAG",
+            CallerLogger.d("${SceneConstant.M_BINDING}${TAG}",
                 "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} "
             )
             getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
@@ -76,8 +75,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
      * @param macAddress
      */
     fun getBindingCarInfo(macAddress: String, widevineIDWithMd5: String) {
-        CallerLogger.d(
-            "$M_DEVA$TAG",
+        CallerLogger.d("${SceneConstant.M_BINDING}${TAG}",
             "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5 ---screenType = $screenType"
         )
         SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress)
@@ -169,11 +167,11 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
      * 查询app是否需要升级
      */
     fun queryAppUpgrade() {
-        CallerLogger.d("${SceneConstant.M_BINDING}${TAG}" + "---role.toString() = ${role.toString()} ---mAddress = $mAddress ---spMac = ${SharedPrefsMgr.getInstance(mContext!!)
+        CallerLogger.d("${SceneConstant.M_BINDING}${TAG}" + "queryAppUpgrade---role.toString() = ${role.toString()} ---mAddress = $mAddress ---spMac = ${SharedPrefsMgr.getInstance(mContext!!)
             .getString(SharedPrefsConstants.APP_MAC)}")
         (if (!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!)
             .getString(SharedPrefsConstants.APP_MAC))?.let {
-            CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", "---mAddress = $mAddress")
+            CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", "queryAppUpgrade---mAddress = $mAddress")
             UpgradeAppNetWorkManager.instance
                 ?.getAppUpgradeInfo(mContext, it, role.toString() + "")
         }