From dfae50d495204b8de4301c59836f984e601990a9 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 23 May 2023 16:54:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[3.2.0][Fix]=E8=A7=A3=E5=86=B3=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E6=96=AD=E5=BC=80=E8=BF=9E=E6=8E=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../telematic/CallerTelematicListenerManager.kt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt index a4a7899dcf..c6016a1d3b 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt @@ -1,21 +1,32 @@ package com.mogo.eagle.core.function.call.telematic +import android.util.Log import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener import com.mogo.eagle.core.function.call.base.CallerBase object CallerTelematicListenerManager: CallerBase() { + private const val TAG = "CallerTelematicListenerManager" + fun invokeReceivedMsg(type: Int, byteArray: ByteArray) { M_LISTENERS.forEach { val listener = it.value - listener.onReceivedMsg(type, byteArray) + try { + listener.onReceivedMsg(type, byteArray) + } catch (e: Exception) { + Log.e(TAG, "转发消息出现异常：${e.message}") + } } } fun dispatchServerSn(sn: String?) { M_LISTENERS.forEach { val listener = it.value - listener.onReceivedServerSn(sn) + try { + listener.onReceivedServerSn(sn) + } catch (e: Exception) { + Log.e(TAG, "转发司机屏SN出现异常：${e.message}") + } } } } \ No newline at end of file From 4008a1b7d74956d7c05ee713485b7275073824b2 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 23 May 2023 17:25:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[3.2.0]=E5=8E=BB=E6=8E=89=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt index 16f368de6a..c3ead2d664 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt @@ -55,7 +55,6 @@ class TakeOverView @JvmOverloads constructor( */ override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { autopilotStatus = autoPilotStatusInfo.state - Log.i(TAG,"onAutopilotStatusResponse autoPilotStatusInfo state="+autoPilotStatusInfo.state) if(autoPilotStatusInfo.state == 7){ isParallel = true }else if(autoPilotStatusInfo.state == 0 || autoPilotStatusInfo.state == 1){ @@ -70,7 +69,6 @@ class TakeOverView @JvmOverloads constructor( super.onAutopilotGuardian(guardianInfo) ThreadUtils.runOnUiThread { guardianInfo?.let { - Log.i(TAG,"onAutopilotGuardian guardianInfo ="+it.code) if (FunctionBuildConfig.isDemoMode) { return@let } From 9ae90d9fbc1caf3114d74332e6438933c1a08f1b Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 23 May 2023 18:04:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[3.2.0][=E5=BA=94=E7=94=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7]=20=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binding/BindingCarManager.kt | 11 ++++++----- .../upgrade/UpgradeAppNetWorkManager.kt | 9 ++++++++- .../CallerAutopilotCarConfigListenerManager.kt | 6 +++++- 3 files changed, 19 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 7a2c17b937..ba495273f1 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 @@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.call.obu.CallerObuApiManager 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.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager @@ -60,12 +61,12 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { } override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { - CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", "onAutopilotCarConfig ----------> ") - if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.macAddress)) { + Logger.d("${SceneConstant.M_BINDING}${TAG}", "onAutopilotCarConfig ----------> ") + if (!TextUtils.isEmpty(carConfigResp.macAddress)) { CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", - "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} " - ) + "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} ") getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn) + queryAppUpgrade() } } @@ -167,7 +168,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { * 查询app是否需要升级 */ fun queryAppUpgrade() { - CallerLogger.d("${SceneConstant.M_BINDING}${TAG}" + "queryAppUpgrade---role.toString() = ${role.toString()} ---mAddress = $mAddress ---spMac = ${SharedPrefsMgr.getInstance(mContext!!) + CallerLogger.d("${SceneConstant.M_BINDING}${TAG}" + "queryAppUpgrade---role.toString() = $role ---mAddress = $mAddress ---spMac = ${SharedPrefsMgr.getInstance(mContext!!) .getString(SharedPrefsConstants.APP_MAC)}") (if (!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!) .getString(SharedPrefsConstants.APP_MAC))?.let { 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 3393f9953f..b6bfd55145 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 @@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.patch.CallerPatchManager.isPatchAccept import com.mogo.eagle.core.network.* import com.mogo.eagle.core.network.utils.* import com.mogo.eagle.core.utilcode.download.Config +import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.* import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr @@ -40,10 +41,14 @@ class UpgradeAppNetWorkManager private constructor() { private val provider by lazy { upgradeProvider() } + @Volatile + private var upgradeJob: Job? = null + /** * 获取app升级信息 */ - fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) { // String sn = "X20202203105S688HZ"; + fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) { + upgradeJob?.safeCancel() scope.launch { val sn = MoGoAiCloudClientConfig.getInstance().sn //null val macAddress = mac //"48:b0:2d:4d:31:7f" @@ -85,6 +90,8 @@ class UpgradeAppNetWorkManager private constructor() { } delay(TimeUnit.HOURS.toMillis(1)) getAppUpgradeInfo(context, mac, screenType) + }.also { + upgradeJob = it } } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt index 0a191d30ca..950f9bb2fe 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt @@ -25,7 +25,11 @@ object CallerAutopilotCarConfigListenerManager : CallerBase Date: Tue, 23 May 2023 18:15:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[3.2.0][=E5=BA=94=E7=94=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7]=20EB5=E8=AE=BE=E5=A4=87=E5=8D=87=E7=BA=A7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0Toast=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgrade/UpgradeAppNetWorkManager.kt | 4 ++++ 1 file changed, 4 insertions(+) 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 b6bfd55145..f03c1fb9dd 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 @@ -2,6 +2,7 @@ package com.zhjt.mogo_core_function_devatools.upgrade import android.content.* import android.util.* +import android.widget.Toast import com.mogo.cloud.passport.* import com.mogo.commons.constants.* import com.mogo.commons.utils.* @@ -135,6 +136,9 @@ class UpgradeAppNetWorkManager private constructor() { provider?.recordUpgradeRecord(info.result.versionName, null, 0) } if (ApkInstaller.isInstallAppStore(Utils.getApp())) { + withContext(Dispatchers.Main) { + Toast.makeText(Utils.getApp(), "检测到新版本[${info.result.versionName}]并且当前设备支持静默升级，开始下载新版本...", Toast.LENGTH_SHORT).show() + } Log.d("ApkInstaller", "EB5设备，直接走静默，不弹窗...") CallerDevaToolsManager.downLoadPackage(if (isGoFullUpgrade) APK else PATCH, downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl) } else { From edaf1bb4a2449dc4b4d19b4505fa26fdd5b57c5c Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 23 May 2023 18:19:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[3.2.0][=E5=BA=94=E7=94=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7]=20=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binding/BindingCarManager.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 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 ba495273f1..1acb64f7de 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 @@ -63,7 +63,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { Logger.d("${SceneConstant.M_BINDING}${TAG}", "onAutopilotCarConfig ----------> ") if (!TextUtils.isEmpty(carConfigResp.macAddress)) { - CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", + Logger.d("${SceneConstant.M_BINDING}${TAG}", "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} ") getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn) queryAppUpgrade() @@ -168,11 +168,10 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { * 查询app是否需要升级 */ fun queryAppUpgrade() { - CallerLogger.d("${SceneConstant.M_BINDING}${TAG}" + "queryAppUpgrade---role.toString() = $role ---mAddress = $mAddress ---spMac = ${SharedPrefsMgr.getInstance(mContext!!) - .getString(SharedPrefsConstants.APP_MAC)}") + Logger.d("${SceneConstant.M_BINDING}${TAG}", "queryAppUpgrade---role.toString() = $role ---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}", "queryAppUpgrade---mAddress = $mAddress") + Logger.d("${SceneConstant.M_BINDING}${TAG}", "queryAppUpgrade---mAddress = $mAddress") UpgradeAppNetWorkManager.instance ?.getAppUpgradeInfo(mContext, it, role.toString() + "") }