Fix MU-201 message decoding (fix #3220)

This commit is contained in:
Anton Tananaev
2017-06-04 09:48:38 -07:00
parent 40cb222ddd
commit 0d5b144050
2 changed files with 5 additions and 2 deletions

View File

@@ -38,7 +38,7 @@ public class SanavProtocolDecoder extends BaseProtocolDecoder {
.number("(d+)") // imei
.expression("&?rmc[:=]")
.text("$GPRMC,")
.number("(dd)(dd)(dd).(ddd),") // time (hhmmss.sss)
.number("(dd)(dd)(dd).d+,") // time (hhmmss.sss)
.expression("([AV]),") // validity
.number("(d+)(dd.d+),") // latitude
.expression("([NS]),")
@@ -69,7 +69,7 @@ public class SanavProtocolDecoder extends BaseProtocolDecoder {
position.setDeviceId(deviceSession.getDeviceId());
DateBuilder dateBuilder = new DateBuilder()
.setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
.setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
position.setValid(parser.next().equals("A"));
position.setLatitude(parser.nextCoordinate());

View File

@@ -9,6 +9,9 @@ public class SanavProtocolDecoderTest extends ProtocolTest {
public void testDecode() throws Exception {
SanavProtocolDecoder decoder = new SanavProtocolDecoder(new SanavProtocol());
verifyPosition(decoder, text(
"imei=1234567890&rmc=$GPRMC,091950.00,V,5300.10000,N,00900.14000,E,0.160,,200513,,,A*68,STOP,V3.872;67%,S4,H8.3,D2.38"));
verifyPosition(decoder, text(
"imei=352024028982787&rmc=$GPRMC,103048.000,A,4735.0399,N,01905.2895,E,0.00,0.00,171013,,*05,AUTO-4095mv"),