From 641ad6c7dc1c2c34b5592c4817518046b79b358c Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 17 May 2023 11:01:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[3.2.0][CrashFix]=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=9C=A8=E5=AD=90=E7=BA=BF=E7=A8=8B=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84Ui=E7=BB=98=E5=88=B6=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt index 53668b88a6..74b91eeb29 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt @@ -127,14 +127,13 @@ class MoGoHmiProvider : IMoGoHmiProvider { "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime" ) lastShowV2XJob?.safeCancel() - ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.Default) { + ProcessLifecycleOwner.get().lifecycleScope.launch { delay(expireTime) }.also { itx -> lastShowV2XJob = itx }.invokeOnCompletion { listener?.onDismiss() } - Log.d("CODE", "---- 00 ------ tts_content: $ttsContent") if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) { val last = lastSpeakJob.get() From 495b331153d1a1af0924d8664cbaac8de5d7c4f9 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 17 May 2023 14:24:37 +0800 Subject: [PATCH 2/2] =?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=9F=8B=E7=82=B9=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E9=80=BB=E8=BE=91;=E5=A2=9E=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E9=87=8F=E5=8D=87=E7=BA=A7=E5=BC=80=E5=A7=8B=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgrade/UpgradeAppNetWorkManager.kt | 10 ++++++++-- .../upgrade/UpgradeManager.kt | 1 + 2 files changed, 9 insertions(+), 2 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 ec176f37c3..e2b79cd036 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 @@ -43,12 +43,18 @@ class UpgradeAppNetWorkManager private constructor() { scope.launch { val sn = MoGoAiCloudClientConfig.getInstance().sn //null val macAddress = mac //"48:b0:2d:4d:31:7f" - val type = screenType //10 + val type = screenType //"10" SharedPrefsMgr.getInstance(context!!).putString(SharedPrefsConstants.HOST_ADDRESS, HostConst.getHost()) try { val records = provider?.getUpgradeRecords()?.also { - MogoAnalyticUtils.track("AppUpgradeRecord", it.let { TreeMap().also { itx -> itx.putAll(it) } }) + MogoAnalyticUtils.track("AppUpgradeRecord", TreeMap().also { itx -> + it.entries.forEach { entry -> + itx[entry.key] = entry.value.joinToString(",") { + "${ it.first } -> ${ it.second }" + } + } + }) } Log.d(TAG, "getAppUpgradeInfo: -> records:" + records?.entries?.joinToString(",") { itx -> "key:${itx.key} -> value:[${itx.value.joinToString(",") { "${it.first},${it.second}" } }]"}) val versionCode = AppUtils.getAppVersionCode() diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index 727f2395ee..038c36ce71 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -166,6 +166,7 @@ class UpgradeManager : IDownloadListener { } } else { val apk = File(localPath) + upgradeProvider?.recordInstallStart() withContext(Dispatchers.Main) { ApkInstaller.installApp(Utils.getApp(), apk) { code, reason -> if (code != PackageInstaller.STATUS_SUCCESS) {