aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-06-11 21:27:36 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-06-11 21:27:48 +1200
commitcac3ddae39938a0d25c9b2a1f7fa87ecb9dd2b77 (patch)
tree8505352c7bc45f214c58c602479af19c3b614379
parent9cbd8fafc312996b9b5dae68b6c3ecf68d8facf0 (diff)
downloadtrackermap-server-cac3ddae39938a0d25c9b2a1f7fa87ecb9dd2b77.tar.gz
trackermap-server-cac3ddae39938a0d25c9b2a1f7fa87ecb9dd2b77.tar.bz2
trackermap-server-cac3ddae39938a0d25c9b2a1f7fa87ecb9dd2b77.zip
Implement eSeal commands
-rw-r--r--src/org/traccar/protocol/EsealProtocol.java6
-rw-r--r--src/org/traccar/protocol/EsealProtocolEncoder.java45
-rw-r--r--test/org/traccar/protocol/EsealProtocolEncoderTest.java24
3 files changed, 75 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/EsealProtocol.java b/src/org/traccar/protocol/EsealProtocol.java
index 534e3d0c4..c778021ec 100644
--- a/src/org/traccar/protocol/EsealProtocol.java
+++ b/src/org/traccar/protocol/EsealProtocol.java
@@ -22,6 +22,7 @@ import org.jboss.netty.handler.codec.string.StringDecoder;
import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.util.List;
@@ -29,6 +30,10 @@ public class EsealProtocol extends BaseProtocol {
public EsealProtocol() {
super("eseal");
+ setSupportedDataCommands(
+ Command.TYPE_CUSTOM,
+ Command.TYPE_ALARM_ARM,
+ Command.TYPE_ALARM_DISARM);
}
@Override
@@ -39,6 +44,7 @@ public class EsealProtocol extends BaseProtocol {
pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectEncoder", new EsealProtocolEncoder());
pipeline.addLast("objectDecoder", new EsealProtocolDecoder(EsealProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/EsealProtocolEncoder.java b/src/org/traccar/protocol/EsealProtocolEncoder.java
new file mode 100644
index 000000000..886bb80b1
--- /dev/null
+++ b/src/org/traccar/protocol/EsealProtocolEncoder.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ *
+ * 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 EsealProtocolEncoder extends StringProtocolEncoder {
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_CUSTOM:
+ return formatCommand(
+ command, "##S,eSeal,{%s},256,3.0.8,{%s},E##", Command.KEY_UNIQUE_ID, Command.KEY_DATA);
+ case Command.TYPE_ALARM_ARM:
+ return formatCommand(
+ command, "##S,eSeal,{%s},256,3.0.8,RC-Power Control,Power OFF,E##", Command.KEY_UNIQUE_ID);
+ case Command.TYPE_ALARM_DISARM:
+ return formatCommand(
+ command, "##S,eSeal,{%s},256,3.0.8,RC-Unlock,E##", Command.KEY_UNIQUE_ID);
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/protocol/EsealProtocolEncoderTest.java b/test/org/traccar/protocol/EsealProtocolEncoderTest.java
new file mode 100644
index 000000000..16f00d69b
--- /dev/null
+++ b/test/org/traccar/protocol/EsealProtocolEncoderTest.java
@@ -0,0 +1,24 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+import static org.junit.Assert.assertEquals;
+
+public class EsealProtocolEncoderTest extends ProtocolTest {
+
+ @Test
+ public void testEncode() throws Exception {
+
+ EsealProtocolEncoder encoder = new EsealProtocolEncoder();
+
+ Command command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_ALARM_DISARM);
+
+ assertEquals("##S,eSeal,123456789012345,256,3.0.8,RC-Unlock,E##", encoder.encodeCommand(command));
+
+ }
+
+}