diff --git a/app/build.gradle b/app/build.gradle index 5f253ba..931883b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 64 - versionName "1.7.2" + versionCode 66 + versionName "1.7.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/uiui/zyos/base/BaseApplication.java b/app/src/main/java/com/uiui/zyos/base/BaseApplication.java index 3a94a2e..70668c7 100644 --- a/app/src/main/java/com/uiui/zyos/base/BaseApplication.java +++ b/app/src/main/java/com/uiui/zyos/base/BaseApplication.java @@ -59,6 +59,7 @@ public class BaseApplication extends Application { RemoteManager.setListener(new RemoteManager.ConnectedListener() { @Override public void onConnected() { + CrashReport.setDeviceId(BaseApplication.this, RemoteManager.getInstance().getSerial()); RemoteManager.getInstance().aliyunPushInit(); } }); diff --git a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java index 5059f0e..4559ba2 100644 --- a/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java +++ b/app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java @@ -211,6 +211,8 @@ public class UserFragment extends BaseFragment implements UserContact.UserView { } }); iv_avatar.setOnClickListener(view -> ApkUtils.openPackage(mContext, "com.uiui.zy", "com.uiui.zy.activity.main.MainActivity")); + iv_applet_qrcode.setOnClickListener(view -> ApkUtils.openPackage(mContext, "com.uiui.zy", "com.uiui.zy.activity.main.MainActivity")); + iv_device_qrcode.setOnClickListener(view -> ApkUtils.openPackage(mContext, "com.uiui.zy", "com.uiui.zy.activity.main.MainActivity")); registerOwnReceiver(); String name = mMMKV.decodeString("USERINFO_NAME", ""); if (TextUtils.isEmpty(name)) { diff --git a/app/src/main/java/com/uiui/zyos/manager/AppManager.java b/app/src/main/java/com/uiui/zyos/manager/AppManager.java index eb8a18f..e995255 100644 --- a/app/src/main/java/com/uiui/zyos/manager/AppManager.java +++ b/app/src/main/java/com/uiui/zyos/manager/AppManager.java @@ -231,21 +231,21 @@ public class AppManager { return Collator.getInstance(Locale.CHINESE).compare(o1.loadLabel(pm).toString(), o2.loadLabel(pm).toString()); } }); - resolveInfos.sort(new Comparator() { - @Override - public int compare(ResolveInfo o1, ResolveInfo o2) { - try { - if ((pm.getApplicationInfo(o1.activityInfo.packageName, 0).flags & ApplicationInfo.FLAG_SYSTEM) <= (pm.getApplicationInfo(o2.activityInfo.packageName, 0).flags & ApplicationInfo.FLAG_SYSTEM)) { - return 1; - } else { - return -1; - } - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - return 0; - } - } - }); +// resolveInfos.sort(new Comparator() { +// @Override +// public int compare(ResolveInfo o1, ResolveInfo o2) { +// try { +// if ((pm.getApplicationInfo(o1.activityInfo.packageName, 0).flags & ApplicationInfo.FLAG_SYSTEM) <= (pm.getApplicationInfo(o2.activityInfo.packageName, 0).flags & ApplicationInfo.FLAG_SYSTEM)) { +// return 1; +// } else { +// return -1; +// } +// } catch (PackageManager.NameNotFoundException e) { +// e.printStackTrace(); +// return 0; +// } +// } +// }); ArrayList desktopIcons = new ArrayList<>(); for (ResolveInfo resolveInfo : resolveInfos) { desktopIcons.add(DesktopIcon.creatDesktopIcon(mContext, resolveInfo)); diff --git a/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java b/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java index 5245b37..509c4da 100644 --- a/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java +++ b/app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java @@ -168,10 +168,10 @@ public class OpenApkUtils { this.add("com.oirsdfg89.flg"); this.add("com.study.flashplayer"); this.add("com.tech.translate"); - this.add("com.uiui.zybrowser "); + this.add("com.uiui.zybrowser"); this.add("com.uiui.zysn "); this.add("com.jxw.launcher"); - this.add("com.uiui.zyappstore "); + this.add("com.uiui.zyappstore"); this.add("com.uiui.zy"); this.add("com.uiui.zyos"); this.add("com.teclast.zyos");