Support DM G50 fixed 64 byte messages

2 files changed, 175 insertions, 93 deletions

diff --git a/src/org/traccar/protocol/DmtProtocolDecoder.java b/src/org/traccar/protocol/DmtProtocolDecoder.java
index 3739253f0..204d81820 100644
--- a/src/org/traccar/protocol/DmtProtocolDecoder.java
+++ b/src/org/traccar/protocol/DmtProtocolDecoder.java
@@ -21,6 +21,7 @@ import org.jboss.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.DeviceSession;
 import org.traccar.helper.BitUtil;
+import org.traccar.helper.DateBuilder;
 import org.traccar.helper.UnitsConverter;
 import org.traccar.model.Position;
 
@@ -42,6 +43,7 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder {
     public static final int MSG_DATA_RECORD = 0x04;
     public static final int MSG_COMMIT = 0x05;
     public static final int MSG_COMMIT_RESPONSE = 0x06;
+    public static final int MSG_DATA_RECORD_64 = 0x10;
 
     public static final int MSG_CANNED_REQUEST_1 = 0x14;
     public static final int MSG_CANNED_RESPONSE_1 = 0x15;
@@ -61,6 +63,169 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder {
         }
     }
 
+    private List<Position> decodeFixed64(Channel channel, SocketAddress remoteAddress, ChannelBuffer buf) {
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+        if (deviceSession == null) {
+            return null;
+        }
+
+        List<Position> positions = new LinkedList<>();
+
+        while (buf.readableBytes() >= 64) {
+            Position position = new Position(getProtocolName());
+            position.setDeviceId(deviceSession.getDeviceId());
+
+            buf.readByte(); // type
+
+            position.set(Position.KEY_INDEX, buf.readUnsignedInt());
+
+            long time = buf.readUnsignedInt();
+            position.setTime(new DateBuilder()
+                    .setYear((int) (2000 + (time & 0x3F)))
+                    .setMonth((int) (time >> 6) & 0xF)
+                    .setDay((int) (time >> 10) & 0x1F)
+                    .setHour((int) (time >> 15) & 0x1F)
+                    .setMinute((int) (time >> 20) & 0x3F)
+                    .setSecond((int) (time >> 26) & 0x3F)
+                    .getDate());
+
+            position.setLatitude(buf.readInt() * 0.0000001);
+            position.setLongitude(buf.readInt() * 0.0000001);
+            position.setSpeed(UnitsConverter.knotsFromCps(buf.readUnsignedShort()));
+            position.setCourse(buf.readUnsignedByte() * 2);
+            position.setAltitude(buf.readShort());
+
+            buf.readUnsignedShort(); // position accuracy
+            buf.readUnsignedByte(); // speed accuracy
+
+            position.set(Position.KEY_EVENT, buf.readUnsignedByte());
+
+            position.setValid(BitUtil.check(buf.readByte(), 0));
+
+            position.set(Position.KEY_INPUT, buf.readUnsignedInt());
+            position.set(Position.KEY_OUTPUT, buf.readUnsignedShort());
+
+            for (int i = 1; i <= 5; i++) {
+                position.set(Position.PREFIX_ADC + i, buf.readShort());
+            }
+
+            position.set(Position.KEY_DEVICE_TEMP, buf.readByte());
+
+            buf.readShort(); // accelerometer x
+            buf.readShort(); // accelerometer y
+            buf.readShort(); // accelerometer z
+
+            buf.skipBytes(8); // device id
+
+            position.set(Position.KEY_PDOP, buf.readUnsignedShort() * 0.01);
+
+            buf.skipBytes(2); // reserved
+
+            buf.readUnsignedShort(); // checksum
+
+            positions.add(position);
+        }
+
+        return positions;
+    }
+
+    private List<Position> decodeStandard(Channel channel, SocketAddress remoteAddress, ChannelBuffer buf) {
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+        if (deviceSession == null) {
+            return null;
+        }
+
+        List<Position> positions = new LinkedList<>();
+
+        while (buf.readable()) {
+            int recordEnd = buf.readerIndex() + buf.readUnsignedShort();
+
+            Position position = new Position(getProtocolName());
+            position.setDeviceId(deviceSession.getDeviceId());
+
+            position.set(Position.KEY_INDEX, buf.readUnsignedInt());
+
+            position.setDeviceTime(new Date(1356998400000L + buf.readUnsignedInt() * 1000)); // since 1 Jan 2013
+
+            position.set(Position.KEY_EVENT, buf.readUnsignedByte());
+
+            while (buf.readerIndex() < recordEnd) {
+
+                int fieldId = buf.readUnsignedByte();
+                int fieldLength = buf.readUnsignedByte();
+                int fieldEnd = buf.readerIndex() + (fieldLength == 255 ? buf.readUnsignedShort() : fieldLength);
+
+                if (fieldId == 0) {
+
+                    position.setFixTime(new Date(1356998400000L + buf.readUnsignedInt() * 1000));
+                    position.setLatitude(buf.readInt() * 0.0000001);
+                    position.setLongitude(buf.readInt() * 0.0000001);
+                    position.setAltitude(buf.readShort());
+                    position.setSpeed(UnitsConverter.knotsFromCps(buf.readUnsignedShort()));
+
+                    buf.readUnsignedByte(); // speed accuracy
+
+                    position.setCourse(buf.readUnsignedByte() * 2);
+
+                    position.set(Position.KEY_PDOP, buf.readUnsignedByte() * 0.1);
+
+                    position.setAccuracy(buf.readUnsignedByte());
+                    position.setValid(buf.readUnsignedByte() != 0);
+
+                } else if (fieldId == 2) {
+
+                    int input = buf.readInt();
+                    int output = buf.readUnsignedShort();
+                    int status = buf.readUnsignedShort();
+
+                    position.set(Position.KEY_IGNITION, BitUtil.check(input, 0));
+
+                    position.set(Position.KEY_INPUT, input);
+                    position.set(Position.KEY_OUTPUT, output);
+                    position.set(Position.KEY_STATUS, status);
+
+                } else if (fieldId == 6) {
+
+                    while (buf.readerIndex() < fieldEnd) {
+                        switch (buf.readUnsignedByte()) {
+                            case 1:
+                                position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+                                break;
+                            case 2:
+                                position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
+                                break;
+                            case 3:
+                                position.set(Position.KEY_DEVICE_TEMP, buf.readShort() * 0.01);
+                                break;
+                            case 4:
+                                position.set(Position.KEY_RSSI, buf.readUnsignedShort());
+                                break;
+                            case 5:
+                                position.set("solarPower", buf.readUnsignedShort() * 0.001);
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+                }
+
+                buf.readerIndex(fieldEnd);
+
+            }
+
+            if (position.getFixTime() == null) {
+                getLastLocation(position, position.getDeviceTime());
+            }
+
+            positions.add(position);
+        }
+
+        return positions;
+    }
+
     @Override
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -106,102 +271,13 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder {
 
             sendResponse(channel, MSG_CANNED_RESPONSE_2, null);
 
-        } else if (type == MSG_DATA_RECORD) {
-
-            DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
-            if (deviceSession == null) {
-                return null;
-            }
-
-            List<Position> positions = new LinkedList<>();
-
-            while (buf.readable()) {
-
-                int recordEnd = buf.readerIndex() + buf.readUnsignedShort();
-
-                Position position = new Position(getProtocolName());
-                position.setDeviceId(deviceSession.getDeviceId());
-
-                position.set(Position.KEY_INDEX, buf.readUnsignedInt());
-
-                position.setDeviceTime(new Date(1356998400000L + buf.readUnsignedInt() * 1000)); // since 1 Jan 2013
-
-                position.set(Position.KEY_EVENT, buf.readUnsignedByte());
-
-                while (buf.readerIndex() < recordEnd) {
+        } else if (type == MSG_DATA_RECORD_64) {
 
-                    int fieldId = buf.readUnsignedByte();
-                    int fieldLength = buf.readUnsignedByte();
-                    int fieldEnd = buf.readerIndex() + (fieldLength == 255 ? buf.readUnsignedShort() : fieldLength);
+            return decodeFixed64(channel, remoteAddress, buf);
 
-                    if (fieldId == 0) {
-
-                        position.setFixTime(new Date(1356998400000L + buf.readUnsignedInt() * 1000));
-                        position.setLatitude(buf.readInt() * 0.0000001);
-                        position.setLongitude(buf.readInt() * 0.0000001);
-                        position.setAltitude(buf.readShort());
-                        position.setSpeed(UnitsConverter.knotsFromCps(buf.readUnsignedShort()));
-
-                        buf.readUnsignedByte(); // speed accuracy
-
-                        position.setCourse(buf.readUnsignedByte() * 2);
-
-                        position.set(Position.KEY_PDOP, buf.readUnsignedByte() * 0.1);
-
-                        position.setAccuracy(buf.readUnsignedByte());
-                        position.setValid(buf.readUnsignedByte() != 0);
-
-                    } else if (fieldId == 2) {
-
-                        int input = buf.readInt();
-                        int output = buf.readUnsignedShort();
-                        int status = buf.readUnsignedShort();
-
-                        position.set(Position.KEY_IGNITION, BitUtil.check(input, 0));
-
-                        position.set(Position.KEY_INPUT, input);
-                        position.set(Position.KEY_OUTPUT, output);
-                        position.set(Position.KEY_STATUS, status);
-
-                    } else if (fieldId == 6) {
-
-                        while (buf.readerIndex() < fieldEnd) {
-                            switch (buf.readUnsignedByte()) {
-                                case 1:
-                                    position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
-                                    break;
-                                case 2:
-                                    position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
-                                    break;
-                                case 3:
-                                    position.set(Position.KEY_DEVICE_TEMP, buf.readShort() * 0.01);
-                                    break;
-                                case 4:
-                                    position.set(Position.KEY_RSSI, buf.readUnsignedShort());
-                                    break;
-                                case 5:
-                                    position.set("solarPower", buf.readUnsignedShort() * 0.001);
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
-
-                    }
-
-                    buf.readerIndex(fieldEnd);
-
-                }
-
-                if (position.getFixTime() == null) {
-                    getLastLocation(position, position.getDeviceTime());
-                }
-
-                positions.add(position);
-
-            }
+        } else if (type == MSG_DATA_RECORD) {
 
-            return positions;
+            return decodeStandard(channel, remoteAddress, buf);
 
         }
 
diff --git a/test/org/traccar/protocol/DmtProtocolDecoderTest.java b/test/org/traccar/protocol/DmtProtocolDecoderTest.java
index a83dcafe2..2e386c48e 100644
--- a/test/org/traccar/protocol/DmtProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/DmtProtocolDecoderTest.java
@@ -15,6 +15,12 @@ public class DmtProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN,
                 "0255003300001b00003335333232393032373533393235310038393931353030303030303030313330343539340000000403041910780603"));
 
+        verifyPositions(decoder, false, binary(ByteOrder.LITTLE_ENDIAN,
+                "02551040000eaca40d00d2b8e562c51f9912f39a6bee00007e420091090903070100000000008b1065360000000000007fd401c4fcf2feffffffffffffffffee0000003f1b"));
+
+        verifyPositions(decoder, false, binary(ByteOrder.LITTLE_ENDIAN,
+                "02551080000eada40d00d2b8e58ac51f9912f39a6bee00007e42007e090709070000000000009010fc330000000000007fc201a0fc04ffffffffffffffffffe5000000c5d00eaea40d00d2b8e58ac51f9912f39a6bee00007e42007e09070207000000000000851008340000000000007fc201a0fc04ff0000000000000000e5000000c96d"));
+
         verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN,
                 "025500310038f90100333533333233303831363639373330003839363130313835303031383234383434363330002202010900000000"));