diff options
| -rw-r--r-- | src/org/traccar/model/Command.java | 3 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TotemFrameDecoder.java | 20 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TotemProtocol.java | 6 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TotemProtocolEncoder.java | 37 | ||||
| -rw-r--r-- | test/org/traccar/protocol/TotemProtocolEncoderTest.java | 41 |
5 files changed, 100 insertions, 7 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index f7702dbd0..90e4ba767 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -26,7 +26,8 @@ public class Command implements Factory { public static final String TYPE_POSITION_FIX = "positionFix"; public static final String TYPE_ENGINE_STOP = "engineStop"; public static final String TYPE_ENGINE_RESUME = "engineResume"; - + public static final String TYPE_IMEI = "imei"; + public static final String KEY_UNIQUE_ID = "uniqueId"; public static final String KEY_FREQUENCY = "frequency"; diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java index 5ac3064e6..00eb5ec82 100644 --- a/src/org/traccar/protocol/TotemFrameDecoder.java +++ b/src/org/traccar/protocol/TotemFrameDecoder.java @@ -20,6 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.frame.FrameDecoder; +import org.traccar.helper.Log; public class TotemFrameDecoder extends FrameDecoder { @@ -38,13 +39,20 @@ public class TotemFrameDecoder extends FrameDecoder { if (buf.getUnsignedShort(buf.readerIndex()) == 0x0d0a) { buf.skipBytes(2); } - - // Read message - int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16); - if (length <= buf.readableBytes()) { - return buf.readBytes(length); + + try{ + // Read message + int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16); + if (length <= buf.readableBytes()) { + return buf.readBytes(length); + } + }catch(Exception e){ + //TODO: notify to user the GPS response + + Log.debug("GPS Response: " + buf.toString(buf.readerIndex(), buf.readableBytes(), Charset.defaultCharset())); + //return buf.readBytes(buf.readableBytes()); } - + return null; } diff --git a/src/org/traccar/protocol/TotemProtocol.java b/src/org/traccar/protocol/TotemProtocol.java index cbc35a664..8445f04b6 100644 --- a/src/org/traccar/protocol/TotemProtocol.java +++ b/src/org/traccar/protocol/TotemProtocol.java @@ -22,11 +22,15 @@ import org.traccar.BaseProtocol; import org.traccar.TrackerServer; import java.util.List; +import org.jboss.netty.handler.codec.string.StringEncoder; +import org.traccar.model.Command; public class TotemProtocol extends BaseProtocol { public TotemProtocol() { super("totem"); + setSupportedCommands( + Command.TYPE_IMEI); } @Override @@ -36,7 +40,9 @@ public class TotemProtocol extends BaseProtocol { protected void addSpecificHandlers(ChannelPipeline pipeline) { pipeline.addLast("frameDecoder", new TotemFrameDecoder()); pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); pipeline.addLast("objectDecoder", new TotemProtocolDecoder(TotemProtocol.this)); + pipeline.addLast("objectEncoder", new TotemProtocolEncoder()); } }); } diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/org/traccar/protocol/TotemProtocolEncoder.java new file mode 100644 index 000000000..02dabc5fb --- /dev/null +++ b/src/org/traccar/protocol/TotemProtocolEncoder.java @@ -0,0 +1,37 @@ +/* + * Copyright 2015 alexis. + * + * 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.model.Command; + +/** + * + * @author Irving Gonzalez [ialexis93@gmail.com] + */ +public class TotemProtocolEncoder extends StringProtocolEncoder{ + + @Override + protected Object encodeCommand(Command command) { + + switch (command.getType()) { + case Command.TYPE_IMEI: + return "*000000,801#"; + } + + return null; + } +} diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/test/org/traccar/protocol/TotemProtocolEncoderTest.java new file mode 100644 index 000000000..13c5b944f --- /dev/null +++ b/test/org/traccar/protocol/TotemProtocolEncoderTest.java @@ -0,0 +1,41 @@ +/* + * Copyright 2015 alexis. + * + * 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 java.util.HashMap; +import java.util.Map; +import org.junit.Assert; +import org.junit.Test; +import org.traccar.model.Command; + +/** + * + * @author alexis + */ +public class TotemProtocolEncoderTest { + @Test + public void testDecode() throws Exception { + + TotemProtocolEncoder encoder = new TotemProtocolEncoder(); + + Command command = new Command(); + command.setDeviceId(2); + command.setType(Command.TYPE_IMEI); + + Assert.assertEquals("*000000,801#", encoder.encodeCommand(command)); + + } +} |