From 428d50067b1ed9faee8c873539e8c1865ae487dc Mon Sep 17 00:00:00 2001 From: "k.liang" Date: Thu, 12 May 2022 10:48:48 +0800 Subject: [PATCH] =?utf8?q?=E8=AE=BE=E7=BD=AEW100=E7=9A=84=E5=BF=83?= =?utf8?q?=E8=B7=B3=E4=B8=BA2=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/release/output.json | 2 +- app/src/main/java/com/ic/protocolSrv/Config.java | 3 +++ .../java/com/ic/protocolSrv/service/HeartRateManager.java | 3 +-- app/version_code.properties | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/release/output.json b/app/release/output.json index fd8ddd0d..d2ebb3b5 100644 --- 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 595970f4..483d6f2e 100644 --- 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 8f0ef5b1..89ce1f53 100644 --- 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 f0512813..50162d96 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Wed Mar 30 20:17:37 CST 2022 -VERSION_CODE=955 +#Tue Apr 19 17:06:37 CST 2022 +VERSION_CODE=962 -- 2.17.1