aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-12-16 17:18:03 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2017-12-16 17:18:03 +1300
commit98de1d210d451e0ff8d2cbf5edeec9d5de1a0748 (patch)
tree5920f5d644c044721bef733fff18c6ca22704138
parent3ad24b1986bac058fae59249d010452d8554f518 (diff)
downloadtraccar-server-98de1d210d451e0ff8d2cbf5edeec9d5de1a0748.tar.gz
traccar-server-98de1d210d451e0ff8d2cbf5edeec9d5de1a0748.tar.bz2
traccar-server-98de1d210d451e0ff8d2cbf5edeec9d5de1a0748.zip
Implement Xirgo XT-2160 output command
-rw-r--r--src/org/traccar/protocol/XirgoProtocol.java7
-rw-r--r--src/org/traccar/protocol/XirgoProtocolEncoder.java38
-rw-r--r--test/org/traccar/protocol/XirgoProtocolEncoderTest.java26
3 files changed, 70 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/XirgoProtocol.java b/src/org/traccar/protocol/XirgoProtocol.java
index 9d7475308..13aa8fde1 100644
--- a/src/org/traccar/protocol/XirgoProtocol.java
+++ b/src/org/traccar/protocol/XirgoProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 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.
@@ -23,6 +23,7 @@ import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.CharacterDelimiterFrameDecoder;
import org.traccar.TrackerServer;
+import org.traccar.model.Command;
import java.util.List;
@@ -30,6 +31,8 @@ public class XirgoProtocol extends BaseProtocol {
public XirgoProtocol() {
super("xirgo");
+ setSupportedDataCommands(
+ Command.TYPE_OUTPUT_CONTROL);
}
@Override
@@ -40,6 +43,7 @@ public class XirgoProtocol extends BaseProtocol {
pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, "##"));
pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectEncoder", new XirgoProtocolEncoder());
pipeline.addLast("objectDecoder", new XirgoProtocolDecoder(XirgoProtocol.this));
}
});
@@ -48,6 +52,7 @@ public class XirgoProtocol extends BaseProtocol {
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("stringEncoder", new StringEncoder());
pipeline.addLast("stringDecoder", new StringDecoder());
+ pipeline.addLast("objectEncoder", new XirgoProtocolEncoder());
pipeline.addLast("objectDecoder", new XirgoProtocolDecoder(XirgoProtocol.this));
}
});
diff --git a/src/org/traccar/protocol/XirgoProtocolEncoder.java b/src/org/traccar/protocol/XirgoProtocolEncoder.java
new file mode 100644
index 000000000..fde531831
--- /dev/null
+++ b/src/org/traccar/protocol/XirgoProtocolEncoder.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 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 XirgoProtocolEncoder extends StringProtocolEncoder {
+
+ @Override
+ protected Object encodeCommand(Command command) {
+
+ switch (command.getType()) {
+ case Command.TYPE_OUTPUT_CONTROL:
+ return String.format("+XT:7005,%d,1", command.getInteger(Command.KEY_DATA) + 1);
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/protocol/XirgoProtocolEncoderTest.java b/test/org/traccar/protocol/XirgoProtocolEncoderTest.java
new file mode 100644
index 000000000..dd2e939c9
--- /dev/null
+++ b/test/org/traccar/protocol/XirgoProtocolEncoderTest.java
@@ -0,0 +1,26 @@
+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 XirgoProtocolEncoderTest extends ProtocolTest {
+
+ @Test
+ public void testEncode() throws Exception {
+
+ XirgoProtocolEncoder encoder = new XirgoProtocolEncoder();
+
+ Command command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_OUTPUT_CONTROL);
+ command.set(Command.KEY_INDEX, 0);
+ command.set(Command.KEY_DATA, 1);
+
+ assertEquals("+XT:7005,2,1", encoder.encodeCommand(command));
+
+ }
+
+}