Support ES310 location message

nadezhdamosunova · Dec 16, 2017 · b3e1a81 · b3e1a81
1 parent 84990b9
commit b3e1a81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/org/traccar/protocol/EskyProtocolDecoder.java b/src/org/traccar/protocol/EskyProtocolDecoder.java
@@ -33,7 +33,7 @@ public EskyProtocolDecoder(EskyProtocol protocol) {
     }
 
     private static final Pattern PATTERN = new PatternBuilder()
-            .text("EO;")                         // header
+            .expression("..;")                   // header
             .number("d+;")                       // index
             .number("(d+);")                     // imei
             .text("R;")                          // data type

diff --git a/test/org/traccar/protocol/EskyProtocolDecoderTest.java b/test/org/traccar/protocol/EskyProtocolDecoderTest.java
@@ -19,7 +19,7 @@ public void testDecode() throws Exception {
         verifyPosition(decoder, text(
                 "EO;0;864906029196626;R;0+170808155352+0.00000+0.00000+0.00+0+0x1+0+0+0+1233"));
 
-        verifyNull(decoder, text(
+        verifyPosition(decoder, text(
                 "ET;1;014682000989425;R;0+171216001250+33.34405+-111.96682+0.00+0+0x1+0+25598+0+1257+0"));
 
     }