From 526ec985c8d48d588511bddff22eaee53f4bdfc1 Mon Sep 17 00:00:00 2001 From: Irving Gonzalez Date: Mon, 27 Jul 2015 20:13:17 -0600 Subject: Implement Totem commands support --- src/org/traccar/model/Command.java | 3 +- src/org/traccar/protocol/TotemProtocol.java | 4 +++ src/org/traccar/protocol/TotemProtocolEncoder.java | 37 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/org/traccar/protocol/TotemProtocolEncoder.java 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/TotemProtocol.java b/src/org/traccar/protocol/TotemProtocol.java index cbc35a664..1c0d21380 100644 --- a/src/org/traccar/protocol/TotemProtocol.java +++ b/src/org/traccar/protocol/TotemProtocol.java @@ -22,11 +22,14 @@ import org.traccar.BaseProtocol; import org.traccar.TrackerServer; import java.util.List; +import org.traccar.model.Command; public class TotemProtocol extends BaseProtocol { public TotemProtocol() { super("totem"); + setSupportedCommands( + Command.TYPE_IMEI); } @Override @@ -37,6 +40,7 @@ public class TotemProtocol extends BaseProtocol { pipeline.addLast("frameDecoder", new TotemFrameDecoder()); pipeline.addLast("stringDecoder", new StringDecoder()); 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; + } +} -- cgit v1.2.3 From d6c53e951c5cdb4e03a30705f4f922b9b37fd7a6 Mon Sep 17 00:00:00 2001 From: Irving Gonzalez Date: Mon, 27 Jul 2015 21:57:00 -0600 Subject: Fixing totem commands support --- src/org/traccar/protocol/TotemFrameDecoder.java | 20 +++++++---- src/org/traccar/protocol/TotemProtocol.java | 2 ++ .../traccar/protocol/TotemProtocolEncoderTest.java | 41 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 test/org/traccar/protocol/TotemProtocolEncoderTest.java 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 1c0d21380..8445f04b6 100644 --- a/src/org/traccar/protocol/TotemProtocol.java +++ b/src/org/traccar/protocol/TotemProtocol.java @@ -22,6 +22,7 @@ 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 { @@ -39,6 +40,7 @@ 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/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)); + + } +} -- cgit v1.2.3 From 23785ccc618d65ea197ed9e081bf033ea8d64a7e Mon Sep 17 00:00:00 2001 From: Irving Gonzalez Date: Mon, 27 Jul 2015 23:05:26 -0600 Subject: Removing unnecessary try-catch and adding more commands to Totem protocol --- src/org/traccar/model/Command.java | 5 +++-- src/org/traccar/protocol/TotemFrameDecoder.java | 12 ++++-------- src/org/traccar/protocol/TotemProtocol.java | 4 +++- src/org/traccar/protocol/TotemProtocolEncoder.java | 9 ++++++--- test/org/traccar/protocol/TotemProtocolEncoderTest.java | 4 ++-- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index 90e4ba767..8c4e3f0f1 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -25,10 +25,11 @@ public class Command implements Factory { public static final String TYPE_POSITION_STOP = "positionStop"; 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 TYPE_ENGINE_RESUME = "engineResume"; public static final String KEY_UNIQUE_ID = "uniqueId"; public static final String KEY_FREQUENCY = "frequency"; + public static final String KEY_GPS_PASSWORD = "gpsPassword"; + } diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java index 00eb5ec82..6f7c3a37c 100644 --- a/src/org/traccar/protocol/TotemFrameDecoder.java +++ b/src/org/traccar/protocol/TotemFrameDecoder.java @@ -19,8 +19,7 @@ import java.nio.charset.Charset; 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; +import org.jboss.netty.handler.codec.frame.FrameDecoder; public class TotemFrameDecoder extends FrameDecoder { @@ -40,17 +39,14 @@ public class TotemFrameDecoder extends FrameDecoder { buf.skipBytes(2); } - try{ - // Read message + if(buf.toString(buf.readerIndex(), 2, Charset.defaultCharset()).equals("$$")){ int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16); if (length <= buf.readableBytes()) { return buf.readBytes(length); } - }catch(Exception e){ + }else{ //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 buf.readBytes(buf.readableBytes()); } return null; diff --git a/src/org/traccar/protocol/TotemProtocol.java b/src/org/traccar/protocol/TotemProtocol.java index 8445f04b6..097f6a593 100644 --- a/src/org/traccar/protocol/TotemProtocol.java +++ b/src/org/traccar/protocol/TotemProtocol.java @@ -30,7 +30,9 @@ public class TotemProtocol extends BaseProtocol { public TotemProtocol() { super("totem"); setSupportedCommands( - Command.TYPE_IMEI); + Command.TYPE_ENGINE_RESUME, + Command.TYPE_ENGINE_STOP + ); } @Override diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/org/traccar/protocol/TotemProtocolEncoder.java index 02dabc5fb..d236a7e2c 100644 --- a/src/org/traccar/protocol/TotemProtocolEncoder.java +++ b/src/org/traccar/protocol/TotemProtocolEncoder.java @@ -15,7 +15,7 @@ */ package org.traccar.protocol; -import org.traccar.StringProtocolEncoder; +import org.traccar.StringProtocolEncoder; import org.traccar.model.Command; /** @@ -28,8 +28,11 @@ public class TotemProtocolEncoder extends StringProtocolEncoder{ protected Object encodeCommand(Command command) { switch (command.getType()) { - case Command.TYPE_IMEI: - return "*000000,801#"; + //Assuming PIN 8 (Output C) is the power wire, like manual says but it can be PIN 5,7,8 + case Command.TYPE_ENGINE_STOP: + return formatCommand(command, "*{%s},025,C,1#", Command.KEY_GPS_PASSWORD); + case Command.TYPE_ENGINE_RESUME: + return formatCommand(command, "*{%s},025,C,0#", Command.KEY_GPS_PASSWORD); } return null; diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/test/org/traccar/protocol/TotemProtocolEncoderTest.java index 13c5b944f..1e7a95e41 100644 --- a/test/org/traccar/protocol/TotemProtocolEncoderTest.java +++ b/test/org/traccar/protocol/TotemProtocolEncoderTest.java @@ -33,9 +33,9 @@ public class TotemProtocolEncoderTest { Command command = new Command(); command.setDeviceId(2); - command.setType(Command.TYPE_IMEI); + command.setType(Command.TYPE_ENGINE_STOP); - Assert.assertEquals("*000000,801#", encoder.encodeCommand(command)); + Assert.assertEquals("*000000,025,C,1#", encoder.encodeCommand(command)); } } -- cgit v1.2.3 From 44e0e42989bfba7159625b10a9b0e5023f6f6420 Mon Sep 17 00:00:00 2001 From: Irving Gonzalez Date: Tue, 28 Jul 2015 00:36:57 -0600 Subject: Fixing TotemProtocolEncoderTest --- test/org/traccar/protocol/TotemProtocolEncoderTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/test/org/traccar/protocol/TotemProtocolEncoderTest.java index 1e7a95e41..365173bd2 100644 --- a/test/org/traccar/protocol/TotemProtocolEncoderTest.java +++ b/test/org/traccar/protocol/TotemProtocolEncoderTest.java @@ -35,6 +35,11 @@ public class TotemProtocolEncoderTest { command.setDeviceId(2); command.setType(Command.TYPE_ENGINE_STOP); + Map other = new HashMap<>(); + other.put(Command.KEY_GPS_PASSWORD, "000000"); + + command.setOther(other); + Assert.assertEquals("*000000,025,C,1#", encoder.encodeCommand(command)); } -- cgit v1.2.3