diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-02-17 09:25:58 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-02-17 09:25:58 +1300 |
| commit | b7e24f5f74e658c2431f3a46b4c2cb1e912edfbe (patch) | |
| tree | 484699e1a745b4e2a9e34be1ec29405e437e73f3 /src/org/traccar/protocol | |
| parent | 5ac7a4595d6b9f56cf2f43c2a623ee5ffeee2228 (diff) | |
| download | trackermap-server-b7e24f5f74e658c2431f3a46b4c2cb1e912edfbe.tar.gz trackermap-server-b7e24f5f74e658c2431f3a46b4c2cb1e912edfbe.tar.bz2 trackermap-server-b7e24f5f74e658c2431f3a46b4c2cb1e912edfbe.zip | |
Add Xexun Glonass support (fix #1082)
Diffstat (limited to 'src/org/traccar/protocol')
| -rw-r--r-- | src/org/traccar/protocol/Xexun2ProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/XexunFrameDecoder.java | 5 | ||||
| -rw-r--r-- | src/org/traccar/protocol/XexunProtocolDecoder.java | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java index 3a9e1129e..ea2197b31 100644 --- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java +++ b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java @@ -40,7 +40,7 @@ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder { "[\r\n]*" + "(\\d+)," + // Serial "([^,]+)?," + // Number - "GPRMC," + + "G[PN]RMC," + "(\\d{2})(\\d{2})(\\d{2})\\.(\\d+)," + // Time (HHMMSS.SSS) "([AV])," + // Validity "(\\d{2})(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM) diff --git a/src/org/traccar/protocol/XexunFrameDecoder.java b/src/org/traccar/protocol/XexunFrameDecoder.java index 2dd9dad7d..1b3446ff9 100644 --- a/src/org/traccar/protocol/XexunFrameDecoder.java +++ b/src/org/traccar/protocol/XexunFrameDecoder.java @@ -38,7 +38,10 @@ public class XexunFrameDecoder extends FrameDecoder { // Find start Integer beginIndex = ChannelBufferTools.find(buf, 0, length, "GPRMC"); if (beginIndex == null) { - return null; + beginIndex = ChannelBufferTools.find(buf, 0, length, "GNRMC"); + if (beginIndex == null) { + return null; + } } // Find identifier diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/org/traccar/protocol/XexunProtocolDecoder.java index 01ce44964..dd9ed0528 100644 --- a/src/org/traccar/protocol/XexunProtocolDecoder.java +++ b/src/org/traccar/protocol/XexunProtocolDecoder.java @@ -38,7 +38,7 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder { } private static final Pattern pattern = Pattern.compile( - "GPRMC," + + "G[PN]RMC," + "(\\d{2})(\\d{2})(\\d{2}).(\\d+)," + // Time (HHMMSS.SSS) "([AV])," + // Validity "(\\d+)(\\d{2}\\.\\d+)," + // Latitude (DDMM.MMMM) |