Merge remote-tracking branch 'origin/2.15.0_merge_master' into dev_minibus-d_230425_3.2.0

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<String, Any>().also { itx -> itx.putAll(it) } })
+                    MogoAnalyticUtils.track("AppUpgradeRecord", TreeMap<String, Any>().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()

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) {

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()