Update GB100 binary decoder

4 files changed, 241 insertions, 6 deletions

diff --git a/src/org/traccar/helper/BitBuffer.java b/src/org/traccar/helper/BitBuffer.java
index 7626988cc..ac307efdf 100644
--- a/src/org/traccar/helper/BitBuffer.java
+++ b/src/org/traccar/helper/BitBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffers;
 
 public class BitBuffer {
 
-    private ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
+    private final ChannelBuffer buffer;
 
     private int writeByte;
     private int writeCount;
@@ -28,6 +28,14 @@ public class BitBuffer {
     private int readByte;
     private int readCount;
 
+    public BitBuffer() {
+        buffer = ChannelBuffers.dynamicBuffer();
+    }
+
+    public BitBuffer(ChannelBuffer buffer) {
+        this.buffer = buffer;
+    }
+
     public void writeEncoded(byte[] bytes) {
         for (byte b : bytes) {
             b -= 48;
diff --git a/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java b/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java
index a7ecf40d5..071960e49 100644
--- a/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java
@@ -19,6 +19,8 @@ import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.DeviceSession;
+import org.traccar.helper.BitBuffer;
+import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.UnitsConverter;
 import org.traccar.model.CellTower;
@@ -28,6 +30,8 @@ import org.traccar.model.Position;
 import java.net.SocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
 
 public class Gl200BinaryProtocolDecoder extends BaseProtocolDecoder {
 
@@ -42,12 +46,171 @@ public class Gl200BinaryProtocolDecoder extends BaseProtocolDecoder {
         return dateBuilder.getDate();
     }
 
+    public static final int MSG_RSP_LCB = 3;
+    public static final int MSG_RSP_GEO = 8;
+    public static final int MSG_RSP_COMPRESSED = 100;
+
+    private List<Position> decodeLocation(Channel channel, SocketAddress remoteAddress, ChannelBuffer buf) {
+
+        List<Position> positions = new LinkedList<>();
+
+        int type = buf.readUnsignedByte();
+
+        buf.readUnsignedInt(); // mask
+        buf.readUnsignedShort(); // length
+        buf.readUnsignedByte(); // device type
+        buf.readUnsignedShort(); // protocol version
+        buf.readUnsignedShort(); // firmware version
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, String.format("%015d", buf.readLong()));
+        if (deviceSession == null) {
+            return null;
+        }
+
+        int battery = buf.readUnsignedByte();
+        int power = buf.readUnsignedShort();
+
+        if (type == MSG_RSP_GEO) {
+            buf.readUnsignedByte(); // reserved
+            buf.readUnsignedByte(); // reserved
+        }
+
+        buf.readUnsignedByte(); // motion status
+        int satellites = buf.readUnsignedByte();
+
+        if (type != MSG_RSP_COMPRESSED) {
+            buf.readUnsignedByte(); // index
+        }
+
+        if (type == MSG_RSP_LCB) {
+            buf.readUnsignedByte(); // phone length
+            for (int b = buf.readUnsignedByte();; b = buf.readUnsignedByte()) {
+                if ((b & 0xf) == 0xf || (b & 0xf0) == 0xf0) {
+                    break;
+                }
+            }
+        }
+
+        if (type == MSG_RSP_COMPRESSED) {
+
+            int count = buf.readUnsignedShort();
+
+            BitBuffer bits;
+            int speed = 0;
+            int heading = 0;
+            int latitude = 0;
+            int longitude = 0;
+            long time = 0;
+
+            for (int i = 0; i < count; i++) {
+
+                if (time > 0) {
+                    time += 1;
+                }
+
+                Position position = new Position();
+                position.setProtocol(getProtocolName());
+                position.setDeviceId(deviceSession.getDeviceId());
+
+                switch (BitUtil.from(buf.getUnsignedByte(buf.readerIndex()), 8 - 2)) {
+                    case 1:
+                        bits = new BitBuffer(buf.readBytes(3));
+                        bits.readUnsigned(2); // point attribute
+                        bits.readUnsigned(1); // fix type
+                        speed = bits.readUnsigned(12);
+                        heading = bits.readUnsigned(9);
+                        longitude = buf.readInt();
+                        latitude = buf.readInt();
+                        if (time == 0) {
+                            time = buf.readUnsignedInt();
+                        }
+                        break;
+                    case 2:
+                        bits = new BitBuffer(buf.readBytes(5));
+                        bits.readUnsigned(2); // point attribute
+                        bits.readUnsigned(1); // fix type
+                        speed += bits.readSigned(7);
+                        heading += bits.readSigned(7);
+                        longitude += bits.readSigned(12);
+                        latitude += bits.readSigned(11);
+                        break;
+                    default:
+                        buf.readUnsignedByte(); // invalid or same
+                        continue;
+                }
+
+                position.setValid(true);
+                position.setTime(new Date(time * 1000));
+                position.setSpeed(UnitsConverter.knotsFromKph(speed * 0.1));
+                position.setCourse(heading);
+                position.setLongitude(longitude * 0.000001);
+                position.setLatitude(latitude * 0.000001);
+
+                positions.add(position);
+
+            }
+
+        } else {
+
+            int count = buf.readUnsignedByte();
+
+            for (int i = 0; i < count; i++) {
+
+                Position position = new Position();
+                position.setProtocol(getProtocolName());
+                position.setDeviceId(deviceSession.getDeviceId());
+
+                position.set(Position.KEY_BATTERY_LEVEL, battery);
+                position.set(Position.KEY_POWER, power);
+                position.set(Position.KEY_SATELLITES, satellites);
+
+                int hdop = buf.readUnsignedByte();
+                position.setValid(hdop > 0);
+                position.set(Position.KEY_HDOP, hdop);
+
+                position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedMedium() * 0.1));
+                position.setCourse(buf.readUnsignedShort());
+                position.setAltitude(buf.readShort());
+                position.setLongitude(buf.readInt() * 0.000001);
+                position.setLatitude(buf.readInt() * 0.000001);
+
+                position.setTime(decodeTime(buf));
+
+                position.setNetwork(new Network(CellTower.from(
+                        buf.readUnsignedShort(), buf.readUnsignedShort(),
+                        buf.readUnsignedShort(), buf.readUnsignedShort())));
+
+                buf.readUnsignedByte(); // reserved
+
+                positions.add(position);
+
+            }
+
+        }
+
+        return positions;
+    }
+
+    public static final int MSG_EVT_BPL = 6;
+    public static final int MSG_EVT_VGN = 45;
+    public static final int MSG_EVT_VGF = 46;
+    public static final int MSG_EVT_UPD = 15;
+    public static final int MSG_EVT_IDF = 17;
+    public static final int MSG_EVT_GSS = 21;
+    public static final int MSG_EVT_GES = 26;
+    public static final int MSG_EVT_GPJ = 31;
+    public static final int MSG_EVT_RMD = 35;
+    public static final int MSG_EVT_JDS = 33;
+    public static final int MSG_EVT_CRA = 23;
+    public static final int MSG_EVT_UPC = 34;
+
     private Position decodeEvent(Channel channel, SocketAddress remoteAddress, ChannelBuffer buf) {
 
         Position position = new Position();
         position.setProtocol(getProtocolName());
 
-        buf.readUnsignedByte(); // message type
+        int type = buf.readUnsignedByte();
+
         buf.readUnsignedInt(); // mask
         buf.readUnsignedShort(); // length
         buf.readUnsignedByte(); // device type
@@ -67,13 +230,63 @@ public class Gl200BinaryProtocolDecoder extends BaseProtocolDecoder {
         buf.readUnsignedByte(); // motion status
 
         position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
-        position.set(Position.KEY_INDEX, buf.readUnsignedByte());
+
+        switch (type) {
+            case MSG_EVT_BPL:
+                buf.readUnsignedShort(); // backup battery voltage
+                break;
+            case MSG_EVT_VGN:
+            case MSG_EVT_VGF:
+                buf.readUnsignedShort(); // reserved
+                buf.readUnsignedByte(); // report type
+                buf.readUnsignedInt(); // ignition duration
+                break;
+            case MSG_EVT_UPD:
+                buf.readUnsignedShort(); // code
+                buf.readUnsignedByte(); // retry
+                break;
+            case MSG_EVT_IDF:
+                buf.readUnsignedInt(); // idling duration
+                break;
+            case MSG_EVT_GSS:
+                buf.readUnsignedByte(); // gps signal status
+                buf.readUnsignedInt(); // reserved
+                break;
+            case MSG_EVT_GES:
+                buf.readUnsignedShort(); // trigger geo id
+                buf.readUnsignedByte(); // trigger geo enable
+                buf.readUnsignedByte(); // trigger mode
+                buf.readUnsignedInt(); // radius
+                buf.readUnsignedInt(); // check interval
+                break;
+            case MSG_EVT_GPJ:
+                buf.readUnsignedByte(); // cw jamming value
+                buf.readUnsignedByte(); // gps jamming state
+                break;
+            case MSG_EVT_RMD:
+                buf.readUnsignedByte(); // roaming state
+                break;
+            case MSG_EVT_JDS:
+                buf.readUnsignedByte(); // jamming state
+                break;
+            case MSG_EVT_CRA:
+                buf.readUnsignedByte(); // crash counter
+                break;
+            case MSG_EVT_UPC:
+                buf.readUnsignedByte(); // command id
+                buf.readUnsignedShort(); // result
+                break;
+            default:
+                break;
+        }
+
+        buf.readUnsignedByte(); // count
 
         int hdop = buf.readUnsignedByte();
         position.setValid(hdop > 0);
         position.set(Position.KEY_HDOP, hdop);
 
-        position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedMedium()));
+        position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedMedium() * 0.1));
         position.setCourse(buf.readUnsignedShort());
         position.setAltitude(buf.readShort());
         position.setLongitude(buf.readInt() * 0.000001);
