diff options
| author | hallmark9 <spamsink05@yahoo.com> | 2012-12-23 21:59:13 -0500 |
|---|---|---|
| committer | hallmark9 <spamsink05@yahoo.com> | 2012-12-23 21:59:13 -0500 |
| commit | c8281d6a4dbb8ded05f58d9428d86569a6d94b80 (patch) | |
| tree | 5f90c3be0ee9f6965222b329e7d279a3060fa0b5 | |
| parent | fbb0d0d594bd423ad102c2b5a38526b928918fb9 (diff) | |
| download | traccar-server-c8281d6a4dbb8ded05f58d9428d86569a6d94b80.tar.gz traccar-server-c8281d6a4dbb8ded05f58d9428d86569a6d94b80.tar.bz2 traccar-server-c8281d6a4dbb8ded05f58d9428d86569a6d94b80.zip | |
Tolerate phone number without "+" prefix in Xexun2 data
| -rw-r--r-- | src/org/traccar/protocol/Xexun2ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java | 2 |
2 files changed, 3 insertions, 1 deletions
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")); } } |