From 8ac2a6503ff72da0a648a0236bb96ffa1191b3da Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Thu, 2 Jun 2022 18:14:59 +0800
Subject: [PATCH] =?UTF-8?q?version:cube=204.8=20fix:=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=88=AA=E5=9B=BE=20update:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  8 +-
 app/src/main/AndroidManifest.xml              | 82 ++++++++++---------
 .../com/aoleyun/sn/service/RemoteService.java |  6 +-
 .../com/aoleyun/sn/tpush/MessageReceiver.java |  6 +-
 .../aoleyun/sn/utils/ServiceAliveUtils.java   |  6 +-
 5 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3413970..4120be8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,8 +83,8 @@ android {
         //酷比魔方
         cube {
             flavorDimensions "default"
-            versionCode 39
-            versionName "4.8"
+            versionCode 40
+            versionName "4.9"
             buildConfigField "String", "platform", '"ZhanRuiCube"'
             manifestPlaceholders = [
                     AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89"
@@ -94,8 +94,8 @@ android {
         //MTK
         MTKnewly {
             flavorDimensions "default"
-            versionCode 17
-            versionName "2.6"
+            versionCode 18
+            versionName "2.7"
             buildConfigField "String", "platform", '"MTK"'
             manifestPlaceholders = [
                     AMAP_KEY: "1af68e0a7edcaac82678b1cbb7643408"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b0c8398..953c648 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,6 +61,10 @@
         android:name="android.permission.DELETE_PACKAGES"
         tools:ignore="ProtectedPermissions" />
 
+    <!--自定义安装应用权限-->
+    <uses-permission android:name="com.aoleyun.sn.permissions.INSTALL_APK" />
+    <permission android:name="com.aoleyun.sn.permissions.INSTALL_APK" />
+
     <!-- 【必须】 移动推送 TPNS SDK VIP版本所需权限 -->
     <permission
         android:name="com.aoleyun.sn.permission.XGPUSH_RECEIVE"
@@ -71,6 +75,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
     <!-- 【常用】 移动推送 TPNS SDK所需权限 -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -79,13 +84,14 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.GET_TASKS" />
 
-    <!-- ##############################极光推送############################## -->
-    <!-- Required -->
-    <!--    <permission-->
-    <!--        android:name="${JPUSH_PKGNAME}.permission.JPUSH_MESSAGE"-->
-    <!--        android:protectionLevel="signature" />-->
-    <!-- Required -->
-    <!--    <uses-permission android:name="${JPUSH_PKGNAME}.permission.JPUSH_MESSAGE" />-->
+
+<!--    &lt;!&ndash;##############################极光推送############################## &ndash;&gt;-->
+<!--    &lt;!&ndash;Required &ndash;&gt;-->
+<!--    <permission-->
+<!--        android:name="${JPUSH_PKGNAME}.permission.JPUSH_MESSAGE"-->
+<!--        android:protectionLevel="signature" />-->
+<!--    &lt;!&ndash;Required &ndash;&gt;-->
+<!--    <uses-permission android:name="${JPUSH_PKGNAME}.permission.JPUSH_MESSAGE" />-->
 
     <!-- 高德地图 -->
     <!-- 用于进行网络定位 -->
@@ -111,10 +117,6 @@
     <!-- 如果您的应用需要后台定位权限，且有可能运行在Android Q设备上,并且设置了target>28，必须增加这个权限声明 -->
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 
-    <!--自定义安装应用权限-->
-    <uses-permission android:name="com.aoleyun.sn.permissions.INSTALL_APK" />
-    <permission android:name="com.aoleyun.sn.permissions.INSTALL_APK" />
-
     <application
         android:name=".base.BaseApplication"
         android:allowBackup="true"
@@ -265,24 +267,24 @@
         <!-- <category android:name="android.intent.category.DEFAULT" /> -->
         <!-- </intent-filter> -->
         <!-- </receiver> -->
-        <receiver
-            android:name=".jpush.MyJPushReceiver"
-            android:enabled="true">
-            <intent-filter>
-                <!-- Required 用户注册SDK的intent -->
-                <action android:name="cn.jpush.android.intent.REGISTRATION" />
-                <!-- Required 用户接收SDK消息的intent -->
-                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
-                <!-- Required 用户接收SDK通知栏信息的intent -->
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
-                <!-- Required 用户打开自定义通知栏的intent -->
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
-                <!-- 接收网络变化 连接/断开 since 1.6.3 -->
-                <action android:name="cn.jpush.android.intent.CONNECTION" />
+<!--        <receiver-->
+<!--            android:name=".jpush.MyJPushReceiver"-->
+<!--            android:enabled="true">-->
+<!--            <intent-filter>-->
+<!--                &lt;!&ndash; Required 用户注册SDK的intent &ndash;&gt;-->
+<!--                <action android:name="cn.jpush.android.intent.REGISTRATION" />-->
+<!--                &lt;!&ndash; Required 用户接收SDK消息的intent &ndash;&gt;-->
+<!--                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />-->
+<!--                &lt;!&ndash; Required 用户接收SDK通知栏信息的intent &ndash;&gt;-->
+<!--                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />-->
+<!--                &lt;!&ndash; Required 用户打开自定义通知栏的intent &ndash;&gt;-->
+<!--                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />-->
+<!--                &lt;!&ndash; 接收网络变化 连接/断开 since 1.6.3 &ndash;&gt;-->
+<!--                <action android:name="cn.jpush.android.intent.CONNECTION" />-->
 
-                <!--                <category android:name="${JPUSH_PKGNAME}" />-->
-            </intent-filter>
-        </receiver>
+<!--                &lt;!&ndash;                <category android:name="${JPUSH_PKGNAME}" />&ndash;&gt;-->
+<!--            </intent-filter>-->
+<!--        </receiver>-->
         <!-- Required. For publish channel feature -->
         <!-- JPUSH_CHANNEL 是为了方便开发者统计APK分发渠道。 -->
         <!-- 例如: -->
@@ -295,17 +297,6 @@
         <!-- 发到 Google Play 的APK可以设置为 google-play; -->
         <!-- 发到其他市场的 APK 可以设置为 xxx-market。 -->
         <!-- 目前这个渠道统计功能的报表还未开放。 -->
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="com.aoleyun.sn.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-
-            <!-- 元数据 -->
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
 
         <!-- ##############################极光推送############################## -->
         <!-- Rich push 核心功能 since 2.0.6 -->
@@ -458,6 +449,7 @@
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />
+
         <!-- 【必须】 移动推送 TPNS 默认通知 -->
         <activity
             android:name="com.tencent.android.tpush.TpnsActivity"
@@ -559,6 +551,18 @@
             android:name="XG_V2_ACCESS_KEY"
             android:value="AR7A1L5M0LPH" />
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.aoleyun.sn.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <!-- 元数据 -->
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
         <!-- 高德地图 -->
         <!-- 设置key -->
         <meta-data
diff --git a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java
index d558fc1..af537f3 100644
--- a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java
+++ b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java
@@ -42,12 +42,14 @@ public class RemoteService extends Service {
 
         @Override
         public List<String> getHideIcon() throws RemoteException {
-            return JGYUtils.getInstance().getHidePackage();
+            List<String> hide = JGYUtils.getInstance().getHidePackage();
+            return hide;
         }
 
         @Override
         public List<String> getDisableIcon() throws RemoteException {
-            return JGYUtils.getInstance().getDisablePackage();
+            List<String> disable = JGYUtils.getInstance().getDisablePackage();
+            return disable;
         }
     };
 
diff --git a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java
index 9f13549..75279cc 100644
--- a/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java
+++ b/app/src/main/java/com/aoleyun/sn/tpush/MessageReceiver.java
@@ -977,9 +977,9 @@ public class MessageReceiver extends XGPushBaseReceiver {
     }
 
     public void screenshot(String s) {
-        JSONObject jSONObject = JSON.parseObject(s);
-        long createTime = jSONObject.getLong("createTime");
-
+//        JSONObject jSONObject = JSON.parseObject(s);
+//        long createTime = jSONObject.getLong("createTime");
+        long createTime = System.currentTimeMillis() / 1000;
         PowerManager.WakeLock mWakeLock = JGYUtils.acquireWakeLock(mContext, 60 * 1000);
         JGYUtils.release(mWakeLock);
         if (createTime != 0) {
diff --git a/app/src/main/java/com/aoleyun/sn/utils/ServiceAliveUtils.java b/app/src/main/java/com/aoleyun/sn/utils/ServiceAliveUtils.java
index b20b50c..2f61bbe 100644
--- a/app/src/main/java/com/aoleyun/sn/utils/ServiceAliveUtils.java
+++ b/app/src/main/java/com/aoleyun/sn/utils/ServiceAliveUtils.java
@@ -5,6 +5,8 @@ import android.content.Context;
 import android.util.Log;
 
 public class ServiceAliveUtils {
+    private static final String TAG = ServiceAliveUtils.class.getSimpleName();
+
     public static boolean isServiceAlive(Context mContext) {
         boolean isServiceRunning = false;
         ActivityManager manager =
@@ -17,7 +19,7 @@ public class ServiceAliveUtils {
                 isServiceRunning = true;
             }
         }
-        Log.i("ServiceAliveUtils", mContext.getClass().getName() + "isServiceAlice: " + isServiceRunning);
+        Log.i(TAG, mContext.getClass().getName() + " :isServiceAlive: " + isServiceRunning);
         return isServiceRunning;
     }
 
@@ -33,7 +35,7 @@ public class ServiceAliveUtils {
                 isServiceRunning = true;
             }
         }
-        Log.i("ServiceAliveUtils", serviceName + " :isServiceAlice: " + isServiceRunning);
+        Log.i(TAG, serviceName + " :isServiceAlive: " + isServiceRunning);
         return isServiceRunning;
     }
 }