From aa12e5c750e771016545269ffa39409b06b47eee Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 26 May 2016 09:30:43 +0500 Subject: - Simplification of the hierarchy of models classes - Removed automatically founded unnecessary imports --- src/org/traccar/protocol/TrvProtocolDecoder.java | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'src/org/traccar/protocol/TrvProtocolDecoder.java') diff --git a/src/org/traccar/protocol/TrvProtocolDecoder.java b/src/org/traccar/protocol/TrvProtocolDecoder.java index 8075515c2..8b35805a4 100644 --- a/src/org/traccar/protocol/TrvProtocolDecoder.java +++ b/src/org/traccar/protocol/TrvProtocolDecoder.java @@ -21,7 +21,6 @@ import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; import org.traccar.helper.UnitsConverter; -import org.traccar.model.Event; import org.traccar.model.Position; import java.net.SocketAddress; @@ -103,10 +102,10 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder { getLastLocation(position, null); - position.set(Event.KEY_GSM, parser.nextInt()); - position.set(Event.KEY_SATELLITES, parser.nextInt()); - position.set(Event.KEY_BATTERY, parser.nextInt()); - position.set(Event.KEY_IGNITION, parser.nextInt() != 0); + position.set(Position.KEY_GSM, parser.nextInt()); + position.set(Position.KEY_SATELLITES, parser.nextInt()); + position.set(Position.KEY_BATTERY, parser.nextInt()); + position.set(Position.KEY_IGNITION, parser.nextInt() != 0); position.set("arm", parser.nextInt()); position.set("mode", parser.nextInt()); @@ -137,19 +136,19 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder { position.setCourse(parser.nextDouble()); - position.set(Event.KEY_GSM, parser.nextInt()); - position.set(Event.KEY_SATELLITES, parser.nextInt()); - position.set(Event.KEY_BATTERY, parser.nextInt()); + position.set(Position.KEY_GSM, parser.nextInt()); + position.set(Position.KEY_SATELLITES, parser.nextInt()); + position.set(Position.KEY_BATTERY, parser.nextInt()); int acc = parser.nextInt(); if (acc != 0) { - position.set(Event.KEY_IGNITION, acc == 1); + position.set(Position.KEY_IGNITION, acc == 1); } - position.set(Event.KEY_MCC, parser.nextInt()); - position.set(Event.KEY_MNC, parser.nextInt()); - position.set(Event.KEY_LAC, parser.nextInt()); - position.set(Event.KEY_CID, parser.nextInt()); + position.set(Position.KEY_MCC, parser.nextInt()); + position.set(Position.KEY_MNC, parser.nextInt()); + position.set(Position.KEY_LAC, parser.nextInt()); + position.set(Position.KEY_CID, parser.nextInt()); return position; } -- cgit v1.2.3