release 714

1、sleep 前添加yield，释放资源
2、修改脱腕报警，默认只发消息给服务器，不做声音和弹窗报警。

diff --git a/app/release/ICSer_V712_2011192053_release.apk b/app/release/ICSer_V714_2011202205_release.apk
similarity index 78%
rename from app/release/ICSer_V712_2011192053_release.apk
rename to app/release/ICSer_V714_2011202205_release.apk
index ef7a2e5..81209ef 100644 (file)
Binary files a/app/release/ICSer_V712_2011192053_release.apk and b/app/release/ICSer_V714_2011202205_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index a698c3f..9f3d060 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":712,"versionName":"2011192053","enabled":true,"outputFile":"ICSer_V712_2011192053_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V712_2011192053_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":714,"versionName":"2011202205","enabled":true,"outputFile":"ICSer_V714_2011202205_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V714_2011202205_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 78215cc..ddcd050 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -74,8 +74,12 @@ public class Config {
   public static boolean noTempSensor=false;\r
   //配置是否有心率传感器\r
   public static boolean noPPGSensor=false;\r
-  //配置脱腕报警是否需要弹出脱腕提示\r
-  public static boolean needBroadcastAntiAlarm=true;\r
+  //配置脱腕报警是否需要弹出脱腕提示 默认关闭\r
+  public static boolean needBroadcastAntiAlarm=false;\r
+  //配置脱腕报警是否需要弹出剪断提示 默认开启\r
+  public static boolean needBroadcastCutoffAlarm=true;\r
+\r
+\r
   //定位是否使用wifi的配置。\r
   public static boolean disableWiFiScan=false;\r
 \r
@@ -525,7 +529,8 @@ public class Config {
       noPushTxtNotifyDialog=true;\r
       noSMSNotifyDialog=true;\r
       noVoiceNotifyDialog=true;\r
-      needBroadcastAntiAlarm=true;\r
+      needBroadcastAntiAlarm=false;\r
+      needBroadcastCutoffAlarm=true;\r
       needAllwaysAlarmCutOff=false;\r
       needAllwaysAlarmFenceOut=false;\r
       needTemperature_abnormal_alarm=false;\r
@@ -538,7 +543,8 @@ public class Config {
       noVoiceNotifyDialog=true;\r
       noBroadCastPushTxtNotify=true;\r
       noBroadCastSMSNotify=true;\r
-      needBroadcastAntiAlarm=true;\r
+      needBroadcastAntiAlarm=false;\r
+      needBroadcastCutoffAlarm=true;\r
       needAllwaysAlarmCutOff=true;\r
       needAllwaysAlarmFenceOut=true;\r
       needTemperature_abnormal_alarm=true;\r
@@ -552,6 +558,7 @@ public class Config {
       noSMSNotifyDialog=false;\r
       noVoiceNotifyDialog=true;\r
       needBroadcastAntiAlarm=true;\r
+      needBroadcastCutoffAlarm=true;\r
       needAllwaysAlarmCutOff=true;\r
       needAllwaysAlarmFenceOut=false;\r
       needTemperature_abnormal_alarm=false;\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 5c80ea0..8d552b6 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -1005,7 +1005,7 @@ public class CoreService extends Service {
 //            WakeLockUtil.ScreenOnWakeLockTemperary(runtime.getContextProxy().context);\r
 \r
             if (Config.A9_noBroadCastActionStrip) {\r
-                if(Config.needBroadcastAntiAlarm) {\r
+                if(Config.needBroadcastCutoffAlarm) {\r
                     antiservice.send_cutoff_event_broadcast(1);\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 596dde6..5790ec6 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -97,29 +97,24 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
             case 2:\r
                 //锁定\r
             {\r
-                if (Config.needBroadcastAntiAlarm) {\r
+                if (Config.needBroadcastCutoffAlarm) {\r
                     //  play_notify();\r
                     send_cutoff_event_broadcast(0);\r
                 }\r
                 mRuntime.Cut_off_flag = 0;\r
                 if(mRuntime.setAlarmType(Runtime.AlarmType.ALARM_LOCK_WATCH)) {\r
-//                    StringMessage msg = protocolAPIHelper.getWarningMSG(mRuntime);\r
-//                    Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！\r
+                    //发送消息定位报警消息\r
                     ICLogger.i("triggerSOSLocationProcess ");\r
                     LocationClient.getInstance().triggerSOSLocationProcess();\r
                 }\r
 \r
-//            try {\r
-//                sleep(1000);\r
-//            } catch (InterruptedException e) {\r
-//                e.printStackTrace();\r
-//            }\r
+\r
             }\r
                 break;\r
             case 12:\r
             {\r
                 //非法解锁\r
-                if(Config.needBroadcastAntiAlarm) {\r
+                if(Config.needBroadcastCutoffAlarm) {\r
 \r
                     send_cutoff_event_broadcast(1);\r
                 }\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java
index 2228f7b..e494ce8 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -75,6 +75,7 @@ public class Util {
 \r
   public static void mSleep(int ms){\r
     try {\r
+      Thread.yield();\r
       Thread.sleep(ms);\r
     }catch ( Exception e){\r
       ICLogger.e(e.getMessage(),e);\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 80a2876..08b4c07 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Nov 19 20:53:48 CST 2020\r
-VERSION_CODE=712\r
+#Fri Nov 20 22:05:05 CST 2020\r
+VERSION_CODE=714\r