From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 27 Jul 2021 07:57:17 +0000 (+0800)
Subject: add test control.
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=6850dfb7b0cc5a148e1b8f6cff48c199f33572bd;p=icworkservice.git

add test control.
---

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202107232037_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202107232037_release.apk
deleted file mode 100644
index 05e5234..0000000
Binary files a/app/IcL02WorkService/release/IcL02WorkService_V59_202107232037_release.apk and /dev/null differ
diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202107261412_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202107261412_release.apk
new file mode 100644
index 0000000..80a55c3
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V59_202107261412_release.apk differ
diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index 14e2c3d..384d4f0 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_202107232037_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202107232037_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_202107261412_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202107261412_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 db1d36a..b3025d6 100644
--- a/app/src/main/java/com/ic/work/SensorDataService.java
+++ b/app/src/main/java/com/ic/work/SensorDataService.java
@@ -205,11 +205,15 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
         isRunning = true;
         //获取一下，是否有校准值
         updateAdjustValue();
+        //获取到是否是测试模式，如果是测试模式的话会测数值300次
+        //persist.sys.hr_test
+        String isTestStr = IcSystemProperty.getSystemProperties("persist.sys.hr_test", "false");
+        boolean isTest = Boolean.parseBoolean(isTestStr);
         //这里处理指令，不可以开启子线程
         switch (testTaskEvent.sensorType) {
             case HEART_RATE_AND_OXYGEN:
                 //获取心率内容
-                if (testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD)) {
+                if (testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD) && isTest) {
                     BloodInfoHelper.MaxtestCount = 300;
                 } else {
                     BloodInfoHelper.MaxtestCount = 10;
@@ -221,7 +225,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
                 getTemperatureInfo();
                 break;
             case JUST_OXYGEN:
-                if (testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD)) {
+                if (testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD) && isTest) {
                     BloodInfoHelper.MaxtestCount = 300;
                 } else {
                     BloodInfoHelper.MaxtestCount = 10;
@@ -230,7 +234,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
                 justGetOxygen();
                 break;
             case JUST_HEART_RATE:
-                if (testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD)) {
+                if (testTaskEvent.from.equals(TestTaskEvent.From.CLIENT_CMD) && isTest) {
                     BloodInfoHelper.MaxtestCount = 300;
                 } else {
                     BloodInfoHelper.MaxtestCount = 10;
@@ -736,8 +740,10 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
                 new String[]{"blood_high_dx"}, null);
 
         if (bloodHighDxCursor != null) {
-            bloodHighDxValue = bloodHighDxCursor.getInt(0);
-            ICLogger.d("bloodHighDxValue == > " + bloodHighDxValue);
+            if (bloodHighDxCursor.moveToNext()) {
+                bloodHighDxValue = bloodHighDxCursor.getInt(0);
+                ICLogger.d("bloodHighDxValue == > " + bloodHighDxValue);
+            }
             bloodHighDxCursor.close();
         }
         Cursor bloodLowDxCursor = contentResolver.query(Uri.parse(SETTINGS),
@@ -745,8 +751,10 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
                 new String[]{"blood_low_dx"}, null);
 
         if (bloodLowDxCursor != null) {
-            bloodLowDxValue = bloodLowDxCursor.getInt(0);
-            ICLogger.d("bloodLowDxValue == > " + bloodLowDxValue);
+            if (bloodLowDxCursor.moveToNext()) {
+                bloodLowDxValue = bloodLowDxCursor.getInt(0);
+                ICLogger.d("bloodLowDxValue == > " + bloodLowDxValue);
+            }
             bloodLowDxCursor.close();
         }