From: TrillGates <williamtrillgates@gmail.com>
Date: Fri, 22 Jan 2021 07:22:43 +0000 (+0800)
Subject: update aidls.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=b01891835195897181f4f7942c52719eaf56e988;p=icworkservice.git

update aidls.
---

diff --git a/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl b/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
index e9baea3..f695844 100644
--- a/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
+++ b/app/src/main/aidl/com/ic/work/IHeartRateSensorCallback.aidl
@@ -6,8 +6,8 @@ import com.ic.work.domain.HeartRate;
 
 interface IHeartRateSensorCallback {
 
-     void onHeartRateGet(in HeartRate heartRate);
-     void onHeartRateUpdate(in HeartRate heartRate);
-     void onGettingData();
-     void onWaiting();
+     oneway void onHeartRateGet(in HeartRate heartRate);
+     oneway void onHeartRateUpdate(in HeartRate heartRate);
+     oneway void onGettingData();
+     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 aa15d55..70a7dd5 100644
--- a/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
+++ b/app/src/main/aidl/com/ic/work/IHeartRateSensorService.aidl
@@ -6,5 +6,5 @@ import com.ic.work.IHeartRateSensorCallback;
 interface IHeartRateSensorService {
     void registerCallback(in IHeartRateSensorCallback callback,in String callbackTag);
     void unRegisterCallback(in IHeartRateSensorCallback callback);
-    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/aidl/com/ic/work/ITempSensorCallback.aidl b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
index 0734ab8..ebe9aaa 100644
--- a/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
+++ b/app/src/main/aidl/com/ic/work/ITempSensorCallback.aidl
@@ -7,6 +7,6 @@ interface ITempSensorCallback {
 
    oneway void onTemperatureGet(in Temperature temperature);
    oneway void onTemperatureUpdating(in Temperature temperature);
-   void onGettingData();
-   void onWaiting();
+   oneway void onGettingData();
+   oneway void onWaiting();
 }
\ 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 ee3a3ce..b19112b 100644
--- a/app/src/main/java/com/ic/work/SensorDataService.java
+++ b/app/src/main/java/com/ic/work/SensorDataService.java
@@ -156,8 +156,8 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
             IcLog.d(TAG, "temperature callback size == > " + i + " temperature is " + temperature);
             try {
                 while (i > 0) {
-                    temperatureCallbacks.getBroadcastItem(i).onTemperatureGet(temperature);
                     i--;
+                    temperatureCallbacks.getBroadcastItem(i).onTemperatureGet(temperature);
                 }
             } catch (RemoteException e) {
                 e.printStackTrace();
@@ -497,15 +497,16 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
         synchronized (mLock) {
             int i = heartRateCallbacks.beginBroadcast();
             IcLog.d(TAG, "heart rate callback size == > " + i);
-            while (i > 0) {
-                i--;
-                try {
+            try {
+                while (i > 0) {
+                    i--;
                     heartRateCallbacks.getBroadcastItem(i).onHeartRateGet(heartRate);
-                } catch (RemoteException e) {
-                    e.printStackTrace();
                 }
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            } finally {
+                heartRateCallbacks.finishBroadcast();
             }
-            heartRateCallbacks.finishBroadcast();
         }
     }
 
@@ -572,8 +573,9 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
                 }
             } catch (Exception e) {
                 e.printStackTrace();
+            } finally {
+                temperatureCallbacks.finishBroadcast();
             }
-            temperatureCallbacks.finishBroadcast();
         }
     }