From: snickersun Date: Fri, 20 Nov 2020 14:07:55 +0000 (+0800) Subject: release 714 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=ebcbca848f005bfd6737ea5c3d0896688dc13cc6;p=protocol_srv.git 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 ef7a2e56..81209ef0 100644 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 a698c3f3..9f3d0601 100644 --- 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 78215ccf..ddcd0509 100644 --- 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; //配置是否有心率传感器 public static boolean noPPGSensor=false; - //配置脱腕报警是否需要弹出脱腕提示 - public static boolean needBroadcastAntiAlarm=true; + //配置脱腕报警是否需要弹出脱腕提示 默认关闭 + public static boolean needBroadcastAntiAlarm=false; + //配置脱腕报警是否需要弹出剪断提示 默认开启 + public static boolean needBroadcastCutoffAlarm=true; + + //定位是否使用wifi的配置。 public static boolean disableWiFiScan=false; @@ -525,7 +529,8 @@ public class Config { noPushTxtNotifyDialog=true; noSMSNotifyDialog=true; noVoiceNotifyDialog=true; - needBroadcastAntiAlarm=true; + needBroadcastAntiAlarm=false; + needBroadcastCutoffAlarm=true; needAllwaysAlarmCutOff=false; needAllwaysAlarmFenceOut=false; needTemperature_abnormal_alarm=false; @@ -538,7 +543,8 @@ public class Config { noVoiceNotifyDialog=true; noBroadCastPushTxtNotify=true; noBroadCastSMSNotify=true; - needBroadcastAntiAlarm=true; + needBroadcastAntiAlarm=false; + needBroadcastCutoffAlarm=true; needAllwaysAlarmCutOff=true; needAllwaysAlarmFenceOut=true; needTemperature_abnormal_alarm=true; @@ -552,6 +558,7 @@ public class Config { noSMSNotifyDialog=false; noVoiceNotifyDialog=true; needBroadcastAntiAlarm=true; + needBroadcastCutoffAlarm=true; needAllwaysAlarmCutOff=true; needAllwaysAlarmFenceOut=false; needTemperature_abnormal_alarm=false; diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 5c80ea09..8d552b62 100644 --- 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); if (Config.A9_noBroadCastActionStrip) { - if(Config.needBroadcastAntiAlarm) { + if(Config.needBroadcastCutoffAlarm) { antiservice.send_cutoff_event_broadcast(1); } 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 596dde6e..5790ec68 100644 --- 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: //锁定 { - if (Config.needBroadcastAntiAlarm) { + if (Config.needBroadcastCutoffAlarm) { // play_notify(); send_cutoff_event_broadcast(0); } mRuntime.Cut_off_flag = 0; if(mRuntime.setAlarmType(Runtime.AlarmType.ALARM_LOCK_WATCH)) { -// StringMessage msg = protocolAPIHelper.getWarningMSG(mRuntime); -// Deliver.sendLocationMSG(msg); //消息很重要，所以利用带buffer的对列来发送！ + //发送消息定位报警消息 ICLogger.i("triggerSOSLocationProcess "); LocationClient.getInstance().triggerSOSLocationProcess(); } -// try { -// sleep(1000); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } + } break; case 12: { //非法解锁 - if(Config.needBroadcastAntiAlarm) { + if(Config.needBroadcastCutoffAlarm) { send_cutoff_event_broadcast(1); } 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 2228f7b4..e494ce83 100644 --- 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 { public static void mSleep(int ms){ try { + Thread.yield(); Thread.sleep(ms); }catch ( Exception e){ ICLogger.e(e.getMessage(),e); diff --git a/app/version_code.properties b/app/version_code.properties index 80a2876a..08b4c07f 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Thu Nov 19 20:53:48 CST 2020 -VERSION_CODE=712 +#Fri Nov 20 22:05:05 CST 2020 +VERSION_CODE=714