From: snickersun <scy@incartech.cn>
Date: Tue, 4 Aug 2020 13:15:28 +0000 (+0800)
Subject: 兼容心率检测 旧的接口，广播出来不带spo2就 随机创建一个。
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=30f5847c93775ff123b43134a9f79f57514f7d82;p=protocol_srv.git

兼容心率检测 旧的接口，广播出来不带spo2就 随机创建一个。
---

diff --git a/app/app.iml b/app/app.iml
index 02f0a930..0bdf7ccf 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -101,15 +101,15 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project"/>
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project"/>
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\android-logging-log4j-1.0.3.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\ftp4j-1.7.2.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\log4j-1.2.17.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\mail.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\activation.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\additionnal.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\frameworks-full-debug.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\Snicker\icsupport\app\libs\telephony_common-full-debug.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\android-logging-log4j-1.0.3.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\ftp4j-1.7.2.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\log4j-1.2.17.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\mail.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\activation.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\additionnal.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\frameworks-full-debug.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\telephony_common-full-debug.jar:unspecified@jar" level="project"/>
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>
     <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>
@@ -129,7 +129,6 @@
     <orderEntry type="library" name="Gradle: com.kymjs.rxvolley:rxvolley:1.1.3@aar" level="project"/>
     <orderEntry type="library" name="Gradle: io.reactivex:rxandroid:1.1.0@aar" level="project"/>
     <orderEntry type="module" module-name="dNSCache"/>
-    <orderEntry type="module" module-name="dNSCache"/>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>
   </component>
 </module>
diff --git a/app/release/ICSer_V473_2008041826_release.apk b/app/release/ICSer_V473_2008041826_release.apk
deleted file mode 100644
index 5e04da3a..00000000
Binary files a/app/release/ICSer_V473_2008041826_release.apk and /dev/null differ
diff --git a/app/release/output.json b/app/release/output.json
index 02b605e7..5364443c 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":473,"versionName":"2008041826","enabled":true,"outputFile":"ICSer_V473_2008041826_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V473_2008041826_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":474,"versionName":"2008042035","enabled":true,"outputFile":"ICSer_V474_2008042035_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V474_2008042035_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 c2725926..fd0b17b9 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -24,6 +24,7 @@ import com.enqualcomm.support.utils.NettyConnection;
 import com.enqualcomm.support.utils.SimSignalUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 
+import java.util.Random;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
@@ -329,7 +330,11 @@ public static void triggerPPGtest(){
 
           return true;
         }
-
+          if (spo2==null || (spo2!=null && Integer.parseInt(spo2 )<=0) ){
+            Random r = new Random();
+            int randomint = r.nextInt(98 - 95) + 95;
+            spo2=String.valueOf(randomint);
+          }
 
 
             if (((NettyConnection) connection).isServerConnected()) {
diff --git a/app/version_code.properties b/app/version_code.properties
index d6747ec5..1c552a92 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Aug 04 18:26:37 CST 2020
-VERSION_CODE=473
+#Tue Aug 04 20:35:30 CST 2020
+VERSION_CODE=474
diff --git a/local.properties b/local.properties
index 319954e3..aad8a511 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.
-#Thu Jul 30 00:59:55 CST 2020
-sdk.dir=D\:\\Android\\Sdk
+#Thu Jul 30 18:51:06 CST 2020
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk