diff options
Diffstat (limited to 'src/org/traccar/protocol')
5 files changed, 117 insertions, 140 deletions
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index f2d2ba5ba..c1f0af42f 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -121,7 +121,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { } // Send response #2 - if (Character.isDigit(sentence.charAt(0))) { + if (!sentence.isEmpty() && Character.isDigit(sentence.charAt(0))) { if (channel != null) { channel.write("ON", remoteAddress); } diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java index 18524fcfa..6dc382a04 100644 --- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -214,9 +214,10 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { int commandLength = buf.readUnsignedByte(); - buf.readUnsignedByte(); // server flag (reserved) - - position.set("command", buf.readBytes(commandLength - 1).toString(StandardCharsets.US_ASCII)); + if (commandLength > 0) { + buf.readUnsignedByte(); // server flag (reserved) + position.set("command", buf.readBytes(commandLength - 1).toString(StandardCharsets.US_ASCII)); + } buf.readUnsignedShort(); // language diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java index 9208af0e2..e9f6d4cde 100644 --- a/src/org/traccar/protocol/MiniFinderProtocol.java +++ b/src/org/traccar/protocol/MiniFinderProtocol.java @@ -30,7 +30,6 @@ public class MiniFinderProtocol extends BaseProtocol { public MiniFinderProtocol() { super("minifinder"); - setSupportedCommands(Command.TYPE_CUSTOM); } @Override @@ -41,7 +40,6 @@ public class MiniFinderProtocol extends BaseProtocol { pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, ';')); pipeline.addLast("stringEncoder", new StringEncoder()); pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("objectEncoder", new MiniFinderProtocolEncoder()); pipeline.addLast("objectDecoder", new MiniFinderProtocolDecoder(MiniFinderProtocol.this)); } }); diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java deleted file mode 100644 index e5762f5dd..000000000 --- a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import org.traccar.StringProtocolEncoder; -import org.traccar.helper.Log; -import org.traccar.model.Command; - -public class MiniFinderProtocolEncoder extends StringProtocolEncoder { - - @Override - protected Object encodeCommand(Command command) { - - switch (command.getType()) { - case Command.TYPE_CUSTOM: - return command.getAttributes().get("raw"); - default: - Log.warning(new UnsupportedOperationException(command.getType())); - break; - } - - return null; - } - -} diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java index f4c5c6932..4bf3678c0 100644 --- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java +++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 - 2015 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2013 - 2016 Anton Tananaev (anton.tananaev@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,141 +57,157 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder { private static final int CODEC_FM4X00 = 0x08; private static final int CODEC_12 = 0x0C; - private List<Position> parseLocation(Channel channel, ChannelBuffer buf) { - List<Position> positions = new LinkedList<>(); + private void decodeSerial(Position position, ChannelBuffer buf) { - buf.skipBytes(4); // marker - buf.readUnsignedInt(); // data length - int codec = buf.readUnsignedByte(); // codec + getLastLocation(position, null); - if (codec == CODEC_12) { - return null; // decode serial port data - } + position.set(Event.KEY_TYPE, buf.readUnsignedByte()); - int count = buf.readUnsignedByte(); + position.set("command", buf.readBytes(buf.readInt()).toString(StandardCharsets.US_ASCII)); - for (int i = 0; i < count; i++) { - Position position = new Position(); - position.setProtocol(getProtocolName()); + } - position.setDeviceId(getDeviceId()); + private void decodeLocation(Position position, ChannelBuffer buf, int codec) { - int globalMask = 0x0f; + int globalMask = 0x0f; - if (codec == CODEC_GH3000) { + if (codec == CODEC_GH3000) { - long time = buf.readUnsignedInt() & 0x3fffffff; - time += 1167609600; // 2007-01-01 00:00:00 + long time = buf.readUnsignedInt() & 0x3fffffff; + time += 1167609600; // 2007-01-01 00:00:00 - globalMask = buf.readUnsignedByte(); - if (BitUtil.check(globalMask, 0)) { + globalMask = buf.readUnsignedByte(); + if (BitUtil.check(globalMask, 0)) { - position.setTime(new Date(time * 1000)); + position.setTime(new Date(time * 1000)); - int locationMask = buf.readUnsignedByte(); + int locationMask = buf.readUnsignedByte(); - if (BitUtil.check(locationMask, 0)) { - position.setLatitude(buf.readFloat()); - position.setLongitude(buf.readFloat()); - } + if (BitUtil.check(locationMask, 0)) { + position.setLatitude(buf.readFloat()); + position.setLongitude(buf.readFloat()); + } - if (BitUtil.check(locationMask, 1)) { - position.setAltitude(buf.readUnsignedShort()); - } + if (BitUtil.check(locationMask, 1)) { + position.setAltitude(buf.readUnsignedShort()); + } - if (BitUtil.check(locationMask, 2)) { - position.setCourse(buf.readUnsignedByte() * 360.0 / 256); - } + if (BitUtil.check(locationMask, 2)) { + position.setCourse(buf.readUnsignedByte() * 360.0 / 256); + } - if (BitUtil.check(locationMask, 3)) { - position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte())); - } + if (BitUtil.check(locationMask, 3)) { + position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte())); + } - if (BitUtil.check(locationMask, 4)) { - int satellites = buf.readUnsignedByte(); - position.set(Event.KEY_SATELLITES, satellites); - position.setValid(satellites >= 3); - } + if (BitUtil.check(locationMask, 4)) { + int satellites = buf.readUnsignedByte(); + position.set(Event.KEY_SATELLITES, satellites); + position.setValid(satellites >= 3); + } - if (BitUtil.check(locationMask, 5)) { - position.set(Event.KEY_LAC, buf.readUnsignedShort()); - position.set(Event.KEY_CID, buf.readUnsignedShort()); - } + if (BitUtil.check(locationMask, 5)) { + position.set(Event.KEY_LAC, buf.readUnsignedShort()); + position.set(Event.KEY_CID, buf.readUnsignedShort()); + } - if (BitUtil.check(locationMask, 6)) { - position.set(Event.KEY_GSM, buf.readUnsignedByte()); - } + if (BitUtil.check(locationMask, 6)) { + position.set(Event.KEY_GSM, buf.readUnsignedByte()); + } - if (BitUtil.check(locationMask, 7)) { - position.set("operator", buf.readUnsignedInt()); - } + if (BitUtil.check(locationMask, 7)) { + position.set("operator", buf.readUnsignedInt()); + } - } else { + } else { - getLastLocation(position, new Date(time * 1000)); + getLastLocation(position, new Date(time * 1000)); - } + } - } else { + } else { - position.setTime(new Date(buf.readLong())); + position.setTime(new Date(buf.readLong())); - position.set("priority", buf.readUnsignedByte()); + position.set("priority", buf.readUnsignedByte()); - position.setLongitude(buf.readInt() / 10000000.0); - position.setLatitude(buf.readInt() / 10000000.0); - position.setAltitude(buf.readShort()); - position.setCourse(buf.readUnsignedShort()); + position.setLongitude(buf.readInt() / 10000000.0); + position.setLatitude(buf.readInt() / 10000000.0); + position.setAltitude(buf.readShort()); + position.setCourse(buf.readUnsignedShort()); - int satellites = buf.readUnsignedByte(); - position.set(Event.KEY_SATELLITES, satellites); + int satellites = buf.readUnsignedByte(); + position.set(Event.KEY_SATELLITES, satellites); - position.setValid(satellites != 0); + position.setValid(satellites != 0); - position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort())); + position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort())); - position.set(Event.KEY_EVENT, buf.readUnsignedByte()); + position.set(Event.KEY_EVENT, buf.readUnsignedByte()); - buf.readUnsignedByte(); // total IO data records + buf.readUnsignedByte(); // total IO data records - } + } - // Read 1 byte data - if (BitUtil.check(globalMask, 1)) { - int cnt = buf.readUnsignedByte(); - for (int j = 0; j < cnt; j++) { - int id = buf.readUnsignedByte(); - if (id == 1) { - position.set(Event.KEY_POWER, buf.readUnsignedByte()); - } else { - position.set(Event.PREFIX_IO + id, buf.readUnsignedByte()); - } + // Read 1 byte data + if (BitUtil.check(globalMask, 1)) { + int cnt = buf.readUnsignedByte(); + for (int j = 0; j < cnt; j++) { + int id = buf.readUnsignedByte(); + if (id == 1) { + position.set(Event.KEY_POWER, buf.readUnsignedByte()); + } else { + position.set(Event.PREFIX_IO + id, buf.readUnsignedByte()); } } + } - // Read 2 byte data - if (BitUtil.check(globalMask, 2)) { - int cnt = buf.readUnsignedByte(); - for (int j = 0; j < cnt; j++) { - position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedShort()); - } + // Read 2 byte data + if (BitUtil.check(globalMask, 2)) { + int cnt = buf.readUnsignedByte(); + for (int j = 0; j < cnt; j++) { + position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedShort()); } + } - // Read 4 byte data - if (BitUtil.check(globalMask, 3)) { - int cnt = buf.readUnsignedByte(); - for (int j = 0; j < cnt; j++) { - position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedInt()); - } + // Read 4 byte data + if (BitUtil.check(globalMask, 3)) { + int cnt = buf.readUnsignedByte(); + for (int j = 0; j < cnt; j++) { + position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedInt()); } + } - // Read 8 byte data - if (codec == CODEC_FM4X00) { - int cnt = buf.readUnsignedByte(); - for (int j = 0; j < cnt; j++) { - position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readLong()); - } + // Read 8 byte data + if (codec == CODEC_FM4X00) { + int cnt = buf.readUnsignedByte(); + for (int j = 0; j < cnt; j++) { + position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readLong()); + } + } + + } + + private List<Position> parseData(Channel channel, ChannelBuffer buf) { + List<Position> positions = new LinkedList<>(); + + buf.skipBytes(4); // marker + buf.readUnsignedInt(); // data length + int codec = buf.readUnsignedByte(); + int count = buf.readUnsignedByte(); + + for (int i = 0; i < count; i++) { + Position position = new Position(); + position.setProtocol(getProtocolName()); + + position.setDeviceId(getDeviceId()); + + if (codec == CODEC_12) { + decodeSerial(position, buf); + } else { + decodeLocation(position, buf, codec); } + positions.add(position); } @@ -213,7 +229,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder { if (buf.getUnsignedShort(0) > 0) { parseIdentification(channel, remoteAddress, buf); } else { - return parseLocation(channel, buf); + return parseData(channel, buf); } return null; |