aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-04-29 23:59:55 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2019-04-29 23:59:55 -0700
commit3190df1c77db9b17691bfd469c3f92de58ea14ed (patch)
tree44d138a1fc9a023ec5df513c2818f39997cb9bd8
parent97d471f2bed2d2a5a59d20c24c1594fa3c55d760 (diff)
downloadtrackermap-server-3190df1c77db9b17691bfd469c3f92de58ea14ed.tar.gz
trackermap-server-3190df1c77db9b17691bfd469c3f92de58ea14ed.tar.bz2
trackermap-server-3190df1c77db9b17691bfd469c3f92de58ea14ed.zip
Implement Fifotrack commands
-rw-r--r--src/main/java/org/traccar/protocol/FifotrackProtocol.java5
-rw-r--r--src/main/java/org/traccar/protocol/FifotrackProtocolEncoder.java45
-rw-r--r--src/test/java/org/traccar/protocol/FifotrackProtocolEncoderTest.java24
3 files changed, 74 insertions, 0 deletions
diff --git a/src/main/java/org/traccar/protocol/FifotrackProtocol.java b/src/main/java/org/traccar/protocol/FifotrackProtocol.java
index 12cd00b4e..d1c3cf695 100644
--- a/src/main/java/org/traccar/protocol/FifotrackProtocol.java
+++ b/src/main/java/org/traccar/protocol/FifotrackProtocol.java
@@ -19,15 +19,20 @@ import io.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.PipelineBuilder;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
public class FifotrackProtocol extends BaseProtocol {
public FifotrackProtocol() {
+ setSupportedDataCommands(
+ Command.TYPE_CUSTOM,
+ Command.TYPE_REQUEST_PHOTO);
addServer(new TrackerServer(false, getName()) {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
pipeline.addLast(new FifotrackFrameDecoder());
pipeline.addLast(new StringEncoder());
+ pipeline.addLast(new FifotrackProtocolEncoder());
pipeline.addLast(new FifotrackProtocolDecoder(FifotrackProtocol.this));
}
});
diff --git a/src/main/java/org/traccar/protocol/FifotrackProtocolEncoder.java b/src/main/java/org/traccar/protocol/FifotrackProtocolEncoder.java
new file mode 100644
index 000000000..ff0a2e56e
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/FifotrackProtocolEncoder.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019 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.Checksum;
+import org.traccar.model.Command;
+
+public class FifotrackProtocolEncoder extends StringProtocolEncoder {
+
+ private Object formatCommand(Command command, String content) {
+ String uniqueId = getUniqueId(command.getDeviceId());
+ int length = 1 + uniqueId.length() + 3 + content.length();
+ String result = String.format("##%02d,%s,1,%s*", length, uniqueId, content);
+ result += Checksum.sum(result) + "\r\n";
+ return result;
+ }
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_CUSTOM:
+ return formatCommand(command, command.getString(Command.KEY_DATA));
+ case Command.TYPE_REQUEST_PHOTO:
+ return formatCommand(command, "D05,3");
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/src/test/java/org/traccar/protocol/FifotrackProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/FifotrackProtocolEncoderTest.java
new file mode 100644
index 000000000..53ae8510a
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/FifotrackProtocolEncoderTest.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 FifotrackProtocolEncoderTest extends ProtocolTest {
+
+ @Test
+ public void testEncode() throws Exception {
+
+ FifotrackProtocolEncoder encoder = new FifotrackProtocolEncoder();
+
+ Command command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_REQUEST_PHOTO);
+
+ assertEquals("##24,123456789012345,1,D05,3*9F\r\n", encoder.encodeCommand(command));
+
+ }
+
+}