From f1a283153c790434087a6b5011e7a50c78a5ad55 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 23 Nov 2019 18:11:56 -0800
Subject: Decode additional attributes

---
 .../org/traccar/protocol/Gt06ProtocolDecoder.java  | 26 ++++++++++++++++++++++
 .../traccar/protocol/Gt06ProtocolDecoderTest.java  |  3 +++
 2 files changed, 29 insertions(+)

diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 6711fe0fd..b51da00d7 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -1020,7 +1020,28 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
         while (buf.readableBytes() > 6) {
             int moduleType = buf.readUnsignedShort();
             int moduleLength = buf.readUnsignedShort();
+
             switch (moduleType) {
+                case 0x03:
+                    position.set(Position.KEY_ICCID, ByteBufUtil.hexDump(buf.readSlice(10)));
+                    break;
+                case 0x09:
+                    position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+                    break;
+                case 0x0a:
+                    position.set(Position.KEY_SATELLITES_VISIBLE, buf.readUnsignedByte());
+                    break;
+                case 0x11:
+                    CellTower cellTower = CellTower.from(
+                            buf.readUnsignedShort(),
+                            buf.readUnsignedShort(),
+                            buf.readUnsignedShort(),
+                            buf.readUnsignedMedium(),
+                            buf.readUnsignedByte());
+                    if (cellTower.getCellId() > 0) {
+                        position.setNetwork(new Network(cellTower));
+                    }
+                    break;
                 case 0x18:
                     position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.01);
                     break;
@@ -1081,6 +1102,11 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
                     position.setLatitude(latitude);
                     position.setLongitude(longitude);
                     break;
+                case 0x34:
+                    position.set(Position.KEY_EVENT, buf.readUnsignedByte());
+                    buf.readUnsignedIntLE(); // time
+                    buf.skipBytes(buf.readUnsignedByte()); // content
+                    break;
                 default:
                     buf.skipBytes(moduleLength);
                     break;
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 0f7b2fbce..fd5d55a50 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"));
 
+        verifyAttributes(decoder, binary(
+                "797900B2700000000102003500010400330012000000000000000000000000000000000000003400061354A48DFF00003400061154A48E56000011000A000000000000000000000001000803537601000282180002000802140743044211890003000A89340752000038689636001800020182002B000116002C000454A4FF350009000100000A0001010028000100002E000400000000002A00010000290004000000000030000A000101680014016802D00000B38F0D0A"));
+
         verifyAttribute(decoder, binary(
                 "78780c95130a071223200100013ad10d0a"),
                 Position.KEY_ALARM, Position.ALARM_GENERAL);
-- 
cgit v1.2.3