From: SnickerSun Date: Mon, 5 Jul 2021 13:43:42 +0000 (+0800) Subject: release ProtocolV2 V885 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=428769871c873675f9c2f2566157d1a64eae7a11;p=icsupport.git release ProtocolV2 V885 对非支持的协议，设置心跳时间为65535，从而降低功耗。 --- diff --git a/app/release/ICSer_V880_2106301429_release.apk b/app/release/ICSer_V885_2107052142_release.apk similarity index 77% rename from app/release/ICSer_V880_2106301429_release.apk rename to app/release/ICSer_V885_2107052142_release.apk index ed30a8a3..c265c849 100644 Binary files a/app/release/ICSer_V880_2106301429_release.apk and b/app/release/ICSer_V885_2107052142_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 0fdd7461..ff565516 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":881,"versionName":"2106301209","enabled":true,"outputFile":"ICSer_V881_2106301209_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V881_2106301209_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":885,"versionName":"2107052142","enabled":true,"outputFile":"ICSer_V885_2107052142_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V885_2107052142_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 02b6a011..a57ea847 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -32,14 +32,12 @@ import static com.enqualcomm.support.utils.Util.getSystemProperties; public class Config { public static final boolean LOG_TOFILE = true; - public static int antioff = 0; - public static int heart_rate = 0; - private static String json; - public static int defaultHeartbeatCycle = 5; public static int sw_release_no = -1; public static HeartRateOxygenTestType testType = HeartRateOxygenTestType.ALL; + //默认协议心跳时间 + public static int HeartBeatAlarmCycle = 5; //如果重试都失败，则丢弃命令不进行盲点续传 public static boolean discard_cmd_after_retryfailed = true; @@ -336,6 +334,9 @@ public class Config { } public static void loadHearBeatSetting(Runtime runtime) { + if(Config.protocol_no == Config.PROTOCOL_UNKNOWN){ + Config.HeartBeatAlarmCycle = 65535; //不识别的协议，就设置一个很大的数据相当于没有心跳，这样更省电 + } runtime.setHeartBeatCycle(Config.getHeartBeatCycle(runtime.getContextProxy().context)); } @@ -570,6 +571,7 @@ public class Config { public static final int PROTOCOL_ANAN = 5; public static final int PROTOCOL_S123 = 6; public static final int PROTOCOL_GATOR = 7; + public static final int PROTOCOL_UNKNOWN = 255; public static int protocol_no = getProtocolNumber(); @@ -602,6 +604,7 @@ public class Config { break; default: ICLogger.i("协议版本 目前支持0,1,2,3,4,5,6,7"); + ret=PROTOCOL_UNKNOWN; break; } } else { diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 9a8a5444..12ddff76 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -125,8 +125,6 @@ public class CoreService extends Service { private static final String MY_WAKE_LOCKTAG = CoreService.class.getSimpleName(); - public static int alarmCycle = 5; - public static final int interval = 60000; final Messenger mMessenger = new Messenger(new RequestHandler(this)); @@ -606,7 +604,7 @@ public class CoreService extends Service { this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime); this.connection.open(); checkconnection(); - this.locationClient.onAlarm(getWakeLock(alarmCycle)); + this.locationClient.onAlarm(getWakeLock(Config.HeartBeatAlarmCycle)); this.connectionServiceChain.processAlarmClock(this.connection, this.runtime); this.invokeHandlerServiceChain.processAlarmClock(this.connection, this.runtime); if (SystemClock.elapsedRealtime() - this.mWeatherTime > 60000L && this.mHaveSetWeatherAlarm) { @@ -737,7 +735,9 @@ public class CoreService extends Service { runtime.setNeddReportCutoff(Config.getNeedCutOff(this)); runtime.setNeedAntioff(Config.getNeedAntiOff(this)); - Config.setHeartBeatCycle(this, alarmCycle); //临时设置为5分钟，给L03测试用。测试断线问题未解决，取消测试。 + //设置默认协议心跳包发送时间 + Config.setHeartBeatCycle(this, Config.HeartBeatAlarmCycle); + //初始化ServerHeartBeat Cycle Config.loadHearBeatSetting(runtime); //初始化PPG，LocationMod，LocationCycle @@ -852,7 +852,7 @@ public class CoreService extends Service { setHeartBeatAlarm(); //设置心率检测频率 - setHeartRateDetectAlarm(runtime.getPpgTestCycleInMinutes()); //3分钟一次 + setHeartRateDetectAlarm(runtime.getPpgTestCycleInMinutes()); //获取天气时间 setWeatherAlarm(); diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java index 1c88e22a..6f16850f 100644 --- a/app/src/main/java/com/enqualcomm/support/LocationClient.java +++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java @@ -876,7 +876,7 @@ public class LocationClient { //每分钟更新一次数据 runtime.preCellInfo = runtime.getCurrentCellInfo(); runtime.preCdmaInfo = runtime.getCdmaInfo(); - runtime.preTime = TimeUtil.getSystemTime(System.currentTimeMillis() - (CoreService.alarmCycle * 60 * 1000)); + runtime.preTime = TimeUtil.getSystemTime(System.currentTimeMillis() - (runtime.getHeartBeatCycle() * 60 * 1000)); StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("runtime.preCellInfo="); stringBuilder.append(runtime.preCellInfo); diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java index 25bd90b2..6dcc9c44 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java @@ -449,7 +449,7 @@ public class SilentManager extends AbstractInvokeHandlerService { if (var7.contains(var8.toString())) { long var9 = var6.startTimeMillis - var2; int var11; - if (var9 < (long) (CoreService.alarmCycle * 60 * 1000) && var9 > 0L) { + if (var9 < (long) (mRuntime.getHeartBeatCycle() * 60 * 1000) && var9 > 0L) { var11 = Integer.parseInt(var6.start.substring(2, 4)); var5 = Integer.parseInt(var6.start.substring(5, 7)); AlarmHelper.setTimeAlarm(this.mContext, var11, var5, OTHER_ALARM_START); @@ -462,7 +462,7 @@ public class SilentManager extends AbstractInvokeHandlerService { } var9 = var6.endTimeMillis - var2; - if (var9 < (long) (CoreService.alarmCycle * 60 * 1000) && var9 > 0L) { + if (var9 < (long) (mRuntime.getHeartBeatCycle() * 60 * 1000) && var9 > 0L) { var11 = Integer.parseInt(var6.end.substring(2, 4)); var5 = Integer.parseInt(var6.end.substring(5, 7)); AlarmHelper.setTimeAlarm(this.mContext, var11, var5, OTHER_ALARM_END); @@ -512,7 +512,7 @@ public class SilentManager extends AbstractInvokeHandlerService { int hour, minutes; StringBuilder sblog; ICLogger.i("startTimeMillis - currenttime " + var9); - if (var9 < (long) (CoreService.alarmCycle * 60 * 1000) && var9 > 0L) { + if (var9 < (long) (mRuntime.getHeartBeatCycle() * 60 * 1000) && var9 > 0L) { hour = Integer.parseInt(silent.start.substring(2, 4)); minutes = Integer.parseInt(silent.start.substring(5, 7)); AlarmHelper.setTimeAlarm(this.mContext, hour, minutes, OTHER_ALARM_START); @@ -526,7 +526,7 @@ public class SilentManager extends AbstractInvokeHandlerService { var9 = silent.endTimeMillis - currenttime; ICLogger.i("endTimeMillis - currenttime " + var9); - if (var9 < (long) (CoreService.alarmCycle * 60 * 1000) && var9 > 0L) { + if (var9 < (long) (mRuntime.getHeartBeatCycle() * 60 * 1000) && var9 > 0L) { hour = Integer.parseInt(silent.end.substring(2, 4)); minutes = Integer.parseInt(silent.end.substring(5, 7)); AlarmHelper.setTimeAlarm(this.mContext, hour, minutes, OTHER_ALARM_END); @@ -573,13 +573,13 @@ public class SilentManager extends AbstractInvokeHandlerService { long var8 = var5.startTimeMillis - var2; int var10; int var11; - if (var8 < (long) (CoreService.alarmCycle * 60 * 1000) && var8 > 0L) { + if (var8 < (long) (mRuntime.getHeartBeatCycle() * 60 * 1000) && var8 > 0L) { var10 = Integer.parseInt(var5.start.substring(2, 4)); var11 = Integer.parseInt(var5.start.substring(5, 7)); AlarmHelper.setTimeAlarm(this.mContext, var10, var11, "com.enqualcomm.support.OTHER_HEARTRATE_ALARM_START"); } var8 = var5.endTimeMillis - var2; - if (var8 < (long) (CoreService.alarmCycle * 60 * 1000) && var8 > 0L) { + if (var8 < (long) (mRuntime.getHeartBeatCycle() * 60 * 1000) && var8 > 0L) { var10 = Integer.parseInt(var5.end.substring(2, 4)); var11 = Integer.parseInt(var5.end.substring(5, 7)); AlarmHelper.setTimeAlarm(this.mContext, var10, var11, "com.enqualcomm.support.OTHER_HEARTRATE_ALARM_END"); diff --git a/app/version_code.properties b/app/version_code.properties index 7d87ea71..fa766153 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Mon Jul 05 15:49:58 CST 2021 -VERSION_CODE=884 +#Mon Jul 05 21:42:01 CST 2021 +VERSION_CODE=885