From: snickersun <scy@incartech.cn>
Date: Wed, 2 Sep 2020 01:11:18 +0000 (+0800)
Subject: message  isFromCache 函数调用鲁棒性优化
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=31d63fd62a007f2487361fc7caa6af5052d0d64a;p=protocol_srv.git

message  isFromCache 函数调用鲁棒性优化
---

diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
index 15fc77aa..6ce7375e 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -134,7 +134,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
                 }
 
               } else {
-                ICLogger.i("Skip PPG " + PPGDATA.isFromCache());
+                ICLogger.i("Skip PPG " );
               }
             } else {
               ICLogger.i("PPG Failed for Timeout!");
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index 49ccd7bc..1f240345 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -391,7 +391,7 @@ public class ProcessReceiver extends BroadcastReceiver {
         double wrist_temp = paramIntent.getDoubleExtra(KEY_TEMP_WRIST, 0.0f);
         double body_temp = paramIntent.getDoubleExtra(KEY_TEMP_BODY, 0.0f);
         StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,null);
-        ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());
+        if (temperatureMsg!=null)ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());
         Deliver.sendLocationMSG(temperatureMsg);
     }else if (ACTION_SET_SIT_RANGE.equals(str)) {
         if (paramIntent.hasExtra( Constants.KEY_SIT_RANGE)){
diff --git a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
index 170b568f..e6861046 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -66,7 +66,7 @@ public class TemperatureUtil {
                     body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);
                     StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp, null);
                     CoreService.getInstance().getConnection().send(temperatureMsg);
-                    ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());
+                    if  (temperatureMsg!=null) ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());
 
                     Runtime runtime = CoreService.getInstance().getRuntime();
                     runtime.tempInfo.setTemp(body_temp, wrist_temp);