From 9702fc67d842017f27832abd3b8edba47cda0f4f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 17 May 2021 21:47:03 -0700 Subject: Decode additional data (fix #4677) --- src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java | 11 +++++++++++ .../java/org/traccar/protocol/Gt06ProtocolDecoderTest.java | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java index b7d6d2595..f60cead10 100644 --- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -877,6 +877,17 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { position.set("driverLicense", data.trim()); } + if (type == MSG_GPS_LBS_1 && buf.readableBytes() == 18) { + decodeStatus(position, buf); + position.set("oil", buf.readUnsignedShort()); + int temperature = buf.readUnsignedByte(); + if (BitUtil.check(temperature, 7)) { + temperature = -BitUtil.to(temperature, 7); + } + position.set(Position.PREFIX_TEMP + 1, temperature); + position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 10); + } + if (type == MSG_GPS_LBS_1 && buf.readableBytes() == 2 + 6) { int mask = buf.readUnsignedShort(); position.set(Position.KEY_IGNITION, BitUtil.check(mask, 8 + 7)); diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java index d45d7acd9..f285fde97 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( + "78782b1215050d03041bcf031ff30a0be795bc001c17014e14a065dd95314504b6040000001c00000cd90ab8fb6f0d0a"), + Position.PREFIX_TEMP + 1, 0); + verifyAttribute(decoder, binary( "7878151330802b00000642014f0008720000802b5ee4d4c90d0a"), Position.KEY_BATTERY_LEVEL, 6); -- cgit v1.2.3