修改了AIDL文件

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202110201457_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202110201457_release.apk
deleted file mode 100644 (file)
index 27705e7..0000000
Binary files a/app/IcL02WorkService/release/IcL02WorkService_V59_202110201457_release.apk and /dev/null differ

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202110252102_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202110252102_release.apk
new file mode 100644 (file)
index 0000000..743a358
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V59_202110252102_release.apk differ

diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index fd926ee..fc0c996 100644 (file)
--- 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_202110201457_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202110201457_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_202110252102_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202110252102_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/aidl/com/ic/work/IExInfoService.aidl b/app/src/main/aidl/com/ic/work/IExInfoService.aidl
index a11974e..b46cb80 100644 (file)
--- a/app/src/main/aidl/com/ic/work/IExInfoService.aidl
+++ b/app/src/main/aidl/com/ic/work/IExInfoService.aidl
@@ -5,19 +5,19 @@ import com.ic.work.IExInfoCallback;
 
 interface IExInfoService {
   //获取主板温度
-  oneway void getBoardTemperature();
+  void getBoardTemperature();
   //设置主办温度的阀值和测试周期
   //如果没有设置测试周期，越接近阀值温度，测试越频繁，离阀值温度越远
   //测试不那么频繁
-  oneway void setBoardTempCheckCycle(in int second);
+  void setBoardTempCheckCycle(in int second);
   //如果没有设置，默认是50度
-  oneway void setBoardTempTopLimit(in float temp);
+  void setBoardTempTopLimit(in float temp);
   //开启主板温度监听
-  oneway void triggerBoardTempListener(in boolean isListener);
+  void triggerBoardTempListener(in boolean isListener);
   //注册接口
-  oneway void registerCallback(in IExInfoCallback callback);
+  void registerCallback(in IExInfoCallback callback);
   //取消接口注册
-  oneway void unregisterCallback(in IExInfoCallback callback);
+  void unregisterCallback(in IExInfoCallback callback);
   //当前监听状态
   boolean isListening();
 }
\ 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 103950c..3c91ca6 100644 (file)
--- a/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
+++ b/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
@@ -6,9 +6,9 @@ import com.ic.work.domain.HeartRate;
 
 interface IHeartRateSensorCallback {
 
-     oneway void onHeartRateGet(in HeartRate heartRate);
-     oneway void onHeartRateUpdate(in HeartRate heartRate);
-     oneway void onGettingData();
-     oneway void onWaiting();
-     oneway void onNoWear();
+     void onHeartRateGet(in HeartRate heartRate);
+     void onHeartRateUpdate(in HeartRate heartRate);
+     void onGettingData();
+     void onWaiting();
+     void onNoWear();
 }
\ 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 006912a..540a3d7 100644 (file)
--- a/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
+++ b/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
@@ -6,8 +6,8 @@ import com.ic.work.IHeartRateSensorCallback;
 interface IHeartRateSensorService {
     void registerCallback(in IHeartRateSensorCallback callback,in String callbackTag);
     void unRegisterCallback(in IHeartRateSensorCallback callback);
-    oneway void getHeartRateInfo(in int from,in String callbackTag);
-    oneway void getJustOxygenInfo(in int from,in String callbackTag);
-    oneway void getJustHeartRateInfo(in int from,in String callbackTag);
-    oneway void stopCurrentWork(in int from,in String callbackTag);
+    void getHeartRateInfo(in int from,in String callbackTag);
+    void getJustOxygenInfo(in int from,in String callbackTag);
+    void getJustHeartRateInfo(in int from,in String callbackTag);
+    void stopCurrentWork(in 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 827e216..7cd448e 100644 (file)
--- a/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
+++ b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
@@ -4,9 +4,9 @@ package com.ic.work;
 import com.ic.work.domain.Temperature;
 
 interface ITempSensorCallback {
-   oneway void onTemperatureTestError(in String message,in int code);
-   oneway void onTemperatureGet(in Temperature temperature);
-   oneway void onTemperatureUpdating(in Temperature temperature);
-   oneway void onGettingData();
-   oneway void onWaiting();
+   void onTemperatureTestError(in String message,in int code);
+   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 824107c..381954d 100644 (file)
--- a/app/src/main/aidl/com/ic/work/ITempSensorService.aidl
+++ b/app/src/main/aidl/com/ic/work/ITempSensorService.aidl
@@ -5,5 +5,5 @@ import com.ic.work.ITempSensorCallback;
 interface ITempSensorService {
     void registerCallback(in ITempSensorCallback callback,in String callbackTag);
     void unRegisterCallback(in ITempSensorCallback callback);
-    oneway void getTemperatureInfo(in int from,in String callbackTag);
+    void getTemperatureInfo(in 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 020156b..cdcf89c 100644 (file)
--- a/app/src/main/java/com/ic/work/SensorDataService.java
+++ b/app/src/main/java/com/ic/work/SensorDataService.java
@@ -263,6 +263,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
             try {
                 while (i > 0) {
                     i--;
+                    ICLogger.d("handler onTemperatureGet " + i);
                     temperatureCallbacks.getBroadcastItem(i).onTemperatureGet(temperature);
                 }
             } catch (RemoteException e) {