Support JM-VG01U JM-VG02U

2 files changed, 81 insertions, 51 deletions

diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index c0e9541a4..6f06fccce 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -59,6 +59,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
     public static final int MSG_LBS = 0x11;
     public static final int MSG_GPS_LBS_1 = 0x12;
     public static final int MSG_GPS_LBS_2 = 0x22;
+    public static final int MSG_GPS_LBS_3 = 0x37;
     public static final int MSG_STATUS = 0x13;
     public static final int MSG_SATELLITE = 0x14;
     public static final int MSG_STRING = 0x15;
@@ -114,6 +115,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
             case MSG_GPS:
             case MSG_GPS_LBS_1:
             case MSG_GPS_LBS_2:
+            case MSG_GPS_LBS_3:
             case MSG_GPS_LBS_STATUS_1:
             case MSG_GPS_LBS_STATUS_2:
             case MSG_GPS_LBS_STATUS_3:
@@ -134,6 +136,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
             case MSG_LBS_STATUS:
             case MSG_GPS_LBS_1:
             case MSG_GPS_LBS_2:
+            case MSG_GPS_LBS_3:
             case MSG_GPS_LBS_STATUS_1:
             case MSG_GPS_LBS_STATUS_2:
             case MSG_GPS_LBS_STATUS_3:
@@ -726,57 +729,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
 
         } else if (isSupported(type)) {
 
-            if (hasGps(type)) {
-                decodeGps(position, buf, false, deviceSession.getTimeZone());
-            } else {
-                getLastLocation(position, null);
-            }
-
-            if (hasLbs(type)) {
-                decodeLbs(position, buf, hasStatus(type));
-            }
-
-            if (hasStatus(type)) {
-                decodeStatus(position, buf);
-            }
-
-            if (type == MSG_GPS_LBS_1 && buf.readableBytes() > 75 + 6) {
-                position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
-                String data = buf.readCharSequence(buf.readUnsignedByte(), StandardCharsets.US_ASCII).toString();
-                buf.readUnsignedByte(); // alarm
-                buf.readUnsignedByte(); // swiped
-                position.set("driverLicense", data.trim());
-            }
-
-            if (type == MSG_GPS_LBS_1 && buf.readableBytes() == 2 + 6) {
-                int mask = buf.readUnsignedShort();
-                position.set(Position.KEY_IGNITION, BitUtil.check(mask, 8 + 7));
-                position.set(Position.PREFIX_IN + 2, BitUtil.check(mask, 8 + 6));
-                if (BitUtil.check(mask, 8 + 4)) {
-                    int value = BitUtil.to(mask, 8 + 1);
-                    if (BitUtil.check(mask, 8 + 1)) {
-                        value = -value;
-                    }
-                    position.set(Position.PREFIX_TEMP + 1, value);
-                } else {
-                    int value = BitUtil.to(mask, 8 + 2);
-                    if (BitUtil.check(mask, 8 + 5)) {
-                        position.set(Position.PREFIX_ADC + 1, value);
-                    } else {
-                        position.set(Position.PREFIX_ADC + 1, value * 0.1);
-                    }
-                }
-            }
-
-            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);
-            }
-
-            if (buf.readableBytes() == 4 + 6) {
-                position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
-            }
+            decodeBasicUniversal(buf, deviceSession, type, position);
 
         } else if (type == MSG_ALARM) {
 
@@ -836,6 +789,80 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
         return position;
     }
 
+    private void decodeBasicUniversal(ByteBuf buf, DeviceSession deviceSession, int type, Position position) {
+
+        if (hasGps(type)) {
+            decodeGps(position, buf, false, deviceSession.getTimeZone());
+        } else {
+            getLastLocation(position, null);
+        }
+
+        if (hasLbs(type)) {
+            decodeLbs(position, buf, hasStatus(type));
+        }
+
+        if (hasStatus(type)) {
+            decodeStatus(position, buf);
+        }
+
+        if (type == MSG_GPS_LBS_1 && buf.readableBytes() > 75 + 6) {
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+            String data = buf.readCharSequence(buf.readUnsignedByte(), StandardCharsets.US_ASCII).toString();
+            buf.readUnsignedByte(); // alarm
+            buf.readUnsignedByte(); // swiped
+            position.set("driverLicense", data.trim());
+        }
+
+        if (type == MSG_GPS_LBS_1 && buf.readableBytes() == 2 + 6) {
+            int mask = buf.readUnsignedShort();
+            position.set(Position.KEY_IGNITION, BitUtil.check(mask, 8 + 7));
+            position.set(Position.PREFIX_IN + 2, BitUtil.check(mask, 8 + 6));
+            if (BitUtil.check(mask, 8 + 4)) {
+                int value = BitUtil.to(mask, 8 + 1);
+                if (BitUtil.check(mask, 8 + 1)) {
+                    value = -value;
+                }
+                position.set(Position.PREFIX_TEMP + 1, value);
+            } else {
+                int value = BitUtil.to(mask, 8 + 2);
+                if (BitUtil.check(mask, 8 + 5)) {
+                    position.set(Position.PREFIX_ADC + 1, value);
+                } else {
+                    position.set(Position.PREFIX_ADC + 1, value * 0.1);
+                }
+            }
+        }
+
+        if ((type == MSG_GPS_LBS_2 || type == MSG_GPS_LBS_3) && 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);
+        }
+
+        if (type == MSG_GPS_LBS_3) {
+            int module = buf.readUnsignedShort();
+            int length = buf.readUnsignedByte();
+            switch (module) {
+                case 0x0027:
+                    position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
+                    break;
+                case 0x002E:
+                    position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+                    break;
+                case 0x003B:
+                    position.setAccuracy(buf.readUnsignedShort() * 0.01);
+                    break;
+                default:
+                    buf.skipBytes(length);
+                    break;
+            }
+        }
+
+        if (buf.readableBytes() == 4 + 6) {
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+        }
+    }
+
     private Object decodeExtended(Channel channel, SocketAddress remoteAddress, ByteBuf buf) {
 
         DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 46d6a6dab..f1e952647 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -17,6 +17,9 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, binary(
                 "78780D01086471700328358100093F040D0A"));
 
+        verifyPosition(decoder, binary(
+                "7878353714080d05000ac500a886eb0b7522f000100001fe0a05ea004f1b000001002e0400002328003b0217c0003c0401020001002c468a0d0a"));
+
         verifyAttribute(decoder, binary(
                 "79790020940a035985708236675805200502187214018966051912408052452f000355560d0a"),
                 Position.KEY_ICCID, "8966051912408052452");