设置W100的心跳为2分钟

diff --git a/app/release/output.json b/app/release/output.json
index fd8ddd0..d2ebb3b 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":955,"versionName":"2203302017","enabled":true,"outputFile":"ICProtocol81_V955_2203302017_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol81_V955_2203302017_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":962,"versionName":"2204191706","enabled":true,"outputFile":"ICProtocol81_V962_2204191706_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol81_V962_2204191706_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/protocolSrv/Config.java b/app/src/main/java/com/ic/protocolSrv/Config.java
index 595970f..483d6f2 100644 (file)
--- a/app/src/main/java/com/ic/protocolSrv/Config.java
+++ b/app/src/main/java/com/ic/protocolSrv/Config.java
@@ -376,6 +376,9 @@ public class Config {
         if (Config.protocol_no == Config.PROTOCOL_UNKNOWN) {
             Config.HeartBeatAlarmCycle = 65535; //不识别的协议，就设置一个很大的数据相当于没有心跳，这样更省电
         }
+        if(Config.custom_name.equals("18cube")){ //w100的设置为2分钟心跳
+            Config.HeartBeatAlarmCycle = 2;
+        }
         runtime.setHeartBeatCycle(Config.getHeartBeatCycle(runtime.getContextProxy().context));
     }
 

diff --git a/app/src/main/java/com/ic/protocolSrv/service/HeartRateManager.java b/app/src/main/java/com/ic/protocolSrv/service/HeartRateManager.java
index 8f0ef5b..89ce1f5 100644 (file)
--- a/app/src/main/java/com/ic/protocolSrv/service/HeartRateManager.java
+++ b/app/src/main/java/com/ic/protocolSrv/service/HeartRateManager.java
@@ -494,8 +494,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
             }
         }
         //开始去测试
-        ICLogger.d("from == >  " + from + " HeartRateManager "
-                + " " + Log.getStackTraceString(new Throwable()));
+        ICLogger.d("from == >  " + from);
         new Thread(() -> {
             try {
                 if (heartRateSensorService != null) {

diff --git a/app/version_code.properties b/app/version_code.properties
index f051281..50162d9 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Mar 30 20:17:37 CST 2022\r
-VERSION_CODE=955\r
+#Tue Apr 19 17:06:37 CST 2022\r
+VERSION_CODE=962\r