Another GT06 LBS and WiFi message type

2 files changed, 79 insertions, 52 deletions

diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index aea3a29f4..36358b6e5 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -31,6 +31,7 @@ import org.traccar.model.CellTower;
 import org.traccar.model.Device;
 import org.traccar.model.Network;
 import org.traccar.model.Position;
+import org.traccar.model.WifiAccessPoint;
 
 import java.net.SocketAddress;
 import java.nio.charset.StandardCharsets;
@@ -68,6 +69,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
     public static final int MSG_GPS_LBS_STATUS_1 = 0x16;
     public static final int MSG_GPS_LBS_STATUS_2 = 0x26;
     public static final int MSG_GPS_LBS_STATUS_3 = 0x27;
+    public static final int MSG_LBS_WIFI = 0x2C;
     public static final int MSG_LBS_PHONE = 0x17;
     public static final int MSG_LBS_EXTEND = 0x18;
     public static final int MSG_LBS_STATUS = 0x19;
@@ -390,82 +392,98 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
 
         } else {
 
-            Position position = new Position();
-            position.setDeviceId(deviceSession.getDeviceId());
-            position.setProtocol(getProtocolName());
+            return decodeBasicOther(channel, buf, deviceSession, type, dataLength);
 
-            if (type == MSG_LBS_EXTEND) {
+        }
 
-                DateBuilder dateBuilder = new DateBuilder(timeZone)
-                        .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
-                        .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
+        return null;
+    }
 
-                getLastLocation(position, dateBuilder.getDate());
+    private Object decodeBasicOther(Channel channel, ChannelBuffer buf,
+            DeviceSession deviceSession, int type, int dataLength) throws Exception {
 
-                int mcc = buf.readUnsignedShort();
-                int mnc = buf.readUnsignedByte();
-                Network network = new Network();
-                for (int i = 0; i < 7; i++) {
-                    network.addCellTower(CellTower.from(
-                            mcc, mnc, buf.readUnsignedShort(), buf.readUnsignedMedium(), -buf.readUnsignedByte()));
-                }
-                position.setNetwork(network);
+        Position position = new Position();
+        position.setDeviceId(deviceSession.getDeviceId());
+        position.setProtocol(getProtocolName());
 
-            } else if (type == MSG_STRING) {
+        if (type == MSG_LBS_EXTEND || type == MSG_LBS_WIFI) {
 
-                getLastLocation(position, null);
+            DateBuilder dateBuilder = new DateBuilder(timeZone)
+                    .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
+                    .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
 
-                int commandLength = buf.readUnsignedByte();
+            getLastLocation(position, dateBuilder.getDate());
 
-                if (commandLength > 0) {
-                    buf.readUnsignedByte(); // server flag (reserved)
-                    position.set(Position.KEY_RESULT,
-                            buf.readBytes(commandLength - 1).toString(StandardCharsets.US_ASCII));
-                }
+            int mcc = buf.readUnsignedShort();
+            int mnc = buf.readUnsignedByte();
+            Network network = new Network();
+            for (int i = 0; i < 7; i++) {
+                network.addCellTower(CellTower.from(
+                        mcc, mnc, buf.readUnsignedShort(), buf.readUnsignedMedium(), -buf.readUnsignedByte()));
+            }
 
-            } else if (isSupported(type)) {
+            buf.readUnsignedByte(); // time leads
 
-                if (hasGps(type)) {
-                    decodeGps(position, buf, false);
-                } else {
-                    getLastLocation(position, null);
-                }
+            int wifiCount = buf.readUnsignedByte();
+            for (int i = 0; i < wifiCount; i++) {
+                String mac = ChannelBuffers.hexDump(buf.readBytes(6)).replaceAll("(..)", "$1:");
+                network.addWifiAccessPoint(WifiAccessPoint.from(
+                        mac.substring(0, mac.length() - 1), buf.readUnsignedByte()));
+            }
 
-                if (hasLbs(type)) {
-                    decodeLbs(position, buf, hasStatus(type));
-                }
+            position.setNetwork(network);
 
-                if (hasStatus(type)) {
-                    decodeStatus(position, buf);
-                }
+        } else if (type == MSG_STRING) {
 
-                if (type == MSG_GPS_LBS_1 && buf.readableBytes() >= 4 + 6) {
-                    position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
-                }
+            getLastLocation(position, null);
 
-                if (type == MSG_GPS_LBS_2 && buf.readableBytes() >= 3 + 6) {
-                    position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);
-                    position.set(Position.KEY_EVENT, buf.readUnsignedByte()); // reason
-                    position.set(Position.KEY_ARCHIVE, buf.readUnsignedByte() > 0);
-                }
+            int commandLength = buf.readUnsignedByte();
 
+            if (commandLength > 0) {
+                buf.readUnsignedByte(); // server flag (reserved)
+                position.set(Position.KEY_RESULT,
+                        buf.readBytes(commandLength - 1).toString(StandardCharsets.US_ASCII));
+            }
+
+        } else if (isSupported(type)) {
+
+            if (hasGps(type)) {
+                decodeGps(position, buf, false);
             } else {
+                getLastLocation(position, null);
+            }
 
-                buf.skipBytes(dataLength);
-                if (type != MSG_COMMAND_0 && type != MSG_COMMAND_1 && type != MSG_COMMAND_2) {
-                    sendResponse(channel, false, type);
-                }
-                return null;
+            if (hasLbs(type)) {
+                decodeLbs(position, buf, hasStatus(type));
+            }
 
+            if (hasStatus(type)) {
+                decodeStatus(position, buf);
             }
 
-            sendResponse(channel, false, type);
+            if (type == MSG_GPS_LBS_1 && buf.readableBytes() >= 4 + 6) {
+                position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+            }
 
-            return position;
+            if (type == MSG_GPS_LBS_2 && buf.readableBytes() >= 3 + 6) {
+                position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);
+                position.set(Position.KEY_EVENT, buf.readUnsignedByte()); // reason
+                position.set(Position.KEY_ARCHIVE, buf.readUnsignedByte() > 0);
+            }
+
+        } else {
+
+            buf.skipBytes(dataLength);
+            if (type != MSG_COMMAND_0 && type != MSG_COMMAND_1 && type != MSG_COMMAND_2) {
+                sendResponse(channel, false, type);
+            }
+            return null;
 
         }
 
-        return null;
+        sendResponse(channel, false, type);
+
+        return position;
     }
 
     private Object decodeExtended(Channel channel, SocketAddress remoteAddress, ChannelBuffer buf) throws Exception {
diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 2e6a53b06..3c767c908 100644
--- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -16,6 +16,12 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, binary(
                 "78780D01086471700328358100093F040D0A"));
 
+        verifyNotNull(decoder, binary(
+                "7878412c11030b011c1f013604cb8a00b17754cb8a00bef357cb8a00b73f5fcb8900b0e25fcb8900b6655fcb8a00b74960cb8a00b178620701001801eb40393800bbbde10d0a"));
+
+        verifyNotNull(decoder, binary(
+                "7878412c11030b012629013604cb8a00b17757cb8a00b73f5bcb8a00b7495ecb8900b0e25fcb8a00b1b9620000000000ff0000000000ffff01001801eb40393e00c0e6340d0a"));
+
         verifyPosition(decoder, binary(
                 "787822221106160a1016c60278019407c7783800040001940504700046fc01030100065f570d0a"));
 
@@ -149,6 +155,9 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, binary(
                 "787811010123456789012345100B3201000171930D0A"));
 
+        verifyNull(decoder, binary(
+                "78780d1f000000000000000200b196a20d0a"));
+
     }
 
 }