diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-26 10:02:37 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-26 10:02:37 -0700 |
commit | d3e34416e9825833fa1db02112c56981999df039 (patch) | |
tree | d21b4414b532bfc53c9a905f3caa09f70b43b59e /src/org/traccar/protocol/Pt502ProtocolDecoder.java | |
parent | ac2405f0d57fac51fe95aa755f90fe82f26f73bc (diff) | |
parent | aa12e5c750e771016545269ffa39409b06b47eee (diff) | |
download | trackermap-server-d3e34416e9825833fa1db02112c56981999df039.tar.gz trackermap-server-d3e34416e9825833fa1db02112c56981999df039.tar.bz2 trackermap-server-d3e34416e9825833fa1db02112c56981999df039.zip |
Merge pull request #1978 from Abyss777/master
Simplification of the models hierarchy
Diffstat (limited to 'src/org/traccar/protocol/Pt502ProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/Pt502ProtocolDecoder.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/org/traccar/protocol/Pt502ProtocolDecoder.java b/src/org/traccar/protocol/Pt502ProtocolDecoder.java index 5a1a97056..850e9fcff 100644 --- a/src/org/traccar/protocol/Pt502ProtocolDecoder.java +++ b/src/org/traccar/protocol/Pt502ProtocolDecoder.java @@ -21,7 +21,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;
@@ -86,24 +85,24 @@ public class Pt502ProtocolDecoder extends BaseProtocolDecoder { dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
position.setTime(dateBuilder.getDate());
- position.set(Event.KEY_INPUT, parser.next());
- position.set(Event.KEY_OUTPUT, parser.next());
+ position.set(Position.KEY_INPUT, parser.next());
+ position.set(Position.KEY_OUTPUT, parser.next());
if (parser.hasNext()) {
String[] values = parser.next().split(",");
for (int i = 0; i < values.length; i++) {
- position.set(Event.PREFIX_ADC + (i + 1), Integer.parseInt(values[i], 16));
+ position.set(Position.PREFIX_ADC + (i + 1), Integer.parseInt(values[i], 16));
}
}
- position.set(Event.KEY_ODOMETER, parser.next());
- position.set(Event.KEY_RFID, parser.next());
+ position.set(Position.KEY_ODOMETER, parser.next());
+ position.set(Position.KEY_RFID, parser.next());
if (parser.hasNext()) {
int value = parser.nextInt(16);
- position.set(Event.KEY_BATTERY, value >> 8);
- position.set(Event.KEY_GSM, (value >> 4) & 0xf);
- position.set(Event.KEY_SATELLITES, value & 0xf);
+ position.set(Position.KEY_BATTERY, value >> 8);
+ position.set(Position.KEY_GSM, (value >> 4) & 0xf);
+ position.set(Position.KEY_SATELLITES, value & 0xf);
}
return position;
|