1、修改mqtt AL采用mqtt的定位方式

2、修改mqtt 报警getfzddevicestatus, 解决脱腕和剪开报警的错乱。

diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
index f29ff1a..bdd03f3 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -724,13 +724,13 @@ public class Runtime {
                 alarmType1="00020000";\r
                 break;\r
             case ALARM_ANTIOFF:\r
-                alarmType1="00100000";\r
+//                alarmType1="00100000";\r
                 break;\r
             case ALARM_WEARED:\r
 //                alarmType1="04";\r
                 break;\r
             case ALARM_CUTOFF:\r
-//                alarmType1="05";\r
+                alarmType1="00100000";\r
                 break;\r
             case ALARM_FALL:\r
 //                alarmType1="06";\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 f38b45e..1647301 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java
@@ -436,7 +436,7 @@ public class protocol_mqtt {
         String cmd = cmdMap.get(CMD_TYPE.AL);\r
         sb.append(TimeUtil.getUTCSystemDateYYMMDD())\r
                 .append(CMDSPLIT).append(TimeUtil.getUTCSystemTimeHHmmss())\r
-                .append(CMDSPLIT).append(runtime.getFZDGPSData())\r
+                .append(CMDSPLIT).append(runtime.getMqttGPSData())\r
                 .append(CMDSPLIT).append(String.format("%03d", abs(runtime.getSignalStrength())))\r
                 .append(CMDSPLIT).append(runtime.getBattery())\r
                 .append(CMDSPLIT).append(runtime.getTotalStepCount())\r