diff --git a/app/build.gradle b/app/build.gradle index 7c3c79b..477f402 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.uiui.os" minSdkVersion 24 targetSdkVersion 29 - versionCode 6 - versionName "1.5" + versionCode 7 + versionName "1.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -83,7 +83,7 @@ android { } debug { manifestPlaceholders = [ - AMAP_KEY: "70f37634f84b00c5c7347c545bc2a3b9" + AMAP_KEY: "e7c2b3cb84ca7ac4100b1ffceb3d5685" ] // 显示Log buildConfigField "boolean", "LOG_DEBUG", "true" @@ -103,7 +103,7 @@ android { } release { manifestPlaceholders = [ - AMAP_KEY: "70f37634f84b00c5c7347c545bc2a3b9" + AMAP_KEY: "e7c2b3cb84ca7ac4100b1ffceb3d5685" ] // 不显示Log buildConfigField "boolean", "LOG_DEBUG", "false" diff --git a/app/src/main/java/com/uiui/os/utils/APKUtils.java b/app/src/main/java/com/uiui/os/utils/APKUtils.java index fd273fe..98e2d2a 100644 --- a/app/src/main/java/com/uiui/os/utils/APKUtils.java +++ b/app/src/main/java/com/uiui/os/utils/APKUtils.java @@ -1,6 +1,5 @@ package com.uiui.os.utils; -import android.app.Application; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -15,7 +14,6 @@ import com.uiui.os.BuildConfig; import java.text.Collator; import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; import java.util.HashSet; import java.util.List; @@ -29,7 +27,8 @@ public class APKUtils { this.add("com.sprd.sprdnote"); this.add("com.android.deskclock"); this.add("com.alldocube.store"); - this.add("com.android.uiuios"); + this.add("com.android.email"); + this.add("com.android.calendar"); }}; private static HashSet showPackageName = new HashSet() {{ this.add("com.android.dialer"); @@ -37,8 +36,12 @@ public class APKUtils { this.add("com.android.settings"); this.add("com.android.messaging"); this.add("com.android.camera2"); + this.add("com.mediatek.camera"); + this.add("com.android.mms"); + }}; + private static HashSet allHintPackage = new HashSet() {{ + this.add("com.android.uiuios"); }}; - private static String TAG = APKUtils.class.getSimpleName(); public static ArrayList getSystemApp(Context context) { @@ -58,21 +61,14 @@ public class APKUtils { Log.i(TAG, "queryFilterAppInfo: " + resolveInfo.activityInfo.packageName); allowPackages.add(resolveInfo.activityInfo.packageName); } - for (ApplicationInfo app : appInfos) { - if ((app.flags & ApplicationInfo.FLAG_SYSTEM) > 0)//通过flag排除系统应用,会将电话、短信也排除掉 - { - if (allowPackages.contains(app.packageName) && !showPackageName.contains(app.packageName)) { + if (allHintPackage.contains(app.packageName)) continue; + if ((app.flags & ApplicationInfo.FLAG_SYSTEM) > 0) { + if (allowPackages.contains(app.packageName) + && !showPackageName.contains(app.packageName)) { applicationInfos.add(app); + Log.e(TAG, "getSystemApp: " + app.packageName); } - } else { -// if(app.uid > 10000){//通过uid排除系统应用,在一些手机上效果不好 -// applicationInfos.add(app); -// } -// if (allowPackages.contains(app.packageName) && !excludePackageName.contains(app.packageName)) { -//// if (allowPackages.contains(app.packageName)) { -// applicationInfos.add(app); -// } } } applicationInfos.sort(new Comparator() {