From: SnickerSun <scy@incartech.cn>
Date: Wed, 15 Sep 2021 10:52:16 +0000 (+0800)
Subject: release ICSer_V954_2109151840_release
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=1bc777d327ebf79170c8b0afd5bd2e6218ee4a7a;p=icsupport.git

release ICSer_V954_2109151840_release
更新FZD协议hrtstart，添加定时测量心率支持
---

diff --git a/app/release/ICSer_V954_2109151840_release.apk b/app/release/ICSer_V954_2109151840_release.apk
new file mode 100644
index 00000000..95153e99
Binary files /dev/null and b/app/release/ICSer_V954_2109151840_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 341a7f8d..6de95d25 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":953,"versionName":"2109151532","enabled":true,"outputFile":"ICSer_V953_2109151532_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V953_2109151532_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":954,"versionName":"2109151840","enabled":true,"outputFile":"ICSer_V954_2109151840_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V954_2109151840_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
index c2cfe091..94a3978b 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -431,7 +431,9 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
                     ICLogger.i("customname = " + customname);
                     if (!Boolean.parseBoolean(isGh301) || customname.equals("AA")) {
                         heartRateSensorService.getHeartRateInfo(from, HeartRateManager.class.getName());
+                        ICLogger.i("!gh301 or  AA " );
                     } else {
+                        ICLogger.i("gh301 && !AA" );
                         //如果是的话，就要判断类型了
                         //这个类型在Config里，在parseCMD里进行设置
                         //在这里进行使用
diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java
index 105ac10c..4990e411 100644
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -1389,11 +1389,41 @@ public class protocol_fzd {
         return genFZDCMD(cmdMap.get(CMD_TYPE.hrtstart));
     }
 
-    public void handleHrtstart(Connection connection) {
 
+    public void handleHrtstart(Connection connection, Runtime runtime, String cmd, String data) {
+        //[IC*334588000000156*len*hrtstart,x]
+        //  x 为上传间隔时间，单位秒,连续上传时最小时间不小于 300 秒，最大不超过 65535.
+        //  实例：[IC*334588000000156*len*hrtstart,300]
+        //终端会每隔 300 秒检测一次心率
+        //
+        //x 为 1 则代表终端心率单次上传，上传完后自动关闭。x 为 0 则代表终端心率上传关闭。
+
+        int testcycle = 0;
+        try {
+            testcycle = Integer.parseInt(data);
+        } catch (Exception e) {
+            ICLogger.e(e.getMessage());
+            testcycle = 0;
+            ICLogger.i("Hrtstart format error!");
+            return;
+        }
         connection.send(hrtstart());
+
+        if (testcycle >= 0 && testcycle < 65535) {
+            ICLogger.i("收到服务器指令：设置心率周期 " + testcycle + "秒 相当于 " + testcycle / 60 + "分钟");
+            try {
+                //发送重置PPGCycle的广播，会在CoreServer里面执行
+                CoreService.getInstance().setHeartRateDetectAlarm(testcycle / 60);
+            } catch (Exception e) {
+                ICLogger.e(e.getMessage(), e);
+            }
+        } else {
+            ICLogger.i("收到服务器指令：设置心率周期超限[0~65535] " + testcycle + "秒 相当于 " + testcycle / 60 + "分钟");
+        }
+
     }
 
+
     public static StringMessage FIND() {
         return genFZDCMD(cmdMap.get(CMD_TYPE.FIND));
     }
@@ -1406,7 +1436,6 @@ public class protocol_fzd {
         return genFZDCMD(cmdMap.get(CMD_TYPE.SOS));
     }
 
-
     public void handleSOS(Connection connection, Runtime runtime, String cmd, String data) {
         ICLogger.d("data is == > " + data);
         connection.send(SOS());
@@ -1672,11 +1701,10 @@ public class protocol_fzd {
                 mConnection.DeliverCMDMessageToSystem("poweroff", cmd);
                 break;
             case hrtstart:
-                handleHrtstart(mConnection);
                 ICLogger.i("收到服务器心率检测命令");
                 Config.testType = HeartRateOxygenTestType.JUST_HEART_RATE;
-                if (mRuntime.check_stat_do_ppg_test())
-                    HeartRateManager.getInstance().triggerPPGTest(FROM_SERVER);
+                handleHrtstart(mConnection, mRuntime, cmd, data);
+
                 break;
             case bldstart:
                 handleBldstart(mConnection);
diff --git a/app/version_code.properties b/app/version_code.properties
index 59034cd5..4c6ead6f 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Sep 15 15:32:01 CST 2021
-VERSION_CODE=953
+#Wed Sep 15 18:40:20 CST 2021
+VERSION_CODE=954