From fbb0d0d594bd423ad102c2b5a38526b928918fb9 Mon Sep 17 00:00:00 2001 From: hallmark9 Date: Sun, 23 Dec 2012 21:48:53 -0500 Subject: Tolerate Xexun2 data with low power level. --- test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'test/org/traccar') diff --git a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java index 8a31334da..a8247b8ba 100644 --- a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java @@ -16,6 +16,9 @@ public class Xexun2ProtocolDecoderTest { assertNotNull(decoder.decode(null, null, "111111120009,+436763737552,GPRMC,120600.000,A,6000.0000,N,13000.0000,E,0.00,0.00,010112,,,A*68,F,help me!, imei:123456789012345,04,481.2,F:4.15V,0,139,2689,232,03,2725,0576")); + assertNotNull(decoder.decode(null, null, + "111111120009,+436763737552,GPRMC,120600.000,A,6000.0000,N,13000.0000,E,0.00,0.00,010112,,,A*68,F,help me!, imei:123456789012345,04,481.2,L:3.5V,0,139,2689,232,03,2725,0576")); + } } -- cgit v1.2.3 From c8281d6a4dbb8ded05f58d9428d86569a6d94b80 Mon Sep 17 00:00:00 2001 From: hallmark9 Date: Sun, 23 Dec 2012 21:59:13 -0500 Subject: Tolerate phone number without "+" prefix in Xexun2 data --- src/org/traccar/protocol/Xexun2ProtocolDecoder.java | 2 +- test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'test/org/traccar') diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java index 39a5f76c0..54f502667 100644 --- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java +++ b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java @@ -44,7 +44,7 @@ public class Xexun2ProtocolDecoder extends GenericProtocolDecoder { static private Pattern pattern = Pattern.compile( "[\r\n]*" + "(\\d+)," + // Serial - "(\\+\\d+)," + // Number + "(\\+?\\d+)," + // Number "GPRMC," + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d{3})," + // Time (HHMMSS.SSS) "([AV])," + // Validity diff --git a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java index a8247b8ba..8d585337a 100644 --- a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java @@ -19,6 +19,8 @@ public class Xexun2ProtocolDecoderTest { assertNotNull(decoder.decode(null, null, "111111120009,+436763737552,GPRMC,120600.000,A,6000.0000,N,13000.0000,E,0.00,0.00,010112,,,A*68,F,help me!, imei:123456789012345,04,481.2,L:3.5V,0,139,2689,232,03,2725,0576")); + assertNotNull(decoder.decode(null, null, + "111111120009,436763737552,GPRMC,120600.000,A,6000.0000,N,13000.0000,E,0.00,0.00,010112,,,A*68,F,help me!, imei:123456789012345,04,481.2,L:3.5V,0,139,2689,232,03,2725,0576")); } } -- cgit v1.2.3