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 e2b79cd036..dd9dd6f818 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 @@ -7,6 +7,9 @@ import com.mogo.commons.constants.* import com.mogo.commons.utils.* import com.mogo.eagle.core.data.config.* import com.mogo.eagle.core.data.deva.bindingcar.* +import com.mogo.eagle.core.function.api.devatools.download.DownloadType.APK +import com.mogo.eagle.core.function.api.devatools.download.DownloadType.PATCH +import com.mogo.eagle.core.function.call.devatools.* import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.upgradeProvider import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showUpgradeDialog import com.mogo.eagle.core.function.call.patch.CallerPatchManager.addPatchInfo @@ -122,8 +125,13 @@ class UpgradeAppNetWorkManager private constructor() { Log.d("ApkInstaller", "走全量升级 --- 1 ----") provider?.recordUpgradeRecord(info.result.versionName, null, 0) } - withContext(Dispatchers.Main) { - showUpgradeDialog(downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl, info.result.installTitle, info.result.installContent, info.result.installType) + if (ApkInstaller.isInstallAppStore(Utils.getApp()) && ApkInstaller.isEB5Device(Utils.getApp())) { + Log.d("ApkInstaller", "EB5设备,直接走静默,不弹窗...") + CallerDevaToolsManager.downLoadPackage(if (isGoFullUpgrade) APK else PATCH, downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl) + } else { + withContext(Dispatchers.Main) { + showUpgradeDialog(downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl, info.result.installTitle, info.result.installContent, info.result.installType) + } } } else { deleteApkFile() diff --git a/core/mogo-core-utils/src/main/AndroidManifest.xml b/core/mogo-core-utils/src/main/AndroidManifest.xml index 7e643df2d9..05e522a06f 100644 --- a/core/mogo-core-utils/src/main/AndroidManifest.xml +++ b/core/mogo-core-utils/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -38,6 +39,14 @@ + + + + + + ? = null + + @Volatile + var listener: ((Int, String) -> Unit)? = null + } + + override fun onReceive(context: Context?, intent: Intent?) { + try { + Log.d("AppInstallReceiver", "-- onReceive: --- 1 ---") + val i = intent ?: return + Log.d("AppInstallReceiver", "-- onReceive: --- 2 ---") + if (i.hasExtra("code") && i.hasExtra("msg")) { + val code = i.getIntExtra("code", -1) + val msg = i.getStringExtra("msg") ?: "未知异常" + Log.d("AppInstallReceiver", "-- onReceive: --- 3 ---:[code: $code, msg: $msg]") + listener?.invoke(code, msg) + } + } finally { + listener = null + } + + } +}