update aidl interface.

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 79dcac5..2e4874f 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,7 +6,7 @@
     <option name="priority" value="Medium" />
     <option name="excludeFilter" value="" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/app/release/ICL02Blood_V60_202101061528_release.apk b/app/release/ICL02Blood_V61_202101071108_release.apk
similarity index 96%
rename from app/release/ICL02Blood_V60_202101061528_release.apk
rename to app/release/ICL02Blood_V61_202101071108_release.apk
index c4b7bf1..8032b7f 100644 (file)
Binary files a/app/release/ICL02Blood_V60_202101061528_release.apk and b/app/release/ICL02Blood_V61_202101071108_release.apk differ

diff --git a/app/release/ICL02Blood_V63_202101151445_release.apk b/app/release/ICL02Blood_V63_202101151445_release.apk
new file mode 100644 (file)
index 0000000..1bb6e89
Binary files /dev/null and b/app/release/ICL02Blood_V63_202101151445_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 904eee7..525c551 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":60,"versionName":"202101061528","enabled":true,"outputFile":"ICL02Blood_V60_202101061528_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V60_202101061528_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":63,"versionName":"202101151445","enabled":true,"outputFile":"ICL02Blood_V63_202101151445_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V63_202101151445_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl b/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
index 10af642..6adcce8 100644 (file)
--- a/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
+++ b/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
@@ -9,5 +9,5 @@ interface IHeartRateSensorService {
     //取消接口注册
     void unRegisterCallback(in IHeartRateSensorCallback callback);
     //获取心率相关数据0表示Alarm，1表示客户端用户发出的,3表示服务端发出的单次获取指令
-    oneway void getHeartRateInfo(int from,in String callbackTag);
+    void getHeartRateInfo(int from,in String callbackTag);
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
index 0c62fe9..16afa78 100644 (file)
--- a/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
+++ b/app/src/main/java/com/ic/blood/presenter/BloodPresenter.java
@@ -167,16 +167,19 @@ public class BloodPresenter {
         if (mService != null) {
             mObsStateTips.postValue(mContext.getString(R.string.tips_ing_check));
             //处理UI变化
-            try {
-                /**
-                 *  SERVER_CMD(0)服务端单次测量指令,
-                 *  ALARM_CMD(1)定时的测试指,
-                 *  CLIENT_CMD(2)用户UI主动的指令;
-                 */
-                mService.getHeartRateInfo(2, BloodPresenter.class.getName());
-            } catch (Exception e) {
-                IcLog.e(TAG, "startCheckBlood", e);
-            }
+            new Thread(() -> {
+                try {
+                    /**
+                     *  SERVER_CMD(0)服务端单次测量指令,
+                     *  ALARM_CMD(1)定时的测试指,
+                     *  CLIENT_CMD(2)用户UI主动的指令;
+                     */
+                    mService.getHeartRateInfo(2, BloodPresenter.class.getName());
+                } catch (
+                        Exception e) {
+                    IcLog.e(TAG, "startCheckBlood", e);
+                }
+            }).start();
         }
     }
 
@@ -234,7 +237,7 @@ public class BloodPresenter {
                     + " oxygen == > " + heartRate.getOxygen());
             mObsStateTips.postValue(mContext.getString(R.string.tips_finish_check));
             //最终结果
-            updateBoolValue(heartRate.getHeartRate(), heartRate.getBloodLow(),
+            updateBoolValue(heartRate.getBloodHeight(), heartRate.getBloodLow(),
                     heartRate.getHeartRate(), heartRate.getOxygen());
         }
 

diff --git a/app/version_code.properties b/app/version_code.properties
index e6f0a48..b794cb8 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jan 06 15:28:27 CST 2021
-VERSION_CODE=60
+#Fri Jan 15 14:45:50 CST 2021
+VERSION_CODE=63

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 204da20..1769fc0 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip