From: snickersun <scy@incartech.cn>
Date: Thu, 17 Sep 2020 13:01:03 +0000 (+0800)
Subject: release V619
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=bdc7578de5f39a81edfa0ed19eec10575c938916;p=protocol_srv.git

release V619
后台测试心率后发送PPG测量结果给Launcher
---

diff --git a/app/release/ICSer_V618_2009171715_release.apk b/app/release/ICSer_V619_2009172055_release.apk
similarity index 78%
rename from app/release/ICSer_V618_2009171715_release.apk
rename to app/release/ICSer_V619_2009172055_release.apk
index 57404bc5..f20d21c5 100644
Binary files a/app/release/ICSer_V618_2009171715_release.apk and b/app/release/ICSer_V619_2009172055_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 1a4c58af..d7c21e73 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":618,"versionName":"2009171715","enabled":true,"outputFile":"ICSer_V618_2009171715_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V618_2009171715_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":619,"versionName":"2009172055","enabled":true,"outputFile":"ICSer_V619_2009172055_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V619_2009172055_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 0142d800..03a7fd71 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -13,6 +13,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.PowerManager;
+import android.util.Log;
 
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.Constants;
@@ -97,6 +98,15 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
 
     }
   }
+
+  private static final String HEART_ACTION = "com.ic.action.BLOOD_HEART";
+  private void sendHeartBroadcast(int count) {
+    Intent pedIntent = new Intent();
+    pedIntent.setAction(HEART_ACTION);
+    pedIntent.putExtra("BLOOD_HEART", count);
+    ICLogger.i("sendHeartBroadcast "+HEART_ACTION+" BLOOD_HEART "+count);
+    runtime.getContextProxy().context.sendBroadcast(pedIntent);
+  }
   public HeartRateManager(Runtime _runtime,Connection _connection){
     runtime=_runtime;
     connection=_connection;
@@ -114,7 +124,8 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
             //只有检测PPG成功，且网络连接中才发送数据
             if (runtime.getHRS().getHeartrateWorkingStat() == heartRateStatus.HEARTRATE_WORKINGSTAT.HEARTRATE_TEST_SUCCESS) {
               runtime.getHRS().setLastTestTime(TimeUtil.getSystemTime3());
-
+              //发送PPG给Launcher，显示在主界面用
+              sendHeartBroadcast(runtime.getHRS().getPPG());
               if(Runtime.practising==true){
                 ICLogger.i("自由锻炼中，设置测量心率！ "+runtime.getHRS().getPPG()+","+runtime.getHRS().getBPH()+","+runtime.getHRS().getBPL()+","+runtime.getHRS().getSpo2());
                 Runtime.healthInfo.setPPGECGData(runtime.getHRS().getPPG(),runtime.getHRS().getBPH(),runtime.getHRS().getBPL(),runtime.getHRS().getSpo2());
diff --git a/app/version_code.properties b/app/version_code.properties
index aa67d5ac..7eeed6c0 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 17 17:15:58 CST 2020
-VERSION_CODE=618
+#Thu Sep 17 20:55:50 CST 2020
+VERSION_CODE=619