update aidl interface.

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2e4874f..9f83622 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="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" 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_V63_202101151445_release.apk b/app/release/ICL02Blood_V64_202101181017_release.apk
similarity index 67%
rename from app/release/ICL02Blood_V63_202101151445_release.apk
rename to app/release/ICL02Blood_V64_202101181017_release.apk
index 1bb6e89..c5aa770 100644 (file)
Binary files a/app/release/ICL02Blood_V63_202101151445_release.apk and b/app/release/ICL02Blood_V64_202101181017_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 525c551..5c14733 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"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
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":64,"versionName":"202101181017","enabled":true,"outputFile":"ICL02Blood_V64_202101181017_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Blood_V64_202101181017_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl b/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
index 12554f5..9b75d7f 100644 (file)
--- a/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
+++ b/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
@@ -6,11 +6,11 @@ import com.ic.work.domain.HeartRate;
 
 interface IHeartRateSensorCallback {
      //获取到了数据，最终数据
-     void onHeartRateGet(in HeartRate heartRate);
+     oneway void onHeartRateGet(in HeartRate heartRate);
      //数据更新中
-     void onHeartRateUpdate(in HeartRate heartRate);
+     oneway void onHeartRateUpdate(in HeartRate heartRate);
      //正在获取数据
-     void onGettingData();
+     oneway void onGettingData();
      //等待中
-     void onWaiting();
+     oneway void onWaiting();
 }
\ 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 6adcce8..10af642 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表示服务端发出的单次获取指令
-    void getHeartRateInfo(int from,in String callbackTag);
+    oneway 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 16afa78..745df8a 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,19 +167,16 @@ public class BloodPresenter {
         if (mService != null) {
             mObsStateTips.postValue(mContext.getString(R.string.tips_ing_check));
             //处理UI变化
-            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();
+            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);
+            }
         }
     }
 

diff --git a/app/version_code.properties b/app/version_code.properties
index b794cb8..3d6a58c 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Jan 15 14:45:50 CST 2021
-VERSION_CODE=63
+#Mon Jan 18 10:17:04 CST 2021
+VERSION_CODE=64