diff options
| author | Anton Tananaev <anton@traccar.org> | 2023-01-03 09:36:23 -0800 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2023-01-03 09:36:23 -0800 |
| commit | 046076aeb6f0c79bb59ef9aead4ebbc23e286c63 (patch) | |
| tree | f353bb2605bba993c1f56f20a324e191e1bcf270 /src | |
| parent | 2ed386ecd1fa6b51cf3115fe6fe4626ebfceea31 (diff) | |
| download | trackermap-server-046076aeb6f0c79bb59ef9aead4ebbc23e286c63.tar.gz trackermap-server-046076aeb6f0c79bb59ef9aead4ebbc23e286c63.tar.bz2 trackermap-server-046076aeb6f0c79bb59ef9aead4ebbc23e286c63.zip | |
Handle ZX303 variation
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java index 15588c89b..ef09677bf 100644 --- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -803,7 +803,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { getLastLocation(position, null); } - if (hasLbs(type)) { + if (hasLbs(type) && buf.readableBytes() > 6) { decodeLbs(position, buf, type, hasStatus(type) && type != MSG_LBS_ALARM); } diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java index 9d0716c7d..23c29b0d3 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( + "78781511170103100e1f9904efe30400a97f88003410ffdd000d0a")); + verifyAttribute(decoder, binary( "787819a5012ed0000075df000000000098661502050413000019a12b0d0a"), Position.KEY_ALARM, Position.ALARM_TAMPERING); |