删除心跳中测试心率和体温

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 387f635..44f1693 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -13,6 +13,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.BatteryManager;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
@@ -1316,6 +1317,15 @@ public class CoreService extends Service {
                 checkKeepSitting();//检查久坐
                 checkAlarmMessage();//检测是否有报警消息需要显示
                 checkUnreadMessage();//检查未读消息
+
+                if(!batteryUtil.isPowerConnected(runtime.getContextProxy().context)){
+                    if (runtime.check_stat_do_temp_test()) {
+                        TemperatureUtil.getInstance().doTempTestInThread(FROM_SERVER);
+                    }
+                    if (runtime.check_stat_do_ppg_test()) {
+                        HeartRateManager.getInstance().triggerPPGTest(FROM_SERVER);
+                    }
+                }
                 if (this.mKeepAlive != null) {
                     if (connection.isServerConnected() && runtime.isServerProtocolConnected()) {
                         this.mKeepAlive.onHeartAlarm(this.connection, this.runtime);

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 94a3978..f6ebf45 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -132,6 +132,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
         //绑定远程服务
         Intent intent = new Intent();
         intent.setAction(ACTION_HEART_RATE);
+        intent.setPackage("com.ic.work");
         ICApplication.sContext.bindService(intent, mRemoteConnection, Context.BIND_AUTO_CREATE);
     }
 

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 eadab3c..a58fa92 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -36,6 +36,7 @@ public class TemperatureUtil {
     private TemperatureUtil() {
         Intent intent = new Intent();
         intent.setAction(ACTION_TEMPERATURE);
+        intent.setPackage("com.ic.work");
         //绑定远程服务
         ICApplication.sContext.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
     }