aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-02-25 14:18:03 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-02-25 14:18:03 +1300
commit595221ee506b59386694da5f4f892d04cd865e63 (patch)
tree72f11ef99c29ac1f45e31d80e2459ae9e1024b2a
parente31017a798a2f6404569ab52be60e6f4846db576 (diff)
downloadtrackermap-server-595221ee506b59386694da5f4f892d04cd865e63.tar.gz
trackermap-server-595221ee506b59386694da5f4f892d04cd865e63.tar.bz2
trackermap-server-595221ee506b59386694da5f4f892d04cd865e63.zip
Support new Xexun format (fix #1096)
-rw-r--r--src/org/traccar/protocol/Xexun2ProtocolDecoder.java4
-rw-r--r--test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java3
-rw-r--r--test/org/traccar/protocol/XexunProtocolDecoderTest.java5
3 files changed, 9 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
index ea2197b31..d60e48750 100644
--- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
@@ -50,14 +50,14 @@ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder {
"(\\d+\\.\\d+)," + // Speed
"(\\d+\\.\\d+)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
- "[^,]*,[^,]*,.\\*..," + // Checksum
+ "[^\\*]*\\*..," + // Checksum
"([FL])," + // Signal
"(?:([^,]*),)?" + // Alarm
".*imei:" +
"(\\d+)," + // IMEI
"(\\d+)," + // Satellites
"(-?\\d+\\.\\d+)?," + // Altitude
- "[FL]:(\\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 bd8a40640..5e6a336b8 100644
--- a/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Xexun2ProtocolDecoderTest.java
@@ -48,6 +48,9 @@ public class Xexun2ProtocolDecoderTest {
verify(decoder.decode(null, null,
"150216154418,5277,GNRMC,134418.000,A,5533.8973,N,03745.4398,E,0.00,308.85,160215,,,A*7A,F,, imei:864244028033115,10,169.8,F:4.28V,1,132,48269,250,99,6D0D,8572"));
+ verify(decoder.decode(null, null,
+ "150224173341,+66961544651,GPRMC,093341.000,A,1344.5716,N,10033.6648,E,0.00,0.00,240215,,,A*68,F,,imei:865328028306149,05,106.4,F:4.01V/ADC1=0.20V/ADC2=0.00V,0,159,955,520,01,5DE8,0399,6.21km"));
+
}
}
diff --git a/test/org/traccar/protocol/XexunProtocolDecoderTest.java b/test/org/traccar/protocol/XexunProtocolDecoderTest.java
index b1f019721..9b19d3822 100644
--- a/test/org/traccar/protocol/XexunProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/XexunProtocolDecoderTest.java
@@ -34,7 +34,10 @@ public class XexunProtocolDecoderTest {
verify(decoder.decode(null, null,
"GNRMC,134418.000,A,5533.8973,N,03745.4398,E,0.00,308.85,160215,,,A*7A,F,, imei:864244028033115,"));
-
+
+ verify(decoder.decode(null, null,
+ "GPRMC,093341.000,A,1344.5716,N,10033.6648,E,0.00,0.00,240215,,,A*68,F,,imei:865328028306149,"));
+
}
}