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" />
+
+
+
+
+
@@ -79,13 +84,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -111,10 +117,6 @@
-
-
-
-
-->
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -295,17 +297,6 @@
-
-
-
-
-
@@ -458,6 +449,7 @@
+
+
+
+
+
+
+
getHideIcon() throws RemoteException {
- return JGYUtils.getInstance().getHidePackage();
+ List hide = JGYUtils.getInstance().getHidePackage();
+ return hide;
}
@Override
public List getDisableIcon() throws RemoteException {
- return JGYUtils.getInstance().getDisablePackage();
+ List 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;
}
}