version:6.4

fix:
update:桌面背景更换,增加管控显示第三方应用
This commit is contained in:
2022-11-19 17:43:00 +08:00
parent 94e0f9843f
commit 215669e9d3
7 changed files with 117 additions and 86 deletions

View File

@@ -27,6 +27,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -163,6 +164,13 @@ public class ApkUtils {
Log.i(TAG, "queryFilterAppInfo: " + resolveInfo.activityInfo.packageName);
allowPackages.add(resolveInfo.activityInfo.packageName);
}
String appListString = Settings.System.getString(context.getContentResolver(), "only_jgy_shortcut_list");
List<String> packageList = new ArrayList<>();
if (!TextUtils.isEmpty(appListString)) {
packageList = new ArrayList<>(Arrays.asList(appListString.split(",")));
}
int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 0);
for (ApplicationInfo app : appInfos) {
if (appIsDisable(context, app.packageName)) {
@@ -175,12 +183,14 @@ public class ApkUtils {
applicationInfos.add(app);
}
} 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);
if (setting_other_appInstaller == 0) {//不显示自己安装的
if (packageList.contains(app.packageName)){
applicationInfos.add(app);
}
}else {
if (allowPackages.contains(app.packageName) && !excludePackageName.contains(app.packageName)) {
applicationInfos.add(app);
}
}
}
}
@@ -188,7 +198,6 @@ public class ApkUtils {
applicationInfos.removeIf(applicationInfo -> "com.uiui.city".equals(applicationInfo.packageName));
// applicationInfos.removeIf(applicationInfo -> "com.uiui.sn".equals(applicationInfo.packageName));
}
applicationInfos.sort(new Comparator<ApplicationInfo>() {
@Override
public int compare(ApplicationInfo o1, ApplicationInfo o2) {