From: SnickerSun <scy@incartech.cn>
Date: Tue, 6 Jul 2021 08:40:12 +0000 (+0800)
Subject: release V59 2021070615638
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=19d4d9b630d68b995ad566cf4877436aa856d85b;p=icworkservice.git

release V59 2021070615638
UI 进行的心率，血氧检测可以持续300秒
---

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202105281513_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202105281513_release.apk
deleted file mode 100644
index 94d9c03..0000000
Binary files a/app/IcL02WorkService/release/IcL02WorkService_V59_202105281513_release.apk and /dev/null differ
diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202107061638_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202107061638_release.apk
new file mode 100644
index 0000000..776b867
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V59_202107061638_release.apk differ
diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index 6d243c9..654bdc4 100644
--- a/app/IcL02WorkService/release/output.json
+++ b/app/IcL02WorkService/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V59_202106301150_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202106301150_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V59_202107061638_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202107061638_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/work/SensorDataService.java b/app/src/main/java/com/ic/work/SensorDataService.java
index b3effd9..ef34178 100644
--- a/app/src/main/java/com/ic/work/SensorDataService.java
+++ b/app/src/main/java/com/ic/work/SensorDataService.java
@@ -76,7 +76,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
     private PowerManager.WakeLock wakeLock;
     private HandlerThread handlerThread;
     private Handler handler;
-
+    // 有效值的最大出现次数
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {
@@ -202,18 +202,34 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
         //当结果回来的时候，如果队列里没有了，那么就false了
         isRunning = true;
         //这里处理指令，不可以开启子线程
+
         switch (testTaskEvent.sensorType) {
             case HEART_RATE_AND_OXYGEN:
                 //获取心率内容
+                if(testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD)){
+                    BloodInfoHelper.MaxtestCount=300;
+                }else{
+                    BloodInfoHelper.MaxtestCount=10;
+                }
                 getHeartInfo();
                 break;
             case TEMPERATURE:
                 getTemperatureInfo();
                 break;
             case JUST_OXYGEN:
+                if(testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD)){
+                    BloodInfoHelper.MaxtestCount=300;
+                }else{
+                    BloodInfoHelper.MaxtestCount=10;
+                }
                 justGetOxygen();
                 break;
             case JUST_HEART_RATE:
+                if(testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD)){
+                    BloodInfoHelper.MaxtestCount=300;
+                }else{
+                    BloodInfoHelper.MaxtestCount=10;
+                }
                 justGetHeartRate();
                 break;
             default:
diff --git a/app/src/main/java/com/ic/work/hardware/BloodInfoHelper.java b/app/src/main/java/com/ic/work/hardware/BloodInfoHelper.java
index 01c7880..e4c1cee 100644
--- a/app/src/main/java/com/ic/work/hardware/BloodInfoHelper.java
+++ b/app/src/main/java/com/ic/work/hardware/BloodInfoHelper.java
@@ -105,7 +105,7 @@ public class BloodInfoHelper implements SensorEventListener {
         //如果有数据回来，那么就重新设置下一次超时
         ppgLooper.postDelayed(mTask, TIME_OUT_VALUE);
     }
-
+    public static int MaxtestCount = 10;
     //10秒还没有数据回来，那么就结束测试
     public static final int TIME_OUT_VALUE = 10 * 1000;
 
@@ -231,7 +231,7 @@ public class BloodInfoHelper implements SensorEventListener {
                 ndkLow = HardwareUtils.getNdkLowBloodValue();
                 oxygen = HardwareUtils.getNdkOxygenValue();
                 dispatchPPG();
-                if (checkCount > 10 || invalidateTime > 30) {
+                if (checkCount > MaxtestCount || invalidateTime > 30) {
                     handleResultOtherBlood();
                 } else {
                     if (!continueTest) {
@@ -313,7 +313,7 @@ public class BloodInfoHelper implements SensorEventListener {
             // isPPGTesting = true;// (ICJniUtils.isPPGStarted() == 1);
             dispatchPPG();
             /*[0]---心率；[1]---血压高压；[2]---血压低压；[3]---血氧；[4]---佩戴检测（1--脱手，2--上手）；*/
-            if (checkCount > 10 || invalidateTime > 30) {
+            if (checkCount > MaxtestCount || invalidateTime > 30) {
                 //结束了，干掉超时任务
                 ppgLooper.removeCallbacks(mTask);
                 handleResult();