添加了健康数据上传的接口
authorTrillGates <williamtrillgates@gmail.com>
Wed, 24 Nov 2021 02:53:24 +0000 (10:53 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Wed, 24 Nov 2021 02:53:24 +0000 (10:53 +0800)
app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
app/src/main/java/com/ic/protocols/protocolAPIHelper.java
app/src/main/java/com/ic/protocols/protocol_beehome.java

index 8f0924f..916c685 100644 (file)
@@ -102,6 +102,9 @@ public class TemperatureUtil {
             ICLogger.i("自由锻炼中,设置测量体温!" + String.format("%.1f", temperature.getBodyTemp()));
             Runtime.healthInfo.setTemperatureData(temperature.getBodyTemp());
         } else {
+            Runtime runtime = CoreService.getInstance().getRuntime();
+            //设置到环境中
+            runtime.tempInfo.setTemp(temperature.getBodyTemp(), temperature.getWristTemp(), temperature.getEnvTemp());
             StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(temperature.getWristTemp(),
                     temperature.getBodyTemp(), temperature.getEnvTemp(), null);
             Deliver.sendLocationMSG(temperatureMsg);
@@ -164,7 +167,7 @@ public class TemperatureUtil {
      */
     public void DoTempTest(int from) {
         ICLogger.d("DoTempTest..." + from);
-        if (CoreService.getInstance() != null && (CoreService.getInstance().getRuntime().Anti_off_flag == 1 ||CoreService.getInstance().getRuntime().Cut_off_flag == 1 ) ) {
+        if (CoreService.getInstance() != null && (CoreService.getInstance().getRuntime().Anti_off_flag == 1 || CoreService.getInstance().getRuntime().Cut_off_flag == 1)) {
             ICLogger.i("未佩戴 or 剪断,取消TempTest!" + from);
             return;
         }
index bb7c7d4..870ef69 100644 (file)
@@ -332,7 +332,8 @@ public class protocolAPIHelper {
         return ret;
     }
 
-    public static StringMessage getTemperatureMSG(double temp_adusted, double body_temp, double tempout, Runtime runtime) {
+    public static StringMessage getTemperatureMSG(double temp_adusted, double body_temp,
+                                                  double tempout, Runtime runtime) {
         if (is_protocol_not_Initialled()) return null;
         if (runtime == null) {
             if (CoreService.getInstance() != null)
@@ -352,7 +353,7 @@ public class protocolAPIHelper {
                 ret = protocol_jiai.AP50(runtime);
                 break;
             case Config.PROTOCOL_BEEHOME:
-                ret = protocol_beehome.APTP(temp_adusted, body_temp);
+                ret = protocol_beehome.APJK(3, runtime);
                 break;
             case Config.PROTOCOL_IC:
                 ret = protocol_ic.APTP(temp_adusted, body_temp, tempout);
@@ -680,7 +681,8 @@ public class protocolAPIHelper {
                 ret = protocol_jiai.APHT(runtime);
                 break;
             case Config.PROTOCOL_BEEHOME:
-                ret = protocol_beehome.APHT(runtime);
+                ret = protocol_beehome.APJK(1, runtime);
+                ret = protocol_beehome.APJK(2, runtime);
                 break;
             case Config.PROTOCOL_IC:
                 ret = protocol_ic.APHP(runtime);
index c0b990b..8611d58 100644 (file)
@@ -134,6 +134,8 @@ public class protocol_beehome {
         APMC,//
         BPPH,//拨号功能开关
         APPH,
+        APJK,//上传健康数据,用这个接口,可以去掉体温心率的接口了
+        BPJK,//平台响应
     }
 
     private static HashMap<CMD_TYPE, String> cmdMap = null;
@@ -224,6 +226,8 @@ public class protocol_beehome {
         cmdMap.put(CMD_TYPE.APMC, "APMC");
         cmdMap.put(CMD_TYPE.BPPH, "BPPH");
         cmdMap.put(CMD_TYPE.APPH, "APPH");
+        cmdMap.put(CMD_TYPE.APJK, "APJK");
+        cmdMap.put(CMD_TYPE.BPJK, "BPJK");
     }
 
 
@@ -486,11 +490,11 @@ public class protocol_beehome {
 //        IWAP01191230A2232.9807N11404.9355E000.1161320000.0006000910000000,460,00,9520,3671,#
         return genStringMessage(cmdMap.get(CMD_TYPE.AP01),
                 new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP01)).append(TimeUtil.getShortDate())
-                .append(ds.getGPSData())
+                        .append(ds.getGPSData())
                         .append(TimeUtil.getShortTime()).append(ds.getGPSHeading()).append(String.format("%03d", abs(ds.getSignalStrength())))
-                .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")
-                .append(ds.getProtection()).append(ds.getWorkModeStr()).append(CMDSPLIT)
-                .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString());
+                        .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")
+                        .append(ds.getProtection()).append(ds.getWorkModeStr()).append(CMDSPLIT)
+                        .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString());
     }
 
     //处理 定位 BP01
@@ -1737,8 +1741,8 @@ public class protocol_beehome {
         //33,132:温补用的参数,此处不用,可以用0 来代替。
         return genStringMessage(cmdMap.get(CMD_TYPE.APTP),
                 new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APTP))
-                        .append(CMDSPLIT).append(String.format("%1$.2f", wrist_temp))
                         .append(CMDSPLIT).append(String.format("%1$.2f", body_temp))
+                        .append(CMDSPLIT).append(String.format("%1$.2f", wrist_temp))
                         .append(CMDSPLIT).append(0)
                         .append(CMDEND).toString());
     }
@@ -1903,11 +1907,39 @@ public class protocol_beehome {
     public static StringMessage APSQ(String id, int type, int cycle) {
         //设备响应:      IWAPSQ,080835,1,60#
         //080835:指令流水号
-        return genStringMessage(cmdMap.get(CMD_TYPE.APSQ), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APSQ))
-                .append(CMDSPLIT).append(id)
-                .append(CMDSPLIT).append(type)
-                .append(CMDSPLIT).append(cycle)
-                .append(CMDEND).toString());
+        return genStringMessage(cmdMap.get(CMD_TYPE.APSQ),
+                new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APSQ))
+                        .append(CMDSPLIT).append(id)
+                        .append(CMDSPLIT).append(type)
+                        .append(CMDSPLIT).append(cycle)
+                        .append(CMDEND).toString());
+    }
+
+    /**
+     * 上传健康数据,IWAPJK,2021-05-29 13:00:00,1,69|120#
+     *
+     * @param type 1表示血压,2表示心率,3表示体温
+     * @return
+     */
+    public static StringMessage APJK(int type, Runtime runtime) {
+        StringBuilder sb = new StringBuilder(CMDHEADER).append(cmdMap.get(CMD_TYPE.APJK));
+        sb.append(CMDSPLIT);
+        //添加时间
+        sb.append(TimeUtil.getSystemTimeForCameraMark()).append(CMDSPLIT);
+        sb.append(type).append(CMDSPLIT);
+        if (type == 1) {
+            //血压
+            sb.append(runtime.getHRS().getBPL()).append("|").append(runtime.getHRS().getBPH());
+        } else if (type == 2) {
+            //心率
+            sb.append(runtime.getHRS().getPPG());
+        } else if (type == 3) {
+            sb.append(runtime.tempInfo.currentBodyTemp);
+        }
+        sb.append(CMDEND);
+        String s = sb.toString();
+        ICLogger.d("apjk ==>  " + s);
+        return genStringMessage(cmdMap.get(CMD_TYPE.APTP), s);
     }
 
     private void handleBPMC(String cmd) {
@@ -1948,6 +1980,7 @@ public class protocol_beehome {
                 .append(CMDEND).toString());
     }
 
+
     public void handleBPSQ(String cmd, Connection connection, Runtime runtime) {
         //IWBPSQ,353456789012345,080835,1,60#
         //说明:
@@ -2055,6 +2088,7 @@ public class protocol_beehome {
         }
     }
 
+
     private void responseWithId(String cmd, String id, String... args) {
         StringBuilder append = new StringBuilder(CMDHEADER).append(cmd)
                 .append(CMDSPLIT).append(id);
@@ -2290,6 +2324,9 @@ public class protocol_beehome {
                 ICLogger.d("收到服务器拨号功能开关.");
                 handleBPPH(cmd);
                 break;
+            case BPJK:
+                ICLogger.d("服务器收到健康数据上报" + cmd);
+                break;
         }
 
         return ret;