Add binary INF support

2 files changed, 132 insertions, 41 deletions

diff --git a/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java b/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java
index cb0417528..a7ecf40d5 100644
--- a/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java
@@ -27,6 +27,7 @@ import org.traccar.model.Position;
 
 import java.net.SocketAddress;
 import java.nio.charset.StandardCharsets;
+import java.util.Date;
 
 public class Gl200BinaryProtocolDecoder extends BaseProtocolDecoder {
 
@@ -34,70 +35,157 @@ public class Gl200BinaryProtocolDecoder extends BaseProtocolDecoder {
         super(protocol);
     }
 
-    @Override
-    protected Object decode(
-            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+    private Date decodeTime(ChannelBuffer buf) {
+        DateBuilder dateBuilder = new DateBuilder()
+                .setDate(buf.readUnsignedShort(), buf.readUnsignedByte(), buf.readUnsignedByte())
+                .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
+        return dateBuilder.getDate();
+    }
 
-        ChannelBuffer buf = (ChannelBuffer) msg;
+    private Position decodeEvent(Channel channel, SocketAddress remoteAddress, ChannelBuffer buf) {
 
-        String header = buf.readBytes(4).toString(StandardCharsets.US_ASCII);
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
 
-        if (header.equals("+EVT")) {
+        buf.readUnsignedByte(); // message type
+        buf.readUnsignedInt(); // mask
+        buf.readUnsignedShort(); // length
+        buf.readUnsignedByte(); // device type
+        buf.readUnsignedShort(); // protocol version
 
-            Position position = new Position();
-            position.setProtocol(getProtocolName());
+        position.set(Position.KEY_VERSION_FW, String.valueOf(buf.readUnsignedShort()));
 
-            buf.readUnsignedByte(); // message type
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, String.format("%015d", buf.readLong()));
+        if (deviceSession == null) {
+            return null;
+        }
+        position.setDeviceId(deviceSession.getDeviceId());
 
-            buf.readUnsignedInt(); // mask
+        position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+        position.set(Position.KEY_POWER, buf.readUnsignedShort());
 
-            buf.readUnsignedShort(); // length
-            buf.readUnsignedByte(); // device type
-            buf.readUnsignedShort(); // protocol version
+        buf.readUnsignedByte(); // motion status
 
-            position.set(Position.KEY_VERSION_FW, String.valueOf(buf.readUnsignedShort()));
+        position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+        position.set(Position.KEY_INDEX, buf.readUnsignedByte());
 
-            DeviceSession deviceSession = getDeviceSession(
-                    channel, remoteAddress, String.format("%015d", buf.readLong()));
-            if (deviceSession == null) {
-                return null;
-            }
-            position.setDeviceId(deviceSession.getDeviceId());
+        int hdop = buf.readUnsignedByte();
+        position.setValid(hdop > 0);
+        position.set(Position.KEY_HDOP, hdop);
 
-            position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
-            position.set(Position.KEY_POWER, buf.readUnsignedShort());
+        position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedMedium()));
+        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
+
+        return position;
+    }
+
+    public static final int MSG_INF_GPS = 2;
+    public static final int MSG_INF_CID = 4;
+    public static final int MSG_INF_CSQ = 5;
+    public static final int MSG_INF_VER = 6;
+    public static final int MSG_INF_BAT = 7;
+    public static final int MSG_INF_TMZ = 9;
+    public static final int MSG_INF_GIR = 10;
+
+    private Position decodeInformation(Channel channel, SocketAddress remoteAddress, ChannelBuffer buf) {
+
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+
+        int type = buf.readUnsignedByte();
+
+        buf.readUnsignedInt(); // mask
+        buf.readUnsignedShort(); // length
 
-            buf.readUnsignedByte(); // motion status
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, String.format("%015d", buf.readLong()));
+        if (deviceSession == null) {
+            return null;
+        }
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        buf.readUnsignedByte(); // device type
+        buf.readUnsignedShort(); // protocol version
 
-            position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
-            position.set(Position.KEY_INDEX, buf.readUnsignedByte());
+        position.set(Position.KEY_VERSION_FW, String.valueOf(buf.readUnsignedShort()));
 
