From 5e6b71f955ab7c35de32ce727d6d70138c5fcdff Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Tue, 23 May 2023 11:50:19 +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=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6=E6=98=AFEB5=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../upgrade/UpgradeAppNetWorkManager.kt       |  2 +-
 .../eagle/core/utilcode/util/ApkInstaller.kt  | 25 +------------------
 2 files changed, 2 insertions(+), 25 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 dd9dd6f818..a76f44618f 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
@@ -125,7 +125,7 @@ class UpgradeAppNetWorkManager private constructor() {
                     Log.d("ApkInstaller", "走全量升级 --- 1 ----")
                     provider?.recordUpgradeRecord(info.result.versionName, null, 0)
                 }
-                if (ApkInstaller.isInstallAppStore(Utils.getApp()) && ApkInstaller.isEB5Device(Utils.getApp())) {
+                if (ApkInstaller.isInstallAppStore(Utils.getApp())) {
                     Log.d("ApkInstaller", "EB5设备，直接走静默，不弹窗...")
                     CallerDevaToolsManager.downLoadPackage(if (isGoFullUpgrade) APK else PATCH, downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl)
                 } else {
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 81aa733b4d..2d699fd509 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
@@ -1,6 +1,5 @@
 package com.mogo.eagle.core.utilcode.util
 
-import android.annotation.*
 import android.app.*
 import android.content.*
 import android.content.pm.PackageInstaller.*
@@ -37,7 +36,7 @@ class ApkInstaller {
                 return
             }
             Log.d("AppInstallReceiver", "-- installApp --")
-            if (isInstallAppStore(context) && isEB5Device(context)) {
+            if (isInstallAppStore(context)) {
                 Log.d("AppInstallReceiver", "-- installApp -- 1 --")
                 val intent = Intent("com.mogo.INSTALL_REQUEST")
                 intent.setPackage("com.mogo.appstore")
@@ -64,28 +63,6 @@ class ApkInstaller {
             val installedPackages = ctx.packageManager.getInstalledPackages(0)
             return installedPackages.find { it.packageName == "com.mogo.appstore" } != null
         }
-
-        @JvmStatic
-        fun isEB5Device(ctx: Context): Boolean {
-            val sn: String = getSystemPropertyByReflect("persist.device.sn")
-            return sn.startsWith("ZT", true)
-        }
-
-        private fun getSystemPropertyByReflect(key: String): String {
-            try {
-                @SuppressLint("PrivateApi")
-                val clz = Class.forName("android.os.SystemProperties")
-                val getMethod = clz.getMethod(
-                    "get",
-                    String::class.java,
-                    String::class.java
-                )
-                return getMethod.invoke(clz, key, "2") as String
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-            return ""
-        }
     }
 }