diff options
Diffstat (limited to 'src/org/traccar/protocol')
| -rwxr-xr-x | src/org/traccar/protocol/AppelloProtocolDecoder.java | 12 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gl200ProtocolDecoder.java | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/AppelloProtocolDecoder.java b/src/org/traccar/protocol/AppelloProtocolDecoder.java index 437b588a4..f04623759 100755 --- a/src/org/traccar/protocol/AppelloProtocolDecoder.java +++ b/src/org/traccar/protocol/AppelloProtocolDecoder.java @@ -33,17 +33,17 @@ public class AppelloProtocolDecoder extends BaseProtocolDecoder { } private static final Pattern PATTERN = new PatternBuilder() - .text("FOLLOWIT,") // brand - .number("(d+),") // imei + .text("FOLLOWIT,") // brand + .number("(d+),") // imei .number("(dd)(dd)(dd)") // date .number("(dd)(dd)(dd).?d*,") // time .number("(-?d+.d+),") // latitude .number("(-?d+.d+),") // longitude .number("(d+),") // speed - .number("(d+),") // course - .number("(d+),") // satellites - .number("(d+),") // altitude - .expression("([FL]),") // gps state + .number("(d+),") // course + .number("(d+),") // satellites + .number("(d+),") // altitude + .expression("([FL]),") // gps state .any() .compile(); diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index d34868b6a..4592ccdab 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -27,7 +27,6 @@ import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; -import org.traccar.helper.PatternUtil; import org.traccar.helper.UnitsConverter; import org.traccar.model.Event; import org.traccar.model.Position; |