From 0f081cd8d5b3249e8145743debec332d398f3897 Mon Sep 17 00:00:00 2001
From: Godfather <981964879@qq.com>
Date: Fri, 25 Feb 2022 14:13:57 +0800
Subject: [PATCH] =?UTF-8?q?version:2.7=20fix:=E6=9B=B4=E6=96=B0=E6=A1=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=94=A4=E9=86=92=20add:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                | 4 ++--
 src/com/aoleyun/os/Launcher.java            | 4 ++--
 src/com/aoleyun/os/service/MainService.java | 3 ++-
 src/com/aoleyun/os/uiuiutils/JGYUtils.java  | 7 +++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5bc5256..9e6c0b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,8 +66,8 @@ android {
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 28
-        versionCode 16
-        versionName "2.5"
+        versionCode 18
+        versionName "2.7"
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
             abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
diff --git a/src/com/aoleyun/os/Launcher.java b/src/com/aoleyun/os/Launcher.java
index d3efbfa..710cd86 100644
--- a/src/com/aoleyun/os/Launcher.java
+++ b/src/com/aoleyun/os/Launcher.java
@@ -341,8 +341,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         Observable.create(updateSubscribe)
                 .throttleFirst(6, TimeUnit.HOURS)
                 .subscribe(updateObserver);
-        JGYUtils.getInstance().wakeUpAppstore();
-        JGYUtils.getInstance().wakeUpDeviceInfo();
         startService(new Intent(Launcher.this, MainService.class));
         if (DEBUG_STRICT_MODE) {
             StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
@@ -1222,6 +1220,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         mPasswd.getPassword(System.currentTimeMillis());
         TimeUtils.getInstance().setAppPackageName(BuildConfig.APPLICATION_ID);
         HTTPInterface.sendRunningApp(Launcher.this);
+        JGYUtils.getInstance().wakeUpAppstore();
+        JGYUtils.getInstance().wakeUpDeviceInfo();
     }
 
     private void removeRecentTask() {
diff --git a/src/com/aoleyun/os/service/MainService.java b/src/com/aoleyun/os/service/MainService.java
index 62cab45..88f171a 100644
--- a/src/com/aoleyun/os/service/MainService.java
+++ b/src/com/aoleyun/os/service/MainService.java
@@ -87,7 +87,8 @@ public class MainService extends Service {
                 Log.e(TAG, "TimeChangedReceiver:" + "timezone changed");
             } else if (Intent.ACTION_TIME_TICK.equals(intent.getAction())) {
                 Log.e(TAG, "TimeChangedReceiver:" + "time tick");
-                isScreenshot();
+                // TODO: 2022/2/23 暂时屏蔽
+//                isScreenshot();
             }
         }
     }
diff --git a/src/com/aoleyun/os/uiuiutils/JGYUtils.java b/src/com/aoleyun/os/uiuiutils/JGYUtils.java
index 74badf7..29bb8e7 100644
--- a/src/com/aoleyun/os/uiuiutils/JGYUtils.java
+++ b/src/com/aoleyun/os/uiuiutils/JGYUtils.java
@@ -192,19 +192,18 @@ public class JGYUtils {
     public static final String CLASS_DEVICEINFO = "com.aoleyun.sn.receiver.BootReceiver";
     public static final String CLASS_APPSTORE = "com.aoleyun.appstore.receiver.BootReceiver";
 
-    public static final String ACTION_DEVICEINFO = "com.aoleyun.sn.intent.action.BOOT_COMPLETED";
-    public static final String ACTION_APPSTORE = "com.aoleyun.appstore.intent.action.BOOT_COMPLETED";
+    public static final String BOOT_COMPLETED = "aoleyun.intent.action.BOOT_COMPLETED";
 
     public void wakeUpDeviceInfo() {
         //启动设备信息
-        Intent bootIntent = new Intent(ACTION_DEVICEINFO);
+        Intent bootIntent = new Intent(BOOT_COMPLETED);
         bootIntent.setComponent(new ComponentName(PACKAGE_DEVICEINFO, CLASS_DEVICEINFO));
         mContext.sendBroadcast(bootIntent);
     }
 
     public void wakeUpAppstore() {
         //启动应用市场
-        Intent bootIntent = new Intent(ACTION_APPSTORE);
+        Intent bootIntent = new Intent(BOOT_COMPLETED);
         bootIntent.setComponent(new ComponentName(PACKAGE_APPSTORE, CLASS_APPSTORE));
         mContext.sendBroadcast(bootIntent);
     }