From f58b2d34556598ccd8504674241876bedd3aecf0 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 14 Jul 2021 22:39:24 -0700 Subject: Use correct next value --- src/main/java/org/traccar/protocol/H02ProtocolDecoder.java | 2 +- src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java b/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java index 3f8611b85..dd7141a2c 100644 --- a/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java @@ -387,7 +387,7 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder { position.setNetwork(new Network(CellTower.fromLacCid(parser.nextHexInt(0), parser.nextHexInt(0)))); } - if (parser.hasNext(4)) { + if (parser.hasNext()) { String[] values = parser.next().split(","); for (int i = 0; i < values.length; i++) { position.set(Position.PREFIX_IO + (i + 1), values[i].trim()); diff --git a/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java index f9bf574cd..a0462e675 100644 --- a/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class H02ProtocolDecoderTest extends ProtocolTest { var decoder = new H02ProtocolDecoder(null); + verifyPosition(decoder, buffer( + "*HQ,4970105243,V1,104000,A,2235.1777,N,11357.8913,E,000.27,235,130721,FFFFFBFF,460,11,d18e105,7752,6#")); + verifyAttribute(decoder, buffer( "*HQ,135790246811220,HTBT,100#"), Position.KEY_BATTERY_LEVEL, 100); -- cgit v1.2.3