deleted comment of aidl.

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 79dcac5..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="true" project-jdk-name="JDK" 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/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl b/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
index 12554f5..e9baea3 100644 (file)
--- a/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
+++ b/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
@@ -5,12 +5,9 @@ package com.ic.work;
 import com.ic.work.domain.HeartRate;
 
 interface IHeartRateSensorCallback {
-     //获取到了数据，最终数据
+
      void onHeartRateGet(in HeartRate heartRate);
-     //数据更新中
      void onHeartRateUpdate(in HeartRate heartRate);
-     //正在获取数据
      void onGettingData();
-     //等待中
      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 10af642..70a7dd5 100644 (file)
--- a/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
+++ b/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
@@ -4,10 +4,7 @@ package com.ic.work;
 import com.ic.work.IHeartRateSensorCallback;
 
 interface IHeartRateSensorService {
-   //注册接口
     void registerCallback(in IHeartRateSensorCallback callback,in String callbackTag);
-    //取消接口注册
     void unRegisterCallback(in IHeartRateSensorCallback callback);
-    //获取心率相关数据0表示Alarm，1表示客户端用户发出的,3表示服务端发出的单次获取指令
     oneway void getHeartRateInfo(int from,in String callbackTag);
 }
\ No newline at end of file

diff --git a/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
index 9364360..ea3c7f1 100644 (file)
--- a/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
+++ b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
@@ -4,12 +4,9 @@ package com.ic.work;
 import com.ic.work.domain.Temperature;
 
 interface ITempSensorCallback {
-    //获取到了温度数据，最终数据
+
     void onTemperatureGet(in Temperature temperature);
-    //温度数据更新中
     void onTemperatureUpdating(in Temperature temperature);
-   //正在获取数据
    void onGettingData();
-   //等待中
    void onWaiting();
 }
\ No newline at end of file

diff --git a/app/src/main/aidl/com/ic/work/ITempSensorService.aidl b/app/src/main/aidl/com/ic/work/ITempSensorService.aidl
index 3d1847e..4941edd 100644 (file)
--- a/app/src/main/aidl/com/ic/work/ITempSensorService.aidl
+++ b/app/src/main/aidl/com/ic/work/ITempSensorService.aidl
@@ -3,11 +3,7 @@ package com.ic.work;
 import com.ic.work.ITempSensorCallback;
 
 interface ITempSensorService {
-    //注册接口
     void registerCallback(in ITempSensorCallback callback,in String callbackTag);
-    //取消接口注册
     void unRegisterCallback(in ITempSensorCallback callback);
-    //获取体温:0表示Alarm，1表示客户端用户发出的,3表示服务端发出的单次获取指令
-    //callbackTag,可以使用报名+类名的字符串组合
     oneway void getTemperatureInfo(int from,in String callbackTag);
 }
\ 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 770c460..a93f5c5 100644 (file)
--- a/app/src/main/java/com/ic/work/SensorDataService.java
+++ b/app/src/main/java/com/ic/work/SensorDataService.java
@@ -203,7 +203,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
                 @Override
                 public void getHeartRateInfo(int from, String tag) {
                     jxHeartRateMode = 2;
-                    IcLog.d(TAG, "getHeartRateInfo..." + from);
+                    IcLog.d(TAG, "getHeartRateInfo..." + from + " tag == > " + tag);
                     createTask(from, TestTaskEvent.SensorType.HEART_RATE, tag);
                 }
             };

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbd189e..68344a5 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
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip