From f3342cbb973201f8ad670f08bcbf350ec882a419 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 24 May 2023 17:54:04 +0800 Subject: [PATCH] =?UTF-8?q?[3.2.0][=E5=BA=94=E7=94=A8=E5=8D=87=E7=BA=A7]?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=8D=95=E8=8E=B7=E7=9B=B8=E5=85=B3=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgrade/UpgradeAppNetWorkManager.kt | 8 ++++++-- .../com/mogo/eagle/core/utilcode/util/ApkInstaller.kt | 8 ++++++-- 2 files changed, 12 insertions(+), 4 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 2ebff7a0f3..4c48abd21b 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 @@ -136,8 +136,12 @@ 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() + try { + withContext(Dispatchers.Main) { + Toast.makeText(Utils.getApp(), "检测到新版本[${info.result.versionName}]并且当前设备支持静默升级，开始下载新版本...", Toast.LENGTH_SHORT).show() + } + } catch (t: Throwable) { + t.printStackTrace() } Log.d("ApkInstaller", "EB5设备，直接走静默，不弹窗...") CallerDevaToolsManager.downLoadPackage(if (isGoFullUpgrade) APK else PATCH, downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl) diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ApkInstaller.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ApkInstaller.kt index 74d55ecc38..328d90cb29 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ApkInstaller.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ApkInstaller.kt @@ -60,8 +60,12 @@ class ApkInstaller { @JvmStatic fun isInstallAppStore(ctx: Context): Boolean { - val installedPackages = ctx.packageManager.getInstalledPackages(0) - return installedPackages.find { it.packageName == "com.mogo.appstore" } != null + return try { + val installedPackages = ctx.packageManager.getInstalledPackages(0) + installedPackages.find { it.packageName == "com.mogo.appstore" } != null + } catch (t: Throwable) { + false + } } } }