release ICProtocol8.1_V922

修复soson 没有回复问题。
添加 心率，体温 内部测试接口。

diff --git a/app/release/ICProtocol8.1_V915_2108162337_release.apk b/app/release/ICProtocol8.1_V922_2109030832_release.apk
similarity index 74%
rename from app/release/ICProtocol8.1_V915_2108162337_release.apk
rename to app/release/ICProtocol8.1_V922_2109030832_release.apk
index 2d3cc3c..41cc7d0 100644 (file)
Binary files a/app/release/ICProtocol8.1_V915_2108162337_release.apk and b/app/release/ICProtocol8.1_V922_2109030832_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 800608a..a154011 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":921,"versionName":"2108311109","enabled":true,"outputFile":"ICProtocol8.1_V921_2108311109_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol8.1_V921_2108311109_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":922,"versionName":"2109030832","enabled":true,"outputFile":"ICProtocol8.1_V922_2109030832_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol8.1_V922_2109030832_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/protocolSrv/CoreService.java b/app/src/main/java/com/ic/protocolSrv/CoreService.java
index 167e952..2465a3a 100644 (file)
--- a/app/src/main/java/com/ic/protocolSrv/CoreService.java
+++ b/app/src/main/java/com/ic/protocolSrv/CoreService.java
@@ -1574,7 +1574,7 @@ public class CoreService extends Service {
         ICLogger.i("get and set PPGTestCycle " + heartRateDetectAlarmCycleMinutes);
 //        }
         StringBuilder sb = new StringBuilder();
-        if (heartRateDetectAlarmCycleMinutes > 5) {
+        if (heartRateDetectAlarmCycleMinutes >= 5) {
             AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context, heartRateDetectAlarmCycleMinutes, ACTION_HEATR_RATE_START);
         }
 

diff --git a/app/src/main/java/com/ic/protocolSrv/ICSmsManager.java b/app/src/main/java/com/ic/protocolSrv/ICSmsManager.java
index 9c33750..5f6abbb 100644 (file)
--- a/app/src/main/java/com/ic/protocolSrv/ICSmsManager.java
+++ b/app/src/main/java/com/ic/protocolSrv/ICSmsManager.java
@@ -1260,8 +1260,20 @@ public class ICSmsManager extends BroadcastReceiver {
                 LanguageUtils.changeLanguageByIndex(runtime.getContextProxy().context, list[1]);
             }
 
+        } else if (cmd.startsWith("hrtstart,")) {
+            String list[] = cmd.split(",");
+            if (list.length == 2) {
+                int freq = 0;
+                try {
+                    freq = Integer.parseInt(list[1]);
+                } catch (Exception e) {
+                    freq = 0;
+                }
+                ICLogger.i("收到短信指令：测量体温 " + freq + " 秒("+freq/60+" 分)一次。");
+                CoreService.getInstance().setHeartRateDetectAlarm(freq/60);
 
-        } else if (cmd.startsWith("BPTE,")) {
+            }
+        } else if (cmd.startsWith("wdstart,")) {
 
             String list[] = cmd.split(",");
             if (list.length == 2) {
@@ -1271,12 +1283,9 @@ public class ICSmsManager extends BroadcastReceiver {
                 } catch (Exception e) {
                     freq = 0;
                 }
-                ICLogger.i("收到短信指令：测量体温 " + freq + "分钟一次。");
-                Config.setTemperatureTestCycle(runtime, freq * 60);
+                ICLogger.i("收到短信指令：测量体温 " + freq + "秒一次。");
+                Config.setTemperatureTestCycle(runtime, freq);
                 CoreService.getInstance().setTempAlarm(true);
-                if (runtime.check_stat_do_temp_test())
-                    TemperatureUtil.getInstance().doTempTestInThread(FROM_SERVER);
-
             }
         } else if (cmd.startsWith("BPXL")) {
 

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 8348596..0f74e2e 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -1929,7 +1929,7 @@ public class protocol_fzd {
                 break;
             case SOSON:
                 ICLogger.d("收到服务器设置的SOS开发消息..");
-                handleSettings(type, data, mRuntime);
+                handleSOSON(cmd,data,mRuntime,mConnection);
                 break;
             case IP:
                 //设置服务器IP
@@ -2144,8 +2144,14 @@ public class protocol_fzd {
     private static final String BOOT_OFF_ACTION_OFF = "0";
     private static final String BOOT_OFF_ACTION_ON = "1";
     private static final long ONE_DAY = 86400000L;
+    public static StringMessage SOSON() {
+        return genFZDCMD(cmdMap.get(CMD_TYPE.SOSON));
+    }
 
-
+    private void handleSOSON(String cmd, String data, Runtime mRuntime,Connection connection) {
+        connection.send(SOSON());
+        handleSettings(CMD_TYPE.SOSON, data, mRuntime);
+    }
     /**
      * 设置开关机时间
      * <p>

diff --git a/app/version_code.properties b/app/version_code.properties
index 364f3ee..ff47f1b 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Aug 31 11:09:15 CST 2021\r
-VERSION_CODE=921\r
+#Fri Sep 03 08:32:22 CST 2021\r
+VERSION_CODE=922\r

diff --git a/local.properties b/local.properties
index 049e4f5..65b856e 100644 (file)
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.\r
 # For customization when using a Version Control System, please read the\r
 # header note.\r
-#Wed Aug 25 18:55:18 CST 2021\r
-sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r
+#Thu Sep 02 23:13:13 CST 2021\r
+sdk.dir=D\:\\Android\\Sdk\r