aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2012-12-26 10:34:38 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2012-12-26 10:34:38 +1300
commitf3055d6a47b6e038e33f7087d6a8d7746edca76a (patch)
treea791a39977e8c06ddb93c495bc4d67c885510680 /src/org/traccar
parentba9f54789326436879a85effff2131de9d7023f5 (diff)
parent24bad15e66289cf35e15bdc1fce5080f25b7b5c8 (diff)
downloadtraccar-server-f3055d6a47b6e038e33f7087d6a8d7746edca76a.tar.gz
traccar-server-f3055d6a47b6e038e33f7087d6a8d7746edca76a.tar.bz2
traccar-server-f3055d6a47b6e038e33f7087d6a8d7746edca76a.zip
Merge branch 'master' of github.com:tananaev/traccar
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/protocol/Xexun2ProtocolDecoder.java4
1 files changed, 2 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]*");