aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-04-24 01:38:14 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-04-24 01:38:14 +1200
commit037b1401975751f8b70338eae781e28bda676972 (patch)
tree7a09163c265ba5378c5c59b03db73e295addecf8
parent32f5c3ce86ed63ec880c31f337821285be52a94f (diff)
parent45f1471fc612834128d4ce3751905060fda04042 (diff)
downloadtraccar-server-037b1401975751f8b70338eae781e28bda676972.tar.gz
traccar-server-037b1401975751f8b70338eae781e28bda676972.tar.bz2
traccar-server-037b1401975751f8b70338eae781e28bda676972.zip
Merge pull request #1898 from gaborgsomogyi/h02-arm-disarm-commands
H02 protocol arm and disarm commands
-rw-r--r--src/org/traccar/protocol/H02Protocol.java9
-rw-r--r--src/org/traccar/protocol/H02ProtocolEncoder.java67
-rw-r--r--test/org/traccar/protocol/H02ProtocolEncoderTest.java33
3 files changed, 108 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/H02Protocol.java b/src/org/traccar/protocol/H02Protocol.java
index 739b8a562..2574666fe 100644
--- a/src/org/traccar/protocol/H02Protocol.java
+++ b/src/org/traccar/protocol/H02Protocol.java
@@ -17,8 +17,10 @@ package org.traccar.protocol;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
+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;
@@ -26,6 +28,10 @@ public class H02Protocol extends BaseProtocol {
public H02Protocol() {
super("h02");
+ setSupportedCommands(
+ Command.TYPE_ALARM_ARM,
+ Command.TYPE_ALARM_DISARM
+ );
}
@Override
@@ -34,9 +40,10 @@ public class H02Protocol extends BaseProtocol {
@Override
protected void addSpecificHandlers(ChannelPipeline pipeline) {
pipeline.addLast("frameDecoder", new H02FrameDecoder());
+ pipeline.addLast("stringEncoder", new StringEncoder());
+ pipeline.addLast("objectEncoder", new H02ProtocolEncoder());
pipeline.addLast("objectDecoder", new H02ProtocolDecoder(H02Protocol.this));
}
});
}
-
}
diff --git a/src/org/traccar/protocol/H02ProtocolEncoder.java b/src/org/traccar/protocol/H02ProtocolEncoder.java
new file mode 100644
index 000000000..0b41b9c93
--- /dev/null
+++ b/src/org/traccar/protocol/H02ProtocolEncoder.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2016 Gabor Somogyi (gabor.g.somogyi@gmail.com)
+ *
+ * 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.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.traccar.StringProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+public class H02ProtocolEncoder extends StringProtocolEncoder {
+
+ private Object formatCommand(DateTime dt, String uniqueId, String cmd, String... params) {
+
+ String result = String.format(
+ "*HQ,%s,%s,%02d%02d%02d",
+ uniqueId,
+ cmd,
+ dt.getHourOfDay(),
+ dt.getMinuteOfHour(),
+ dt.getSecondOfMinute()
+ );
+
+ for(String param : params) {
+ result += "," + param;
+ }
+
+ result += "#";
+
+ return result;
+ }
+
+ protected Object encodeCommand(Command command, DateTime dt) {
+ String uniqueId = getUniqueId(command.getDeviceId());
+
+ switch (command.getType()) {
+ case Command.TYPE_ALARM_ARM:
+ return formatCommand(dt, uniqueId, "SCF", "0", "0");
+ case Command.TYPE_ALARM_DISARM:
+ return formatCommand(dt, uniqueId, "SCF", "1", "1");
+ default:
+ Log.warning(new UnsupportedOperationException(command.getType()));
+ break;
+ }
+
+ return null;
+ }
+
+ @Override
+ protected Object encodeCommand(Command command) {
+ DateTime dt = new DateTime(DateTimeZone.UTC);
+ return encodeCommand(command, dt);
+ }
+}
diff --git a/test/org/traccar/protocol/H02ProtocolEncoderTest.java b/test/org/traccar/protocol/H02ProtocolEncoderTest.java
new file mode 100644
index 000000000..50f36c12d
--- /dev/null
+++ b/test/org/traccar/protocol/H02ProtocolEncoderTest.java
@@ -0,0 +1,33 @@
+package org.traccar.protocol;
+
+import org.joda.time.DateTime;
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+public class H02ProtocolEncoderTest extends ProtocolTest {
+
+ H02ProtocolEncoder encoder = new H02ProtocolEncoder();
+ DateTime dt = new DateTime().withHourOfDay(1).withMinuteOfHour(2).withSecondOfMinute(3);;
+
+ @Test
+ public void testAlarmArmEncode() throws Exception {
+
+ Command command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_ALARM_ARM);
+
+ Assert.assertEquals("*HQ,123456789012345,SCF,010203,0,0#", encoder.encodeCommand(command, dt));
+ }
+
+ @Test
+ public void testAlarmDisarmEncode() throws Exception {
+
+ Command command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_ALARM_DISARM);
+
+ Assert.assertEquals("*HQ,123456789012345,SCF,010203,1,1#", encoder.encodeCommand(command, dt));
+ }
+}