From f86bfd31047575de020b3c883c549bf2864b4045 Mon Sep 17 00:00:00 2001
From: snickersun <scy@incartech.cn>
Date: Sun, 13 Sep 2020 22:11:07 +0800
Subject: [PATCH] =?utf8?q?1=E3=80=81=E4=BF=AE=E6=94=B9mqtt=20AL=E9=87=87?=
 =?utf8?q?=E7=94=A8mqtt=E7=9A=84=E5=AE=9A=E4=BD=8D=E6=96=B9=E5=BC=8F=202?=
 =?utf8?q?=E3=80=81=E4=BF=AE=E6=94=B9mqtt=20=E6=8A=A5=E8=AD=A6getfzddevice?=
 =?utf8?q?status,=20=E8=A7=A3=E5=86=B3=E8=84=B1=E8=85=95=E5=92=8C=E5=89=AA?=
 =?utf8?q?=E5=BC=80=E6=8A=A5=E8=AD=A6=E7=9A=84=E9=94=99=E4=B9=B1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/enqualcomm/support/bean/Runtime.java | 4 ++--
 app/src/main/java/com/ic/protocols/protocol_mqtt.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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())
-- 
2.17.1