aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-04-08 16:40:17 +1200
committerGitHub <noreply@github.com>2017-04-08 16:40:17 +1200
commit46de1b51bf0ece5c4f76036ad90b7f0709826d23 (patch)
tree6180a2939067978282843f1d5e23de6d7d45b4c5 /src
parent5d9be1c5eebcd6da5a39a774a770a1020b7414dd (diff)
parenteb860e161ace4f61249b795d83b993f98374716c (diff)
downloadtrackermap-server-46de1b51bf0ece5c4f76036ad90b7f0709826d23.tar.gz
trackermap-server-46de1b51bf0ece5c4f76036ad90b7f0709826d23.tar.bz2
trackermap-server-46de1b51bf0ece5c4f76036ad90b7f0709826d23.zip
Merge pull request #3075 from matlock08/master
Added EnforaEncoder tested on 2818
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/EnforaProtocol.java6
-rw-r--r--src/org/traccar/protocol/EnforaProtocolEncoder.java63
2 files changed, 69 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/EnforaProtocol.java b/src/org/traccar/protocol/EnforaProtocol.java
index 156e09d67..79cc47c0b 100644
--- a/src/org/traccar/protocol/EnforaProtocol.java
+++ b/src/org/traccar/protocol/EnforaProtocol.java
@@ -20,6 +20,7 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.util.List;
@@ -27,6 +28,10 @@ public class EnforaProtocol extends BaseProtocol {
public EnforaProtocol() {
super("enfora");
+ setSupportedDataCommands(
+ Command.TYPE_CUSTOM,
+ Command.TYPE_ENGINE_STOP,
+ Command.TYPE_ENGINE_RESUME);
}
@Override
@@ -35,6 +40,7 @@ public class EnforaProtocol extends BaseProtocol {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 0, 2, -2, 2));
+ pipeline.addLast("objectEncoder", new EnforaProtocolEncoder());
pipeline.addLast("objectDecoder", new EnforaProtocolDecoder(EnforaProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/EnforaProtocolEncoder.java b/src/org/traccar/protocol/EnforaProtocolEncoder.java
new file mode 100644
index 000000000..56e56942c
--- /dev/null
+++ b/src/org/traccar/protocol/EnforaProtocolEncoder.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Jose Castellanos
+ *
+ * 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.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.traccar.StringProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+import java.nio.charset.StandardCharsets;
+
+public class EnforaProtocolEncoder extends StringProtocolEncoder {
+
+ private ChannelBuffer encodeContent(String content) {
+
+ ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
+
+ byte[] contentBytes = content.getBytes();
+
+ buf.writeShort(contentBytes.length + 6); // Byte 0 Byte 1 Length
+ buf.writeByte(0x00); // Byte 2 Api Number Sequence
+ buf.writeByte(0x00); // Byte 3 Api Number Sequence
+ buf.writeByte(0x04); // Byte 4 Command Type 4 AT Command
+ buf.writeByte(0x00); // Byte 5 API Optional Header
+ // Byte 6+m AT Command
+ buf.writeBytes(content.getBytes(StandardCharsets.UTF_8));
+
+ return buf;
+ }
+
+ @Override
+ protected Object encodeCommand(Command command) {
+ switch (command.getType()) {
+ case Command.TYPE_CUSTOM:
+ return encodeContent(command.getString(Command.KEY_DATA));
+ case Command.TYPE_ENGINE_STOP:
+ return encodeContent("AT$IOGP3=1");
+ case Command.TYPE_ENGINE_RESUME:
+ return encodeContent("AT$IOGP3=0");
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}