diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-21 17:27:48 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-21 17:28:07 +1300 |
commit | ff3cf10de072d4ee522447b05278d8c2f029a034 (patch) | |
tree | 8aa64fc4a8f44dc9c146c6c5e45aa2a6a754a560 /src | |
parent | 973b9e34ea077abba137d91da3000be41e35055b (diff) | |
download | traccar-server-ff3cf10de072d4ee522447b05278d8c2f029a034.tar.gz traccar-server-ff3cf10de072d4ee522447b05278d8c2f029a034.tar.bz2 traccar-server-ff3cf10de072d4ee522447b05278d8c2f029a034.zip |
Implement GT06 LBS extended support (fix #2690)
Diffstat (limited to 'src')
-rw-r--r-- | src/org/traccar/protocol/Gt06ProtocolDecoder.java | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java index 9a3efa553..59c301186 100644 --- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -235,7 +235,31 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { return null; } - if (type == MSG_STRING) { + if (type == MSG_LBS_EXTEND) { + + Position position = new Position(); + position.setDeviceId(deviceSession.getDeviceId()); + position.setProtocol(getProtocolName()); + + DateBuilder dateBuilder = new DateBuilder(timeZone) + .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte()) + .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte()); + + getLastLocation(position, dateBuilder.getDate()); + + int mcc = buf.readUnsignedShort(); + int mnc = buf.readUnsignedByte(); + + Network network = new Network(); + for (int i = 0; i < 7; i++) { + network.addCellTower(CellTower.from( + mcc, mnc, buf.readUnsignedShort(), buf.readUnsignedMedium(), -buf.readUnsignedByte())); + } + position.setNetwork(network); + + return position; + + } if (type == MSG_STRING) { Position position = new Position(); position.setDeviceId(deviceSession.getDeviceId()); |