From: snickersun <snickersun@qq.com>
Date: Wed, 29 Jul 2020 17:27:11 +0000 (+0800)
Subject: release V464
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=74c187f45d8e886c652dc0de5e7b1e524a03e316;p=protocol_srv.git

release V464
修正远程测试心率血压血氧，血氧值总是为0 的bug
---

diff --git a/app/release/ICSer_V461_2007280710_release.apk b/app/release/ICSer_V464_2007300125_release.apk
similarity index 79%
rename from app/release/ICSer_V461_2007280710_release.apk
rename to app/release/ICSer_V464_2007300125_release.apk
index 6355a72b..c698f93e 100644
Binary files a/app/release/ICSer_V461_2007280710_release.apk and b/app/release/ICSer_V464_2007300125_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index e1254de9..bfb3d4b0 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":463,"versionName":"2007292110","enabled":true,"outputFile":"ICSer_V463_2007292110_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V463_2007292110_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":464,"versionName":"2007300125","enabled":true,"outputFile":"ICSer_V464_2007300125_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V464_2007300125_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 29ffbedc..67c9feb5 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -131,6 +131,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
     intent.putExtra("ppg",runtime.getHRS().getPPG());
     intent.putExtra("bph",runtime.getHRS().getBPH());
     intent.putExtra("bpl",runtime.getHRS().getBPL());
+    intent.putExtra("spo2",runtime.getHRS().getSpo2());
     intent.putExtra("time",runtime.getHRS().getTestTime());
     runtime.getContextProxy().context.sendBroadcast(intent);
   }
@@ -192,13 +193,13 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
     }
 
     if (currentStat==heartRateStatus.HEARTRATE_WORKINGSTAT.HEARTRATE_TEST_SUCCESS){
-      runtime.getHRS().setLastHeartrate(PPG,BPH,BPL);
+      runtime.getHRS().setLastHeartrate(PPG,BPH,BPL,SPo2);
       delayCount--;
       if (delayCount<0) //达到延迟时间后，停止检测并发送数据
         sendAndStopPPG();
 
     }else{
-      runtime.getHRS().setLastHeartrate(0,0,0);
+      runtime.getHRS().setLastHeartrate(0,0,0,0);
     }
     runtime.getHRS().setHeartrateStat(currentStat);
 
@@ -324,7 +325,8 @@ public static void triggerPPGtest(){
         String bph = bundle3.getString(key_bph);
         String bpl = bundle3.getString(key_bpl);
         String spo2 = bundle3.getString(key_spo2);
-        if (ppg == null || bph == null || bpl==null || spo2==null ||ppg.isEmpty()||bph.isEmpty()||bpl.isEmpty()||spo2.isEmpty()) {
+
+        if (ppg == null || bph == null || bpl==null  ||ppg.isEmpty()||bph.isEmpty()||bpl.isEmpty()) {
           ICLogger.i("MSG_WHAT_PPG Data is null or empty ! Skip!");
           callback(message.replyTo, Constants.RESULT_ERROR);
 
diff --git a/app/version_code.properties b/app/version_code.properties
index edfef73e..a64035cd 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jul 29 21:10:25 CST 2020
-VERSION_CODE=463
+#Thu Jul 30 01:25:40 CST 2020
+VERSION_CODE=464
diff --git a/local.properties b/local.properties
index 0f01e021..319954e3 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jul 28 09:11:20 CST 2020
-sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk
+#Thu Jul 30 00:59:55 CST 2020
+sdk.dir=D\:\\Android\\Sdk