aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Stl060ProtocolDecoder.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-05-26 09:30:43 +0500
committerAbyss777 <abyss@fox5.ru>2016-05-26 09:30:43 +0500
commitaa12e5c750e771016545269ffa39409b06b47eee (patch)
treed21b4414b532bfc53c9a905f3caa09f70b43b59e /src/org/traccar/protocol/Stl060ProtocolDecoder.java
parentac2405f0d57fac51fe95aa755f90fe82f26f73bc (diff)
downloadtrackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.tar.gz
trackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.tar.bz2
trackermap-server-aa12e5c750e771016545269ffa39409b06b47eee.zip
- Simplification of the hierarchy of models classes
- Removed automatically founded unnecessary imports
Diffstat (limited to 'src/org/traccar/protocol/Stl060ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Stl060ProtocolDecoder.java25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/org/traccar/protocol/Stl060ProtocolDecoder.java
index 59a76e4b2..a966dfea1 100644
--- a/src/org/traccar/protocol/Stl060ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Stl060ProtocolDecoder.java
@@ -20,7 +20,6 @@ import org.traccar.BaseProtocolDecoder;
import org.traccar.helper.DateBuilder;
import org.traccar.helper.Parser;
import org.traccar.helper.PatternBuilder;
-import org.traccar.model.Event;
import org.traccar.model.Position;
import java.net.SocketAddress;
@@ -96,23 +95,23 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder {
// Old format
if (parser.hasNext(5)) {
- position.set(Event.KEY_ODOMETER, parser.nextInt());
- position.set(Event.KEY_IGNITION, parser.nextInt());
- position.set(Event.KEY_INPUT, parser.nextInt() + parser.nextInt() << 1);
- position.set(Event.KEY_FUEL, parser.nextInt());
+ position.set(Position.KEY_ODOMETER, parser.nextInt());
+ position.set(Position.KEY_IGNITION, parser.nextInt());
+ position.set(Position.KEY_INPUT, parser.nextInt() + parser.nextInt() << 1);
+ position.set(Position.KEY_FUEL, parser.nextInt());
}
// New format
if (parser.hasNext(10)) {
- position.set(Event.KEY_CHARGE, parser.nextInt() == 1);
- position.set(Event.KEY_IGNITION, parser.nextInt());
- position.set(Event.KEY_INPUT, parser.nextInt());
- position.set(Event.KEY_RFID, parser.next());
- position.set(Event.KEY_ODOMETER, parser.nextInt());
- position.set(Event.PREFIX_TEMP + 1, parser.nextInt());
- position.set(Event.KEY_FUEL, parser.nextInt());
+ position.set(Position.KEY_CHARGE, parser.nextInt() == 1);
+ position.set(Position.KEY_IGNITION, parser.nextInt());
+ position.set(Position.KEY_INPUT, parser.nextInt());
+ position.set(Position.KEY_RFID, parser.next());
+ position.set(Position.KEY_ODOMETER, parser.nextInt());
+ position.set(Position.PREFIX_TEMP + 1, parser.nextInt());
+ position.set(Position.KEY_FUEL, parser.nextInt());
position.set("accel", parser.nextInt() == 1);
- position.set(Event.KEY_OUTPUT, parser.nextInt() + parser.nextInt() << 1);
+ position.set(Position.KEY_OUTPUT, parser.nextInt() + parser.nextInt() << 1);
}
position.setValid(parser.next().equals("A"));