aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2012-12-23 19:22:42 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2012-12-23 19:22:42 -0800
commit24bad15e66289cf35e15bdc1fce5080f25b7b5c8 (patch)
tree086926b68675ef338eb2cf589356694e3a533233
parentfe9f9b034713cb98531d73698a65bd03d18a771c (diff)
parentc8281d6a4dbb8ded05f58d9428d86569a6d94b80 (diff)
downloadtraccar-server-24bad15e66289cf35e15bdc1fce5080f25b7b5c8.tar.gz
traccar-server-24bad15e66289cf35e15bdc1fce5080f25b7b5c8.tar.bz2
traccar-server-24bad15e66289cf35e15bdc1fce5080f25b7b5c8.zip
Merge pull request #113 from hallmark9/master
Tolerate Xexun2 data with low power level; Tolerate phone number without "+" prefix
-rw-r--r--src/org/traccar/protocol/Xexun2ProtocolDecoder.java4
-rw-r--r--test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java5
2 files changed, 7 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
index 6edb3733e..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
@@ -62,7 +62,7 @@ public class Xexun2ProtocolDecoder extends GenericProtocolDecoder {
"(\\d+)," + // IMEI
"(\\d+)," + // Satellites
"(\\d+\\.\\d+)," + // Altitude
- "F:(\\d+\\.\\d+)V," + // Power
+ "[FL]:(\\d+\\.\\d+)V," + // Power
".*" +
"[\r\n]*");
diff --git a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java
index 8a31334da..8d585337a 100644
--- a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java
@@ -16,6 +16,11 @@ 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"));
+
+ 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"));
}
}