From 57d9d42a8a6e84a7af2c75a17c3df55850c52288 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 20 Oct 2015 14:48:58 +1300 Subject: Decode GT06 LBS data and status --- src/org/traccar/protocol/Gt06ProtocolDecoder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/org/traccar/protocol/Gt06ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java index a551e65ce..f30b71c54 100644 --- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -75,12 +75,13 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { } private static boolean hasLbs(int type) { - return type == MSG_GPS_LBS_1 || type == MSG_GPS_LBS_2 || type == MSG_GPS_LBS_STATUS_1 - || type == MSG_GPS_LBS_STATUS_2 || type == MSG_GPS_LBS_STATUS_3; + return type == MSG_LBS || type == MSG_LBS_STATUS || type == MSG_GPS_LBS_1 || type == MSG_GPS_LBS_2 + || type == MSG_GPS_LBS_STATUS_1 || type == MSG_GPS_LBS_STATUS_2 || type == MSG_GPS_LBS_STATUS_3; } private static boolean hasStatus(int type) { - return type == MSG_GPS_LBS_STATUS_1 || type == MSG_GPS_LBS_STATUS_2 || type == MSG_GPS_LBS_STATUS_3; + return type == MSG_STATUS || type == MSG_LBS_STATUS + || type == MSG_GPS_LBS_STATUS_1 || type == MSG_GPS_LBS_STATUS_2 || type == MSG_GPS_LBS_STATUS_3; } private static void sendResponse(Channel channel, int type, int index) { @@ -212,7 +213,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { if (hasGps(type)) { decodeGps(position, buf); } else { - getLastLocation(position); + getLastLocation(position, null); } if (hasLbs(type)) { -- cgit v1.2.3