From 7573aa48ebc870005cd03c6246290efed5c8e657 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 28 Sep 2017 01:47:17 +1300 Subject: Support new H02 message types --- src/org/traccar/protocol/H02ProtocolDecoder.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/org') diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java index dd5d4abd7..4414870d2 100644 --- a/src/org/traccar/protocol/H02ProtocolDecoder.java +++ b/src/org/traccar/protocol/H02ProtocolDecoder.java @@ -161,7 +161,11 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder { .groupEnd() .number("(?:(dd)(dd)(dd))?,") // time (hhmmss) .groupEnd() + .groupBegin() .expression("([ABV])?,") // validity + .or() + .number("(d+),") // coding scheme + .groupEnd() .groupBegin() .number("-(d+)-(d+.d+),") // latitude .or() @@ -279,6 +283,10 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder { if (parser.hasNext()) { position.setValid(parser.next().equals("A")); } + if (parser.hasNext()) { + parser.nextInt(); // coding scheme + position.setValid(true); + } if (parser.hasNext(2)) { position.setLatitude(-parser.nextCoordinate()); -- cgit v1.2.3