aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-05-27 19:08:27 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2020-05-27 19:08:27 -0700
commitab1022d0c571af09b2036f8694db71537fa430cd (patch)
tree303e7bd9fc27baa766a4921a6bf7e891a9969b98 /src
parent0373efc4f558041c18274b3a227fb505e7560af3 (diff)
downloadtrackermap-server-ab1022d0c571af09b2036f8694db71537fa430cd.tar.gz
trackermap-server-ab1022d0c571af09b2036f8694db71537fa430cd.tar.bz2
trackermap-server-ab1022d0c571af09b2036f8694db71537fa430cd.zip
Decode RFID driver id
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java9
-rw-r--r--src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java4
2 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 946652b03..8d83638a0 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 2020 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -885,6 +885,13 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
}
return decodeFuelData(position, buf.toString(
buf.readerIndex(), buf.readableBytes() - 4 - 2, StandardCharsets.US_ASCII));
+ } else if (subType == 0x1b) {
+ buf.readUnsignedByte(); // header
+ buf.readUnsignedByte(); // type
+ position.set(Position.KEY_DRIVER_UNIQUE_ID, ByteBufUtil.hexDump(buf.readSlice(4)));
+ buf.readUnsignedByte(); // checksum
+ buf.readUnsignedByte(); // footer
+ return position;
}
} else if (type == MSG_X1_PHOTO_DATA) {
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 672711f22..cb0b9330d 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -17,6 +17,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"78780D01086471700328358100093F040D0A"));
+ verifyAttribute(decoder, binary(
+ "7979000e941b02084277efef350303eadaed0d0a"),
+ Position.KEY_DRIVER_UNIQUE_ID, "4277efef");
+
verifyAttributes(decoder, binary(
"7878711213081f081d0fc6017ba3fa0ac62a923e550e02080503f300b26d000000004b20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202030300017c7470d0a"));