@@ -179,6 +392,8 @@ public class Gl200BinaryProtocolDecoder extends BaseProtocolDecoder {
         ChannelBuffer buf = (ChannelBuffer) msg;
 
         switch (buf.readBytes(4).toString(StandardCharsets.US_ASCII)) {
+            case "+RSP":
+                return decodeLocation(channel, remoteAddress, buf);
             case "+INF":
                 return decodeInformation(channel, remoteAddress, buf);
             case "+EVT":
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java
index cb9cdf759..8a1602de7 100644
--- a/test/org/traccar/ProtocolTest.java
+++ b/test/org/traccar/ProtocolTest.java
@@ -118,7 +118,7 @@ public class ProtocolTest extends BaseTest {
 
         Assert.assertNotNull("list is null", decodedObject);
         Assert.assertTrue("not a list", decodedObject instanceof List);
-        Assert.assertFalse("list if empty", ((List) decodedObject).isEmpty());
+        Assert.assertFalse("list is empty", ((List) decodedObject).isEmpty());
 
         for (Object item : (List) decodedObject) {
             verifyDecodedPosition(item, checkLocation, false, expected);
diff --git a/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java
index 24830a953..ebcd4139b 100644
--- a/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java
@@ -10,6 +10,18 @@ public class Gl200BinaryProtocolDecoderTest extends ProtocolTest {
 
         Gl200BinaryProtocolDecoder decoder = new Gl200BinaryProtocolDecoder(new Gl200Protocol());
 
+        verifyPosition(decoder, binary(
+                "2b4556542d00fc1fbf0063450102020956325403000343056437f8220700000200000000010000160100f2007eff75a1f0025c6b1a07e1080108241a02680003189c1ac500000000000002100800000000000000000007e1080108241a19e24e4e0d0a"));
+
+        verifyPositions(decoder, binary(
+                "2b5253506400fc1fbf058e450102020956325403000343056438ed2205010e61c6f0ff75a1b4025c6af959803d8ba07ffe17dea03f7e1fdda0007df7dfa03e7e3fd0a0befdf7cea001fddfd8a000fdefdca042fd9fe1a0427d6fe9a0017db7dca0407d47e7a0027d67e5bfc0fd77eca03ffd8fe4bfff7dcfddbffd7dbfdebffdfddfe2bfbe7e0fe1bf7f7e67e2bf7bfed7e2bf7c7f5fe2bffbffc7e3a12880a7daa0b9013fe3a0f801b7dfa0bd81efe1a03f8207e0a03e8217e4a07e023fe9a0bd824feca03a02affda07b02d004a07f02e007a00002d808a041830001a003834fefa00402b7eebf8382a7ebbfc28267e9bf81821fe3bf0181d7e3bf01016fe9bf010117edbf4080c7f6bf7f8087fabfbf805ff9a0fa8097fca23401300aa0b4016019a13a817026a13b81883ea0be81a83fa0bd81b03ba00101d83abfc0039874bfc081b835bfbf819834bfc081982fa01004702ea00502500da002827802bfc0825fffbf41821fffbf4081d801bf3f816802bec180fffebec20077fdbf80002801bfc0000800a000000800e0e0a202804ffba14a8127eea0460107e4a0cc809fd9a0c4004fcda0c2004fcaa080007fbfa0410067bebfc100c7b6a03f8037c1bfbf004fc6a03f0057c6a0410027c5a081001fbaa0418017baa001001fb8a0007fe7bca000ffdfb7a0817fc7b7a040ffbfb3a0407fb7b4a0407fb7b1bf807fbfb3a0007fb7b5a0007fb7b1a0007fb7b2a0007fbfb3a0407fafaba000ffb7ada0017f97aba040ff7faca001ff77b6bf3fff67b3bf007f87bea082ff47b4bfc27f17c1bfffff3fc2bebdff9fcabe3effbfe0bf3cff47e9a03c002ff0a1740097e9a1f8813fe1a12f01f7fca0fa028ff8a07f02a7fea041829007a00302bff8bf810287f2a0080257e1a0050207dbbfc481cfd3a044819fcda043015fc3a043810fc2a0c680a7b2a0448027b0a0857fa7aea0c37f67a2a0017ee7a7a0407f0f9fa000ff079fa03ffeffa1a03ffeffa2a07fff17a0a03fff1fa0a03fff2fa2a03fff3fa0a07fff47a2a0007f579fa03fff4f9da03fff679ca0007f679ea000ff4f9ca07fff5f9ca0007f579cbfc07f5f9fbf407f6fa6bf807f6fabbfc07f7fadbf807f87b2a0407f87b0a0407f77aba000ff77afbfc07f77aea03fff7fada07fff7faca000ff7fada0007f77abbfc0ff77b0a000ff7faea042ff2faba0037ee7ada0437e57a1a0037e27abbfc1fdf7bcbf827defc5bf01fe0fcebf017e3fd5bfc17e2fdca0ff7e27d7a13cfe27cba0bd7e0fa7a07d7e6fb9a07d7eb7b3a07efedfaea03ffef7afa0c07eefa7a07f7f07a3a03fff0fa3a03f7f27a2a03f7f37a4bfff7f6fa3bfff7f5fa3a07eff979fa03f7fbfa2a03f7fdfa1bfbf8017a5bfbf0037adbeff004fb8bfbf004fc1beff804fcbbf7f8047d5bf408027debf408007e8a03e804fdebf7e8027f2bf00ffefffa0400017efa0418017f1a041002feca0410017edbf007fbffea0007fdff6a1018027e4bf81ffc7f6a1008017dca0c10087bea0018097baa083ffc7cda0837fafc7a102ff0fc8a0c27effb9a0c2fe87c1a143fbf78ea07f7dcfc0a0bd7dffb3a03d7e47b1a03ffe77afa07ffe77ada0007e77aebfc07e77afbfc07e8faea03ffea7afbfbf7ecfb4bfbcfeffbbbf7bff8fb8bf7d0027bebffb809fc7bffa00ffc9bf78813fd9a03d8197e1a03b81d7e6a07e01efdda00081bfdda00101bfdba03f81a7dfbfc001afdbbfbd81a7f1bfbe0187eebf80814feea0028127e7a081813fe2a0010147e6a03e8147f4a0408167eca040817fe7a0018157e4bfc8011fdaa08b002fd1a009ffa7d5a009fe57f6a04b7df7f4a0097e07eca0027df7edbf807e2feca000fe3feca07ffe37f0a0407e0ff7a040fde7f0a0007de7eea000fdcff4a001fddffaa000fdcff8a0027dcffda07f7dbff3a03f7dc7f402680003189c355300000109000002120700000000000000000007e1080108290019e63b5c0d0a"));
+
+        verifyNotNull(decoder, binary(
+                "2B5253500300FC1FFF0064450102020867623130302D446F642F442105007018217345005F010100000001100045073C4D4101DB86BD07E106130B2B0F0460000018770013000000030000000106020F2300002714301107E106130B2B1003424EFB0D0A"));
+
+        verifyPositions(decoder, binary(
+                "2b5253500700fc1fbf005d4501020209563254030003430564377e42071001000000000000007eff75a151025c6a8107e10801081a2a02680003189c1ac500000000000002100700000000000000000007e1080108241019e17ebe0d0a"));
+
         verifyAttributes(decoder, binary(
                 "2b494e4601fd7f0076676231303000000045010202090104020500004100054007e107150b061d0000003f010e02580000000000d0312a1013648935103226313921591f1200000000000302680003189c1ac3001b02680003189c1ac4000d02680003189c1ac5001207e107150b0d3704f658060d0a"));