From 1a632e1e6ed205f5764d9abc6ad2f23eeda1b805 Mon Sep 17 00:00:00 2001
From: fanhuitong <981964879@qq.com>
Date: Wed, 26 Oct 2022 10:21:45 +0800
Subject: [PATCH] =?UTF-8?q?version:5.4=20fix:=20update:=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=9B=B4=E6=8E=A5=E9=80=80=E5=87=BA=E6=A1=8C?=
=?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=BF=80=E6=B4=BB=E8=AE=BE=E7=BD=AE=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E6=A1=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 4 ++--
app/src/main/AndroidManifest.xml | 6 ++++++
.../java/com/uiui/aios/activity/main/MainActivity.java | 7 +++++++
app/src/main/java/com/uiui/aios/utils/ApkUtils.java | 10 +++++-----
.../main/java/com/uiui/aios/utils/LauncherUtils.java | 10 ++++++----
5 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index eaf6019..c06ec3f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
applicationId "com.uiui.aios"
minSdkVersion 24
targetSdkVersion 29
- versionCode 44
- versionName "5.3"
+ versionCode 45
+ versionName "5.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5be463b..4245787 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,12 @@
package="com.uiui.aios"
android:sharedUserId="android.uid.system">
+
+
+
+
+
+
diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java b/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java
index 30a8d51..1fc480a 100644
--- a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java
@@ -356,6 +356,13 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
ToastUtil.show("请授予\"" + getString(R.string.app_name) + "\"使用通知权");
gotoNotificationAccessSetting(this);
}
+ int is_activation = Settings.Global.getInt(getContentResolver(), "uiui_activation", 0);
+ Log.e(TAG, "onHomePressed: is_activation = " + is_activation);
+ if (is_activation == 1) {
+ LauncherUtils.setDefaultDesktop(MainActivity.this, BuildConfig.APPLICATION_ID, this.getClass().getName());
+ } else {
+ LauncherUtils.setDefaultDesktop(MainActivity.this, LauncherUtils.Launcher3, LauncherUtils.Launcher3Class);
+ }
addData();
mMainPresenter.sendRunningInfo();
mMainPresenter.getAdminSnSetting();
diff --git a/app/src/main/java/com/uiui/aios/utils/ApkUtils.java b/app/src/main/java/com/uiui/aios/utils/ApkUtils.java
index 1108548..d81dd33 100644
--- a/app/src/main/java/com/uiui/aios/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiui/aios/utils/ApkUtils.java
@@ -212,11 +212,11 @@ public class ApkUtils {
for (ApplicationInfo applicationInfo : infoHashMap.values()) {
desktopIcons.add(DesktopIcon.creatDesktopIcon(context, applicationInfo));
}
-// DesktopIcon exitIcon = new DesktopIcon();
-// exitIcon.setIcon(context.getDrawable(R.drawable.exit_icon));
-// exitIcon.setLable("切换系统");
-// exitIcon.setPackageName("aios.exit");
-// desktopIcons.add(exitIcon);
+ DesktopIcon exitIcon = new DesktopIcon();
+ exitIcon.setIcon(context.getDrawable(R.drawable.exit_icon));
+ exitIcon.setLable("切换系统");
+ exitIcon.setPackageName("aios.exit");
+ desktopIcons.add(exitIcon);
return desktopIcons;
}
diff --git a/app/src/main/java/com/uiui/aios/utils/LauncherUtils.java b/app/src/main/java/com/uiui/aios/utils/LauncherUtils.java
index 83bfff8..6c3a9de 100644
--- a/app/src/main/java/com/uiui/aios/utils/LauncherUtils.java
+++ b/app/src/main/java/com/uiui/aios/utils/LauncherUtils.java
@@ -22,8 +22,10 @@ public class LauncherUtils {
public static void openLauncher3(Context context) {
setDefaultDesktop(context, Launcher3, Launcher3Class);
-// ApkUtils.openPackage(mContext, Launcher3);
- gotoLauncher(context);
+ if (!ApkUtils.openPackage(context, Launcher3)) {
+ setDefaultDesktop(context, Launcher3, Launcher3Class);
+ gotoLauncher(context);
+ }
}
public static void gotoLauncher(Context context) {
@@ -33,8 +35,8 @@ public class LauncherUtils {
context.startActivity(i);
}
- private static String Launcher3 = "com.android.launcher3";
- private static String Launcher3Class = "com.android.launcher3.Launcher";
+ public static final String Launcher3 = "com.android.launcher3";
+ public static final String Launcher3Class = "com.android.launcher3.Launcher";
public static void setDefaultDesktop(Context context, String pkg, String className) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {