From aff70bdec220c4fb0c2b6dd05a2e858db383cefc Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 21 Dec 2015 15:29:27 +1300
Subject: Implement new Megastek message format

---
 src/org/traccar/protocol/MegastekProtocolDecoder.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/org/traccar/protocol/MegastekProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java
index e28bf6c1d..c212e90fa 100644
--- a/src/org/traccar/protocol/MegastekProtocolDecoder.java
+++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java
@@ -222,6 +222,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
     }
 
     private static final Pattern PATTERN_NEW = new PatternBuilder()
+            .number("dddd").optional()
             .text("$MGV")
             .number("ddd,")
             .number("(d+),")                     // imei
@@ -342,7 +343,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
 
         String sentence = (String) msg;
 
-        if (sentence.startsWith("$MG")) {
+        if (sentence.contains("$MG")) {
             return decodeNew(channel, remoteAddress, sentence);
         } else {
             return decodeOld(channel, remoteAddress, sentence);
-- 
cgit v1.2.3