From b53c38b15f559254af71a10b9a7a61d342b54497 Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Tue, 21 Jun 2022 09:18:02 +0800
Subject: [PATCH] =?UTF-8?q?version:4.5=20fix:=20update:=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=88=B1=E5=8D=8E=E8=A7=A3=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/xml/default_workspace_6x4.xml        | 2 +-
 src/com/aoleyun/os/Launcher.java         | 3 ++-
 src/com/aoleyun/os/model/LoaderTask.java | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/xml/default_workspace_6x4.xml b/res/xml/default_workspace_6x4.xml
index 8adb81c..5066c37 100644
--- a/res/xml/default_workspace_6x4.xml
+++ b/res/xml/default_workspace_6x4.xml
@@ -64,7 +64,7 @@
 
     <favorite
         launcher:container="-101"
-        launcher:className="com.aoleyun.browser.activity.MainActivity"
+        launcher:className="com.aoleyun.browser.activity.main.MainActivity"
         launcher:packageName="com.aoleyun.browser"
         launcher:screen="2"
         launcher:x="2"
diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java
index 6db59d5..dfec83d 100644
--- a/src/com/aoleyun/os/Launcher.java
+++ b/src/com/aoleyun/os/Launcher.java
@@ -1273,7 +1273,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
 
     private void checkIsRest() {
         int desktop_clear = Settings.Global.getInt(getContentResolver(), "desktop_clear", 0);
-        if (!JGYUtils.getInstance().getDeviceIsLocked() && desktop_clear != 1) {
+        int aihuaUnlock = Settings.Global.getInt(getContentResolver(), "Aihua_unlock_state", 0);
+        if ((!JGYUtils.getInstance().getDeviceIsLocked()|| aihuaUnlock == 1) && desktop_clear != 1) {
             Settings.Global.putInt(getContentResolver(), "desktop_clear", 1);
             JGYUtils.getInstance().cleanAoleLauncher3Cache();
         }
diff --git a/src/com/aoleyun/os/model/LoaderTask.java b/src/com/aoleyun/os/model/LoaderTask.java
index f7e39e8..c7ecbad 100644
--- a/src/com/aoleyun/os/model/LoaderTask.java
+++ b/src/com/aoleyun/os/model/LoaderTask.java
@@ -320,7 +320,8 @@ public class LoaderTask implements Runnable {
                     if (BuildConfig.APPLICATION_ID.equals(app.getApplicationInfo().packageName))
                         continue;
                     /*系统应用*/
-                    if (JGYUtils.getInstance().getDeviceIsLocked()) {
+                    int aihuaUnlock = Settings.Global.getInt(context.getContentResolver(), "Aihua_unlock_state", 0);
+                    if (JGYUtils.getInstance().getDeviceIsLocked() || aihuaUnlock == 1) {
                         if ((app.getApplicationFlags() & ApplicationInfo.FLAG_SYSTEM) == 1) {
                             if (!showApp.contains(app.getApplicationInfo().packageName)) {
                                 Log.e("verifyApplications", "skip1: " + app.getApplicationInfo().packageName);