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 57404bc..f20d21c 100644 (file)
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 1a4c58a..d7c21e7 100644 (file)
--- 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 0142d80..03a7fd7 100644 (file)
--- 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;\r
 import android.os.Messenger;\r
 import android.os.PowerManager;\r
+import android.util.Log;\r
 \r
 import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.Constants;\r
@@ -97,6 +98,15 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
 \r
     }\r
   }\r
+\r
+  private static final String HEART_ACTION = "com.ic.action.BLOOD_HEART";\r
+  private void sendHeartBroadcast(int count) {\r
+    Intent pedIntent = new Intent();\r
+    pedIntent.setAction(HEART_ACTION);\r
+    pedIntent.putExtra("BLOOD_HEART", count);\r
+    ICLogger.i("sendHeartBroadcast "+HEART_ACTION+" BLOOD_HEART "+count);\r
+    runtime.getContextProxy().context.sendBroadcast(pedIntent);\r
+  }\r
   public HeartRateManager(Runtime _runtime,Connection _connection){\r
     runtime=_runtime;\r
     connection=_connection;\r
@@ -114,7 +124,8 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
             //只有检测PPG成功，且网络连接中才发送数据\r
             if (runtime.getHRS().getHeartrateWorkingStat() == heartRateStatus.HEARTRATE_WORKINGSTAT.HEARTRATE_TEST_SUCCESS) {\r
               runtime.getHRS().setLastTestTime(TimeUtil.getSystemTime3());\r
-\r
+              //发送PPG给Launcher，显示在主界面用\r
+              sendHeartBroadcast(runtime.getHRS().getPPG());\r
               if(Runtime.practising==true){\r
                 ICLogger.i("自由锻炼中，设置测量心率！ "+runtime.getHRS().getPPG()+","+runtime.getHRS().getBPH()+","+runtime.getHRS().getBPL()+","+runtime.getHRS().getSpo2());\r
                 Runtime.healthInfo.setPPGECGData(runtime.getHRS().getPPG(),runtime.getHRS().getBPH(),runtime.getHRS().getBPL(),runtime.getHRS().getSpo2());\r

diff --git a/app/version_code.properties b/app/version_code.properties
index aa67d5a..7eeed6c 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 17 17:15:58 CST 2020\r
-VERSION_CODE=618\r
+#Thu Sep 17 20:55:50 CST 2020\r
+VERSION_CODE=619\r