diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-07-26 21:07:12 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-07-26 21:07:12 +1200 |
| commit | c81e2a21ce8d204f196accf5d8f0ffc59b072013 (patch) | |
| tree | a5a2309e0fd894d4dfe51b48ec85bee9b7411b68 | |
| parent | 6cec98cfcbad9b62877c93fa085bfaab5378f8a8 (diff) | |
| download | trackermap-server-c81e2a21ce8d204f196accf5d8f0ffc59b072013.tar.gz trackermap-server-c81e2a21ce8d204f196accf5d8f0ffc59b072013.tar.bz2 trackermap-server-c81e2a21ce8d204f196accf5d8f0ffc59b072013.zip | |
Fix xexun2 decoder
| -rw-r--r-- | src/org/traccar/protocol/Xexun2ProtocolDecoder.java | 3 | ||||
| -rw-r--r-- | test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java index 098647499..d85d89cfc 100644 --- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java +++ b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java @@ -33,10 +33,11 @@ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder { super(serverManager); } + //130725134142,,GPRMC,134142.591,A,3845.6283,N,00909.8876,W,2.08,287.33,250713,,,A*71,F,, imei:013227000526784,03,-50.7,L:3.69V,0,128,65337,268,03,177A,119F static private Pattern pattern = Pattern.compile( "[\r\n]*" + "(\\d+)," + // Serial - "(\\+?\\d+)," + // Number + "(\\+?\\d+)?," + // Number "GPRMC," + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d+)," + // Time (HHMMSS.SSS) "([AV])," + // Validity diff --git a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java index f6c967039..59a241ae3 100644 --- a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java @@ -33,7 +33,10 @@ public class Xexun2ProtocolDecoderTest { "111111120009,+1234,GPRMC,204530.4,A,6000.000,N,01000.6288,E,0.0,0.00,230713,0.0,E,A*3C,F,imei:123456789012345,00,,F:3.88V,0,125,,262,01,224CE1,379B")); assertNotNull(decoder.decode(null, null, - "111111120009,+1234,GPRMC,215840.7,A,6000.000,N,01000.6253,E,0.0,0.00,230713,0.0,E,A*34,F,imei:123456789012345,00,,F:3.9V,0,124,,262,01,224CE1,379B")); + "111111120009,+1234,GPRMC,215840.7,A,6000.000,N,01000.6253,E,0.0,0.00,230713,0.0,E,A*34,F,imei:123456789012345,00,,F:3.9V,0,124,,262,01,224CE1,379B")); + + assertNotNull(decoder.decode(null, null, + "130725134142,,GPRMC,134142.591,A,3845.6283,N,00909.8876,W,2.08,287.33,250713,,,A*71,F,, imei:013227000526784,03,-50.7,L:3.69V,0,128,65337,268,03,177A,119F")); } |