From: snickersun <scy@incartech.cn>
Date: Mon, 24 Aug 2020 11:50:49 +0000 (+0800)
Subject: 1、在温度检测过程中非 ic68也必须执行enable和disable函数
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=fb92a3d622fdc21d123993fd8890094dabf692bf;p=icworkservice.git

1、在温度检测过程中非 ic68也必须执行enable和disable函数
2、修改一些日志
---

diff --git a/app/src/main/java/com/ic/work/WorkService.java b/app/src/main/java/com/ic/work/WorkService.java
index 54f3e68..1e347c8 100644
--- a/app/src/main/java/com/ic/work/WorkService.java
+++ b/app/src/main/java/com/ic/work/WorkService.java
@@ -311,6 +311,9 @@ public class WorkService extends Service {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(ThreadPoolEvent event) {
+
+        IcLog.i(TAG,"onMessageEvent EventType "+event.getEventType());
+
         switch (event.getEventType()) {
             case 1:
                 ThreadPoolManager.getInstance().execute(new PedRunnable(mApp.getApplicationContext(), mApp.getRepository()));
diff --git a/app/src/main/java/com/ic/work/hardware/TemperatureRunnable.java b/app/src/main/java/com/ic/work/hardware/TemperatureRunnable.java
index 4ea09d2..98bac0c 100644
--- a/app/src/main/java/com/ic/work/hardware/TemperatureRunnable.java
+++ b/app/src/main/java/com/ic/work/hardware/TemperatureRunnable.java
@@ -19,42 +19,59 @@ public class TemperatureRunnable implements Runnable {
         double animal = 0.0;
 
         boolean[] state = HardwareUtils.isTemperatureDevAvailable();
-        IcLog.i(TAG, "TemperatureRunnable :"+state[0]+"state[1]:"+state[1]);
-        if(state[0]){
-            if(state[1]){
+        IcLog.i(TAG, "TemperatureRunnable :"+state[0]+" state[1]:"+state[1]);
+        if(state[0]) {  //have temp
+            if (state[1]) { //is ic68
                 try {
-                    //if(HardwareUtils.isTemperatureDevOpened()){
-                    if(HardwareUtils.enableTemperature()){
+//                    if(HardwareUtils.isTemperatureDevOpened()){
+                    if (HardwareUtils.enableTemperature()) {
                         Thread.sleep(1000);
                     }
-                    //}
-                    while (true){
+//                    }
+                    while (true) {
                         testValue = HardwareUtils.getNdkTemperatureValue();
                         animal = HardwareUtils.getBodyTempFromWristTemp(testValue, room_temperature);
-                        IcLog.i(TAG, "getNdkTemperatureValue Value:" + testValue);
+                        IcLog.i(TAG, "getNdkTemperatureValue ic68 Value:" + testValue);
                         EventBus.getDefault().post(new TemperatureResultEvent(testValue, animal));
                         try {
                             Thread.sleep(1000);
-                        }catch (InterruptedException e){
-                           break;
+                        } catch (InterruptedException e) {
+                            break;
                         }
                     }
                     HardwareUtils.disableTemperature();
-                }catch (InterruptedException e) {
+                } catch (InterruptedException e) {
                     IcLog.e(TAG, "TemperatureRunnable :", e);
-                }finally {
+                } finally {
                     HardwareUtils.disableTemperature();
+                    IcLog.i(TAG, "disableTemperature ic68 !");
                 }
-            }
-        }else{
-            while (true) {
+
+            } else {
+
                 try {
-                    testValue = HardwareUtils.getNdkTemperatureValue();
-                    animal = HardwareUtils.getBodyTempFromWristTemp(testValue, room_temperature);
-                    EventBus.getDefault().post(new TemperatureResultEvent(testValue, animal));
-                    Thread.sleep(2000);
-                }catch (InterruptedException e){
-                    break;
+//                    if(HardwareUtils.isTemperatureDevOpened()){
+                    if (HardwareUtils.enableTemperature()) {
+                        Thread.sleep(1000);
+                    }
+//                    }
+                    while (true) {
+                        try {
+                            testValue = HardwareUtils.getNdkTemperatureValue();
+                            animal = HardwareUtils.getBodyTempFromWristTemp(testValue, room_temperature);
+                            IcLog.i(TAG, "getNdkTemperatureValue Value:" + testValue);
+                            EventBus.getDefault().post(new TemperatureResultEvent(testValue, animal));
+                            Thread.sleep(1000);
+                        } catch (InterruptedException e) {
+                            IcLog.e(TAG, "getNdkTemperatureValue InterruptedException " ,e);
+                            break;
+                        }
+                    }
+                } catch (InterruptedException e) {
+                    IcLog.e(TAG, "TemperatureRunnable :", e);
+                } finally {
+                    HardwareUtils.disableTemperature();
+                    IcLog.i(TAG, "disableTemperature!");
                 }
             }
         }
diff --git a/app/src/main/java/com/ic/work/process/TempProcess.java b/app/src/main/java/com/ic/work/process/TempProcess.java
index 09fd78d..ad10549 100644
--- a/app/src/main/java/com/ic/work/process/TempProcess.java
+++ b/app/src/main/java/com/ic/work/process/TempProcess.java
@@ -18,7 +18,7 @@ import java.util.List;
 
 public class TempProcess {
 
-    private static final String TAG = "WeatherProcess";
+    private static final String TAG = "TemperatureProcess";
 
     private RemoteCallbackList<ITempAidlInterface> mCallbacks = new RemoteCallbackList<>();
 
@@ -43,6 +43,7 @@ public class TempProcess {
 
         @Override
         public void onStartQueryTemp() throws RemoteException {
+            IcLog.i(TAG,"onStartQueryTemp");
             EventBus.getDefault().post(new ThreadPoolEvent(6));
         }