From b3e1a81f722ddf93ba70f16686301022bfe2454e Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 16 Dec 2017 13:22:02 +1300 Subject: [PATCH] Support ES310 location message --- src/org/traccar/protocol/EskyProtocolDecoder.java | 2 +- test/org/traccar/protocol/EskyProtocolDecoderTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/traccar/protocol/EskyProtocolDecoder.java b/src/org/traccar/protocol/EskyProtocolDecoder.java index d524224af07..b509d821f82 100644 --- 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 index 2ff58fc33d6..5132f42c169 100644 --- 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")); }