release V515

修改 coreService A9 5分钟提醒一次不弹窗，改为Toast。
修改 亮屏wakelock，改为handler执行，尝试减少time reset造成的 屏幕不灭。

diff --git a/app/release/ICSer_V511_2009021843_release.apk b/app/release/ICSer_V515_2009032133_release.apk
similarity index 78%
rename from app/release/ICSer_V511_2009021843_release.apk
rename to app/release/ICSer_V515_2009032133_release.apk
index 51b01b0..3785f12 100644 (file)
Binary files a/app/release/ICSer_V511_2009021843_release.apk and b/app/release/ICSer_V515_2009032133_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index e3c247f..3c65cac 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":513,"versionName":"2009022303","enabled":true,"outputFile":"ICSer_V513_2009022303_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V513_2009022303_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":515,"versionName":"2009032133","enabled":true,"outputFile":"ICSer_V515_2009032133_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V515_2009032133_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 2ec23c9..94e9114 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -738,11 +738,8 @@ public class CoreService extends Service {
         if(runtime.Anti_off_flag>0 && Config.needAllwaysAlarmAntiOff){\r
             runtime.Anti_off_flag++;\r
             WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
-            if (runtime.getAntioffStatus()) {\r
-                runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_Illegal_unlock), 2);\r
-            }else{\r
-                runtime.getContextProxy().sendMsgBroadcast(runtime.getContextProxy().context.getResources().getString(R.string.alarm_wristband_off), 2);\r
-            }\r
+            antiservice.send_anti_event_broadcast(1);\r
+\r
         }\r
 \r
     }\r

diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
index 1c74bbb..0cfb43a 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -178,7 +178,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
     }\r
 \r
 \r
-    private void send_anti_event_broadcast(int antioff){\r
+    public void send_anti_event_broadcast(int antioff){\r
 \r
         Intent intent=new Intent();\r
         intent.setAction(ACTION_ANTI_OFF);\r
@@ -200,7 +200,12 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
         }else{\r
 \r
             if (Config.A9_noBroadCastActionStrip) {\r
-                Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
+\r
+                if (mRuntime.getAntioffStatus() == true) {\r
+                    Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r
+                } else {\r
+                    Util.ShowToast(mRuntime, mContext.getResources().getString(R.string.alarm_wristband_off));\r
+                }\r
             }else {\r
                 if (mRuntime.getAntioffStatus() == true) {\r
                     intent.putExtra(KEY_ANTI_TXT, mContext.getResources().getString(R.string.alarm_Illegal_unlock));\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java b/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
index 2095c3d..3f3bc56 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
@@ -28,9 +28,13 @@ public class WakeLockUtil {
   public static void ScreenOnWakeLockTemperary(Context context) {\r
     final PowerManager.WakeLock wakelock = ((PowerManager)context.getSystemService(Context.POWER_SERVICE)).newWakeLock(ACQUIRE_CAUSES_WAKEUP| SCREEN_DIM_WAKE_LOCK, WakeLockUtil.class.getSimpleName());\r
     wakelock.acquire();\r
-    Observable.timer(5000L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
-      public void call(Long param1Long) { wakelock.release(); }\r
-    });\r
+    new Handler().postDelayed(new Runnable() {\r
+      @Override\r
+      public void run() {\r
+        wakelock.release();\r
+      }\r
+    },5000L);\r
+\r
   }\r
 \r
 }\r

diff --git a/app/version_code.properties b/app/version_code.properties
index e9993ff..30519d7 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Sep 02 23:03:26 CST 2020\r
-VERSION_CODE=513\r
+#Thu Sep 03 21:33:40 CST 2020\r
+VERSION_CODE=515\r