aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-11-23 12:58:00 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2013-11-23 12:58:00 +1300
commitda39a23c3811c139b124f708fb097772b63b5c3d (patch)
tree9618b9963b97e4965368d8fd89397adcd0c7214e /src/org/traccar/protocol
parent167ae1965e3e89102345f32b03a9d0f87d0b548f (diff)
downloadtrackermap-server-da39a23c3811c139b124f708fb097772b63b5c3d.tar.gz
trackermap-server-da39a23c3811c139b124f708fb097772b63b5c3d.tar.bz2
trackermap-server-da39a23c3811c139b124f708fb097772b63b5c3d.zip
Fix xexun decoder (fix #460)
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/XexunProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/org/traccar/protocol/XexunProtocolDecoder.java
index bc92e4fb6..7e62569c4 100644
--- a/src/org/traccar/protocol/XexunProtocolDecoder.java
+++ b/src/org/traccar/protocol/XexunProtocolDecoder.java
@@ -34,7 +34,7 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
super(serverManager);
}
- static private Pattern pattern = Pattern.compile(
+ private static final Pattern pattern = Pattern.compile(
"GPRMC," +
"(\\d{2})(\\d{2})(\\d{2}).(\\d+)," + // Time (HHMMSS.SSS)
"([AV])," + // Validity
@@ -45,7 +45,7 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
"(\\d+\\.\\d+)," + // Speed
"(\\d+\\.\\d+)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
- ".*imei:" +
+ ".*\r?\n?.*imei:" +
"(\\d+),"); // IMEI
@Override