protocol mqtt

添加健康数据上报兼容

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 e3e9d38..1c60f9a 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -118,9 +118,9 @@ public class HeartRateManager extends AbstractInvokeHandlerService implements Se
               //因为协议中没有时间变量，所以只能实时传输，如果恰巧没有网络也只能丢弃，有时间变量的话，可以考虑通过deliver的buffer来进行缓存发送\r
               if (connection.isServerConnected()) {\r
                 if(PPGDATA==null){\r
-                  StringMessage ppgd=protocolAPIHelper.getPPG_MSG(runtime.getHRS().getPPG());\r
-                  StringMessage bloodd=protocolAPIHelper.getBlood_MSG( runtime.getHRS().getBPH(), runtime.getHRS().getBPL());\r
-                  StringMessage oxd=protocolAPIHelper.getOxygen_MSG(runtime.getHRS().getSpo2());\r
+                  StringMessage ppgd=protocolAPIHelper.getPPG_MSG(runtime.getHRS().getPPG(),runtime);\r
+                  StringMessage bloodd=protocolAPIHelper.getBlood_MSG( runtime.getHRS().getBPH(), runtime.getHRS().getBPL(),runtime);\r
+                  StringMessage oxd=protocolAPIHelper.getOxygen_MSG(runtime.getHRS().getSpo2(),runtime);\r
                   connection.send( ppgd);\r
                   connection.send(bloodd);\r
                   connection.send( oxd);\r
@@ -418,9 +418,9 @@ public static void triggerPPGtest(){
             if (connection.isServerConnected()) {\r
               StringMessage PPGDATA = protocolAPIHelper.getPPG_ECG_MSG(Integer.parseInt(ppg), Integer.parseInt(bph), Integer.parseInt(bpl), Integer.parseInt(spo2));\r
               if(PPGDATA==null){\r
-                StringMessage ppgd=protocolAPIHelper.getPPG_MSG(Integer.parseInt(ppg));\r
-                StringMessage bloodd=protocolAPIHelper.getBlood_MSG( Integer.parseInt(bph), Integer.parseInt(bpl));\r
-                StringMessage oxd=protocolAPIHelper.getOxygen_MSG(Integer.parseInt(spo2));\r
+                StringMessage ppgd=protocolAPIHelper.getPPG_MSG(Integer.parseInt(ppg),runtime);\r
+                StringMessage bloodd=protocolAPIHelper.getBlood_MSG( Integer.parseInt(bph), Integer.parseInt(bpl),runtime);\r
+                StringMessage oxd=protocolAPIHelper.getOxygen_MSG(Integer.parseInt(spo2),runtime);\r
                 connection.send( ppgd);\r
                 connection.send(bloodd);\r
                 connection.send( oxd);\r

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 39db0d3..f672bed 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -394,7 +394,7 @@ public class ProcessReceiver extends BroadcastReceiver {
       }else if (ACTION_TEMP_RESULT.equals(str)) {\r
         double wrist_temp = paramIntent.getDoubleExtra(KEY_TEMP_WRIST, 0.0f);\r
         double body_temp = paramIntent.getDoubleExtra(KEY_TEMP_BODY, 0.0f);\r
-        StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp);\r
+        StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,null);\r
         ICLogger.i("发送体温测量值 " + temperatureMsg.isFromCache());\r
         Deliver.sendLocationMSG(temperatureMsg);\r
     }else if (ACTION_SET_SIT_RANGE.equals(str)) {\r

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 58a6614..8143b07 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -71,7 +71,7 @@ public class TemperatureUtil {
                     body_temp=TemperatureUtil.getBodyTemp(wrist_temp,26.0f);\r
                     ICJniUtils.disableTemperature();\r
 \r
-                    StringMessage temperatureMsg= protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp);\r
+                    StringMessage temperatureMsg= protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,null);\r
                     CoreService.getInstance().getConnection().send(temperatureMsg);\r
                     ICLogger.i("发送体温测量值 "+temperatureMsg.isFromCache());\r
 \r
@@ -99,7 +99,7 @@ public class TemperatureUtil {
 \r
                     wrist_temp=TemperatureUtil.get_temp_value_adjusted();\r
                     body_temp=TemperatureUtil.getBodyTemp(wrist_temp,26.0f);\r
-                    StringMessage temperatureMsg= protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp);\r
+                    StringMessage temperatureMsg= protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp,null);\r
                     CoreService.getInstance().getConnection().send(temperatureMsg);\r
                     ICLogger.i("发送体温测量值 "+temperatureMsg.isFromCache());\r
 \r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index c1dfa7a..9b12b00 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -1,6 +1,7 @@
 package com.ic.protocols;\r
 \r
 import com.enqualcomm.support.Config;\r
+import com.enqualcomm.support.CoreService;\r
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.bean.SleepInfo;\r
 import com.enqualcomm.support.bean.StringMessage;\r
@@ -131,8 +132,14 @@ public class protocolAPIHelper {
         return ret;\r
     }\r
 \r
-    public static StringMessage getTemperatureMSG(double temp_adusted,double body_temp){\r
+    public static StringMessage getTemperatureMSG(double temp_adusted,double body_temp,Runtime runtime){\r
         if (is_protocol_not_Initialled()) return null;\r
+        if (CoreService.getInstance()!=null && runtime==null){\r
+            runtime=CoreService.getInstance().getRuntime();\r
+        }else{\r
+            ICLogger.i("Runtime == null !");\r
+            return null;\r
+        }\r
         StringMessage ret=null;\r
         switch(Config.protocol_no)\r
         {\r
@@ -149,7 +156,7 @@ public class protocolAPIHelper {
                 ret=protocol_fzd.temp(body_temp);\r
                 break;\r
             case Config.PROTOCOL_MQTT:\r
-                ret=null;\r
+                ret=protocol_mqtt.temp(body_temp,runtime);;\r
                 break;\r
         }\r
         return ret;\r
@@ -343,8 +350,14 @@ public class protocolAPIHelper {
         return ret;\r
     }\r
 \r
-    public static StringMessage getBlood_MSG(int pbh, int pbl){\r
+    public static StringMessage getBlood_MSG(int pbh, int pbl,Runtime runtime){\r
         if (is_protocol_not_Initialled()) return null;\r
+        if (CoreService.getInstance()!=null && runtime==null){\r
+            runtime=CoreService.getInstance().getRuntime();\r
+        }else{\r
+            ICLogger.i("Runtime == null !");\r
+            return null;\r
+        }\r
         StringMessage ret=null;\r
         switch(Config.protocol_no)\r
         {\r
@@ -361,14 +374,20 @@ public class protocolAPIHelper {
                 ret=protocol_fzd.blood(pbl,pbh);\r
                 break;\r
             case Config.PROTOCOL_MQTT:\r
-                ret=null;//protocol_mqtt.blood(pbl,pbh);\r
+                ret=protocol_mqtt.blood(pbl,pbh,runtime);\r
                 break;\r
         }\r
         return ret;\r
     }\r
 \r
-    public static StringMessage getOxygen_MSG(int ox){\r
+    public static StringMessage getOxygen_MSG(int ox,Runtime runtime){\r
         if (is_protocol_not_Initialled()) return null;\r
+        if (CoreService.getInstance()!=null && runtime==null){\r
+            runtime=CoreService.getInstance().getRuntime();\r
+        }else{\r
+            ICLogger.i("Runtime == null !");\r
+            return null;\r
+        }\r
         StringMessage ret=null;\r
         switch(Config.protocol_no)\r
         {\r
@@ -385,13 +404,19 @@ public class protocolAPIHelper {
                 ret=protocol_fzd.oxygen(ox);\r
                 break;\r
             case Config.PROTOCOL_MQTT:\r
-                ret=null;//protocol_mqtt.oxygen(ox);\r
+                ret=protocol_mqtt.oxygen(ox,runtime);\r
                 break;\r
         }\r
         return ret;\r
     }\r
-    public static StringMessage getPPG_MSG(int ppg){\r
+    public static StringMessage getPPG_MSG(int ppg,Runtime runtime){\r
         if (is_protocol_not_Initialled()) return null;\r
+        if (CoreService.getInstance()!=null && runtime==null){\r
+            runtime=CoreService.getInstance().getRuntime();\r
+        }else{\r
+            ICLogger.i("Runtime == null !");\r
+            return null;\r
+        }\r
         StringMessage ret=null;\r
         switch(Config.protocol_no)\r
         {\r
@@ -408,7 +433,7 @@ public class protocolAPIHelper {
                 ret=protocol_fzd.heart(ppg);\r
                 break;\r
             case Config.PROTOCOL_MQTT:\r
-                ret=null;//protocol_mqtt.heart(ppg);\r
+                ret=protocol_mqtt.heart(ppg,runtime);\r
                 break;\r
         }\r
         return ret;\r

diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt.java b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
index 859ebb3..1400e49 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
@@ -705,7 +705,6 @@ public class protocol_mqtt {
  * 消息下发到指定手表(MSGDOWN)\r
  * 平台发布(终端订阅)：\r
  * 平台向“WBG100/v1/ID_手表IMEI/MSGDOWN”的主题发布 [LEN,包序号，具体消息]\r
- * 具体消息采用 Unicode 编码下发给终端，例如，“你好”转为Unicode通常为“\u4f60\u597d”，实际传输要去掉\u，即传输具体消息为“4f60597d”\r
  *\r
  * 终端订阅“WBG100/v1/ID_手表IMEI/+”的主题列表，判断子主题是否为MSGDOWN\r
  *\r