From a353cbf806f21767f6a173255141dd7db8314fe8 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 10 Mar 2013 13:12:14 +1300 Subject: Fix TLT-2H protocol (fix #162) --- src/org/traccar/protocol/Tlt2hProtocolDecoder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/org/traccar/protocol/Tlt2hProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java index 531ae28b6..66146b6fb 100644 --- a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java +++ b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java @@ -38,7 +38,7 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder { * Regular expressions pattern */ static private Pattern pattern = Pattern.compile( - "#([0-9a-f]+)" + // Cell info + "#([0-9a-f]+)?" + // Cell info "\\$GPRMC," + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d+)," + // Time (HHMMSS.SSS) "([AV])," + // Validity @@ -81,9 +81,10 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder { Integer index = 1; // Cell - extendedInfo.append(""); - extendedInfo.append(parser.group(index++)); - extendedInfo.append(""); + String cell = parser.group(index++); + if (cell != null) { + extendedInfo.append("").append(cell).append(""); + } // Time Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); -- cgit v1.2.3