tt/Xuewang365OSNeutral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.7.4

Browse Source 
fix:
update:优化报错，优化打开设备信息
This commit is contained in:
Fanhuitong
2024-03-05 14:33:19 +08:00
parent 9c2f01d215
commit 0cfb4b93b4
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -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

1
app/src/main/java/com/uiui/zyos/base/BaseApplication.java
View File

@@ -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();
}
});

2
app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
View File

@@ -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)) {

30
app/src/main/java/com/uiui/zyos/manager/AppManager.java
View File

@@ -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<ResolveInfo>() {
@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<ResolveInfo>() {
// @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<DesktopIcon> desktopIcons = new ArrayList<>();
for (ResolveInfo resolveInfo : resolveInfos) {
desktopIcons.add(DesktopIcon.creatDesktopIcon(mContext, resolveInfo));