-            int hdop = buf.readUnsignedByte();
-            position.setValid(hdop > 0);
-            position.set(Position.KEY_HDOP, hdop);
+        if (type == MSG_INF_VER) {
+            buf.readUnsignedShort(); // hardware version
+            buf.readUnsignedShort(); // mcu version
+            buf.readUnsignedShort(); // reserved
+        }
 
-            position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedMedium()));
-            position.setCourse(buf.readUnsignedShort());
-            position.setAltitude(buf.readShort());
-            position.setLongitude(buf.readInt() * 0.000001);
-            position.setLatitude(buf.readInt() * 0.000001);
+        buf.readUnsignedByte(); // motion status
+        buf.readUnsignedByte(); // reserved
+
+        position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+
+        buf.readUnsignedByte(); // mode
+        buf.skipBytes(7); // last fix time
+        buf.readUnsignedByte(); // reserved
+        buf.readUnsignedByte();
+        buf.readUnsignedShort(); // response report mask
+        buf.readUnsignedShort(); // ign interval
+        buf.readUnsignedShort(); // igf interval
+        buf.readUnsignedInt(); // reserved
+        buf.readUnsignedByte(); // reserved
+
+        if (type == MSG_INF_BAT) {
+            position.set(Position.KEY_CHARGE, buf.readUnsignedByte() != 0);
+            position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.001);
+            position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+            position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+        }
 
-            DateBuilder dateBuilder = new DateBuilder()
-                    .setDate(buf.readUnsignedShort(), buf.readUnsignedByte(), buf.readUnsignedByte())
-                    .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
-            position.setTime(dateBuilder.getDate());
+        buf.skipBytes(10); // iccid
 
+        if (type == MSG_INF_CSQ) {
+            position.set(Position.KEY_RSSI, buf.readUnsignedByte());
+            buf.readUnsignedByte();
+        }
+
+        buf.readUnsignedByte(); // time zone flags
+        buf.readUnsignedShort(); // time zone offset
+
+        if (type == MSG_INF_GIR) {
+            buf.readUnsignedByte(); // gir trigger
+            buf.readUnsignedByte(); // cell number
             position.setNetwork(new Network(CellTower.from(
                     buf.readUnsignedShort(), buf.readUnsignedShort(),
                     buf.readUnsignedShort(), buf.readUnsignedShort())));
+            buf.readUnsignedByte(); // ta
+            buf.readUnsignedByte(); // rx level
+        }
 
-            buf.readUnsignedByte(); // reserved
+        getLastLocation(position, decodeTime(buf));
 
-            return position;
+        return position;
+    }
 
-        }
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        return null;
+        ChannelBuffer buf = (ChannelBuffer) msg;
+
+        switch (buf.readBytes(4).toString(StandardCharsets.US_ASCII)) {
+            case "+INF":
+                return decodeInformation(channel, remoteAddress, buf);
+            case "+EVT":
+                return decodeEvent(channel, remoteAddress, buf);
+            default:
+                return null;
+        }
     }
 
 }
diff --git a/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java
index 42ccd4690..24830a953 100644
--- a/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java
@@ -10,6 +10,9 @@ public class Gl200BinaryProtocolDecoderTest extends ProtocolTest {
 
         Gl200BinaryProtocolDecoder decoder = new Gl200BinaryProtocolDecoder(new Gl200Protocol());
 
+        verifyAttributes(decoder, binary(
+                "2b494e4601fd7f0076676231303000000045010202090104020500004100054007e107150b061d0000003f010e02580000000000d0312a1013648935103226313921591f1200000000000302680003189c1ac3001b02680003189c1ac4000d02680003189c1ac5001207e107150b0d3704f658060d0a"));
+
         verifyPosition(decoder, binary(
                 "2b4556540c00fc1fbf005c4501010108563254030003430564312a41090100000000003f007dff75a11a025c6a7807e1070a14041202680003189c1ac500000000000000000000000000000000000007e1070b041134054e5c6e0d0a"));