From: snickersun <scy@incartech.cn>
Date: Sun, 13 Sep 2020 14:11:07 +0000 (+0800)
Subject: 1、修改mqtt AL采用mqtt的定位方式
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f86bfd31047575de020b3c883c549bf2864b4045;p=protocol_srv.git

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 f29ff1a9..bdd03f35 100644
--- 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";
                 break;
             case ALARM_ANTIOFF:
-                alarmType1="00100000";
+//                alarmType1="00100000";
                 break;
             case ALARM_WEARED:
 //                alarmType1="04";
                 break;
             case ALARM_CUTOFF:
-//                alarmType1="05";
+                alarmType1="00100000";
                 break;
             case ALARM_FALL:
 //                alarmType1="06";
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 f38b45ec..16473013 100644
--- 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);
         sb.append(TimeUtil.getUTCSystemDateYYMMDD())
                 .append(CMDSPLIT).append(TimeUtil.getUTCSystemTimeHHmmss())
-                .append(CMDSPLIT).append(runtime.getFZDGPSData())
+                .append(CMDSPLIT).append(runtime.getMqttGPSData())
                 .append(CMDSPLIT).append(String.format("%03d", abs(runtime.getSignalStrength())))
                 .append(CMDSPLIT).append(runtime.getBattery())
                 .append(CMDSPLIT).append(runtime.getTotalStepCount())