From 9ec8be4360ad3088af66d9fd432d9a85cd0ee074 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 6 Dec 2017 14:53:03 +1300
Subject: Support JT701 protocol version

---
 src/org/traccar/protocol/Jt600ProtocolDecoder.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
index 58835c7d6..e935c1449 100644
--- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
@@ -63,8 +63,9 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
             return null;
         }
 
+        int protocolVersion = 0;
         if (longFormat) {
-            buf.readUnsignedByte(); // protocol
+            protocolVersion = buf.readUnsignedByte();
         }
 
         int version = BitUtil.from(buf.readUnsignedByte(), 4);
@@ -122,6 +123,11 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
                 cellTower.setSignalStrength((int) buf.readUnsignedByte());
                 position.setNetwork(new Network(cellTower));
 
+                if (protocolVersion == 0x17) {
+                    buf.readUnsignedByte(); // geofence id
+                    buf.skipBytes(3); // reserved
+                }
+
             } else if (version == 1) {
 
                 position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
-- 
cgit v1.2.3