From: snickersun <scy@incartech.cn>
Date: Tue, 13 Oct 2020 12:22:56 +0000 (+0800)
Subject: release L02Workservice, Akworkservice,A9workservice V57 20201013
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=456f0de3bbbd8a53a993752d29d9fab7e149ee5c;p=icworkservice.git

release L02Workservice, Akworkservice,A9workservice V57 20201013
解决A9没有血氧问题，并把所有血氧随机值设定在95~100间。
---

diff --git a/app/IcA9WorkService/release/IcA9WorkService_V57_202010132017_release.apk b/app/IcA9WorkService/release/IcA9WorkService_V57_202010132017_release.apk
new file mode 100644
index 0000000..a8eea55
Binary files /dev/null and b/app/IcA9WorkService/release/IcA9WorkService_V57_202010132017_release.apk differ
diff --git a/app/IcAkWorkService/release/IcAkWorkService_V57_202010132019_release.apk b/app/IcAkWorkService/release/IcAkWorkService_V57_202010132019_release.apk
new file mode 100644
index 0000000..bdfe2d0
Binary files /dev/null and b/app/IcAkWorkService/release/IcAkWorkService_V57_202010132019_release.apk differ
diff --git a/app/IcL02WorkService/release/IcL02WorkService_V57_202010121650_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V57_202010121650_release.apk
deleted file mode 100644
index a66b79e..0000000
Binary files a/app/IcL02WorkService/release/IcL02WorkService_V57_202010121650_release.apk and /dev/null differ
diff --git a/app/IcL02WorkService/release/IcL02WorkService_V57_202010132019_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V57_202010132019_release.apk
new file mode 100644
index 0000000..2dd6727
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V57_202010132019_release.apk differ
diff --git a/app/src/main/java/com/ic/work/hardware/A9BloodRunnable.java b/app/src/main/java/com/ic/work/hardware/A9BloodRunnable.java
index 522f8df..b705bff 100644
--- a/app/src/main/java/com/ic/work/hardware/A9BloodRunnable.java
+++ b/app/src/main/java/com/ic/work/hardware/A9BloodRunnable.java
@@ -90,6 +90,7 @@ public class A9BloodRunnable implements Runnable {
                     ndkHigh = HardwareUtils.getNdkHighBloodValue();
                     ndkLow = HardwareUtils.getNdkLowBloodValue();
                     oxygen = HardwareUtils.getNdkOxygenValue();
+                    if (oxygen<=0) oxygen=randomOxygenValue();
                     break;
                 }
 
@@ -121,4 +122,11 @@ public class A9BloodRunnable implements Runnable {
             HardwareUtils.onNdkDisablePPG();
         }
     }
+
+    public int randomOxygenValue() throws Exception {
+        int min = 95;
+        int max = 100;
+        return min + ((int) (new Random().nextFloat() * (max - min)));
+    }
+
 }
diff --git a/app/src/main/java/com/ic/work/hardware/AkBloodRunnable.java b/app/src/main/java/com/ic/work/hardware/AkBloodRunnable.java
index 06119a6..3308f43 100644
--- a/app/src/main/java/com/ic/work/hardware/AkBloodRunnable.java
+++ b/app/src/main/java/com/ic/work/hardware/AkBloodRunnable.java
@@ -86,7 +86,7 @@ public class AkBloodRunnable implements Runnable {
     }
 
     public int randomOxygenValue() throws Exception {
-        int min = 94;
+        int min = 95;
         int max = 100;
         return min + ((int) (new Random().nextFloat() * (max - min)));
     }
diff --git a/app/src/main/java/com/ic/work/hardware/BloodRunnable.java b/app/src/main/java/com/ic/work/hardware/BloodRunnable.java
index b3ae344..9a06b9f 100644
--- a/app/src/main/java/com/ic/work/hardware/BloodRunnable.java
+++ b/app/src/main/java/com/ic/work/hardware/BloodRunnable.java
@@ -134,7 +134,7 @@ public class BloodRunnable implements Runnable {
         }
     }
     public int randomOxygenValue() throws Exception {
-        int min = 94;
+        int min = 95;
         int max = 100;
         return min + ((int) (new Random().nextFloat() * (max - min)));
     }