fixed heart reate warning issues.

diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
index 51b66ba..b921c4b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -132,11 +132,9 @@ public class AntiMonitorService extends AbstractInvokeHandlerService
     }
 
     private void play_notify() {
-
         AudioService.getInstance().play(mContext.getAssets(), "antioff.mp3");
         if (mHandler != null)
             mHandler.sendEmptyMessageDelayed(200, 5000);
-
     }
 
     /***

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 ca9ae2a..2e4f6d7 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -202,32 +202,49 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
         int heartRateValue = heartRate.getHeartRate();
         int bloodHeightValue = heartRate.getBloodHeight();
         int bloodLowValue = heartRate.getBloodLow();
+        ICLogger.d("oxygenValue == > " + oxygenValue
+                + " bloodHeightValue ==> " + bloodHeightValue
+                + " bloodLowValue ==> " + bloodLowValue
+                + " heartRateValue ==> " + heartRateValue
+        );
         Context context = runtime.getContextProxy().context;
 
+        ICLogger.d("Config.LIMIT_VALUE_OXYGEN ==> " + Config.LIMIT_VALUE_OXYGEN
+                + "　Config.LIMIT_VALUE_PPGH ==> " + Config.LIMIT_VALUE_PPGH
+                + "　Config.LIMIT_VALUE_PPGL ==> " + Config.LIMIT_VALUE_PPGL
+                + "　Config.LIMIT_VALUE_BPH_H ==> " + Config.LIMIT_VALUE_BPH_H
+                + "　Config.LIMIT_VALUE_BPH_L ==> " + Config.LIMIT_VALUE_BPH_L
+                + "　Config.LIMIT_VALUE_BPL_H ==> " + Config.LIMIT_VALUE_BPL_H
+                + "　Config.LIMIT_VALUE_BPL_L ==> " + Config.LIMIT_VALUE_BPL_L
+        );
         if (oxygenValue != 0 && Config.LIMIT_VALUE_OXYGEN != 0 && oxygenValue < Config.LIMIT_VALUE_OXYGEN) {
             //发出警告
             createWarningNotification(context.getString(R.string.oxygen_exception_tips_text) + oxygenValue + "%)",
                     NOTIFICATION_TYPE_BLOOD_OXYGEN, Constants.WARNING_MSG_TYPE_BLOOD_OXYGEN);
             VibrateUtil.getInstance(context).vibrateOn(true);
         }
-        if (heartRateValue != 0 && Config.LIMIT_VALUE_PPGH != 0 && heartRateValue > Config.LIMIT_VALUE_PPGH) {
+        if (heartRateValue != 0 && Config.LIMIT_VALUE_PPGH != 0
+                && heartRateValue > Config.LIMIT_VALUE_PPGH) {
             //判断是否超出阀值，上限
             createWarningNotification(context.getString(R.string.heart_rate_exception_tips_text) + heartRateValue + ")",
                     NOTIFICATION_TYPE_HEART_RATE, Constants.WARNING_MSG_TYPE_HEART_RATE);
             VibrateUtil.getInstance(context).vibrateOn(true);
         }
 
-        if (heartRateValue != 0 && Config.LIMIT_VALUE_PPGH != 0 && heartRateValue < Config.LIMIT_VALUE_PPGL) {
+        if (heartRateValue != 0 && Config.LIMIT_VALUE_PPGL != 0
+                && heartRateValue < Config.LIMIT_VALUE_PPGL) {
             //判断是否超出阀值，下限
             createWarningNotification(context.getString(R.string.heart_rate_exception_tips_text) + heartRateValue + ")",
                     NOTIFICATION_TYPE_HEART_RATE, Constants.WARNING_MSG_TYPE_HEART_RATE);
             VibrateUtil.getInstance(context).vibrateOn(true);
         }
 
-        if (bloodHeightValue != 0 && Config.LIMIT_VALUE_BPH_H != 0 && Config.LIMIT_VALUE_BPH_L != 0) {
+        if (bloodHeightValue != 0 && Config.LIMIT_VALUE_BPH_H != 0
+                && Config.LIMIT_VALUE_BPH_L != 0) {
             //如果不在这两个范围内，那么就警报
             if (bloodHeightValue > Config.LIMIT_VALUE_BPH_H || bloodHeightValue < Config.LIMIT_VALUE_BPH_L) {
                 //警报，血压高值超出范围
+                ICLogger.d("血压高压异常...");
                 createWarningNotification(context.getString(R.string.blood_presure_exception_tips_text) + bloodHeightValue + "/100mmHg)",
                         NOTIFICATION_TYPE_BLOOD_PRESSURE, Constants.WARNING_MSG_TYPE_BLOOD_PRESSURE);
                 VibrateUtil.getInstance(context).vibrateOn(true);
@@ -236,8 +253,9 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
 
         if (bloodLowValue != 0 && Config.LIMIT_VALUE_BPL_H != 0 && Config.LIMIT_VALUE_BPL_L != 0) {
             //如果不在这两个范围内，那么就警报
-            if (bloodHeightValue > Config.LIMIT_VALUE_BPL_H || bloodHeightValue < Config.LIMIT_VALUE_BPL_L) {
+            if (bloodLowValue > Config.LIMIT_VALUE_BPL_H || bloodLowValue < Config.LIMIT_VALUE_BPL_L) {
                 //警报，血压低值超出范围
+                ICLogger.d("血压低压异常...");
                 createWarningNotification(context.getString(R.string.blood_presure_exception_tips_text) + bloodHeightValue + "/100mmHg)",
                         NOTIFICATION_TYPE_BLOOD_PRESSURE, Constants.WARNING_MSG_TYPE_BLOOD_PRESSURE);
                 VibrateUtil.getInstance(context).vibrateOn(true);

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
index d141e37..b3ceade 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
@@ -119,7 +119,6 @@ public class ICAudioManager {
 
     //打开扬声器
     public static void OpenSpeaker(Context context) {
-
         try {
             AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
             //audioManager.setMode(AudioManager.ROUTE_SPEAKER);
@@ -128,7 +127,6 @@ public class ICAudioManager {
 
             if (!audioManager.isSpeakerphoneOn()) {
                 audioManager.setSpeakerphoneOn(true);
-
                 audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
                         audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL),
                         AudioManager.STREAM_VOICE_CALL);

diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java
index 970f92e..31a79d7 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -165,7 +165,7 @@ public class protocol_anan {
 
     private void registerWearStateReceiver() {
         IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction("com.ic.ACTION_ANTIOFF");
+        intentFilter.addAction(Constants.ACTION_ANTI_OFF0);
         mRuntime.getContextProxy().context.registerReceiver(wearStateReceiver, intentFilter);
     }
 

diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index 98d84d8..a8253c8 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -1505,7 +1505,6 @@ public class protocol_s123 {
                     case ICLocation.REALTIME_MOD:
                         Cycle = 60;
                         break;
-
                 }
                 StringMessage msg = AP33(cmdlist[2], mod);
                 //设定当前工作模式及循环频率
@@ -1527,9 +1526,9 @@ public class protocol_s123 {
 
 
     public static StringMessage AP34(String cmdindex, int workMode) {
-//IWAP34,588854,1#
-//080835:指令流水号
-//8：模式
+        //IWAP34,588854,1#
+        //080835:指令流水号
+        //8：模式
         return genStringMessage("AP34", new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP34))
                 .append(CMDSPLIT).append(cmdindex)
                 .append(CMDSPLIT).append(workMode)
@@ -1538,14 +1537,12 @@ public class protocol_s123 {
 
     //设置自定义工作模式
     public void handleBP34(Connection connection, Runtime runtime, String cmd) {
-
-//    IWBP34,867155030001063,588854,8,900,1#
-//        IW：标识符
-//        BP33 : 命令字符
-//        353456789012345:IMEI号，设备唯一ID
-//        080835:指令流水号
-//        1：设备工作模式，1：正常模式，2：省电模式，3：紧急模式
-
+        // IWBP34,867155030001063,588854,8,900,1#
+        // IW：标识符
+        // BP33 : 命令字符
+        // 353456789012345:IMEI号，设备唯一ID
+        // 080835:指令流水号
+        // 1：设备工作模式，1：正常模式，2：省电模式，3：紧急模式
         String[] cmdlist = cmd.split(",");
         if (cmdlist.length == 6) {
             log("com.ic.work mode " + cmdlist[3]);
@@ -2142,12 +2139,12 @@ public class protocol_s123 {
             String[] list = cmd.split(CMDSPLIT);
             if (list.length == 10) {
                 String index = list[2];
-                String PPGH = list[3];
-                String PPGL = list[4];
-                String BPH_H = list[5];
-                String BPH_L = list[6];
-                String BPL_H = list[7];
-                String BPL_L = list[8];
+                String PPGL = list[3];
+                String PPGH = list[4];
+                String BPL_L = list[5];
+                String BPL_H = list[6];
+                String BPH_L = list[7];
+                String BPH_H = list[8];
                 String OXYGEN = list[9];
                 connection.send(AP89(index));
                 ICLogger.i("收到服务器指令：心率/血压阀值 "