From 40620ab3f10c686499ae2b25c8019280b1c82c1f Mon Sep 17 00:00:00 2001 From: Gábor Somogyi Date: Fri, 22 Apr 2016 23:15:39 +0200 Subject: H02 protocol arm and disarm commands --- src/org/traccar/protocol/H02Protocol.java | 9 +++- src/org/traccar/protocol/H02ProtocolEncoder.java | 67 ++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 src/org/traccar/protocol/H02ProtocolEncoder.java (limited to 'src') 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..302773eaa --- /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 { + + DateTime getActualDateTime() { + return new DateTime(DateTimeZone.UTC); + } + + private Object formatCommand(String uniqueId, String cmd, String... params) { + + DateTime now = getActualDateTime(); + String result = String.format( + "*HQ,%s,%s,%02d%02d%02d", + uniqueId, + cmd, + now.getHourOfDay(), + now.getMinuteOfHour(), + now.getSecondOfMinute() + ); + + for(String param : params) { + result += "," + param; + } + + result += "#"; + + return result; + } + + @Override + protected Object encodeCommand(Command command) { + String uniqueId = getUniqueId(command.getDeviceId()); + + switch (command.getType()) { + case Command.TYPE_ALARM_ARM: + return formatCommand(uniqueId, "SCF", "0", "0"); + case Command.TYPE_ALARM_DISARM: + return formatCommand(uniqueId, "SCF", "1", "1"); + default: + Log.warning(new UnsupportedOperationException(command.getType())); + break; + } + + return null; + } +} -- cgit v1.2.3 From 45f1471fc612834128d4ce3751905060fda04042 Mon Sep 17 00:00:00 2001 From: Gábor Somogyi Date: Sat, 23 Apr 2016 15:26:38 +0200 Subject: Throw away mockito --- pom.xml | 6 ----- src/org/traccar/protocol/H02ProtocolEncoder.java | 26 +++++++++++----------- .../traccar/protocol/H02ProtocolEncoderTest.java | 20 ++++------------- 3 files changed, 17 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/pom.xml b/pom.xml index 281828630..0b0d7c19b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,12 +22,6 @@ 4.12 test - - org.mockito - mockito-all - 1.10.19 - test - log4j log4j diff --git a/src/org/traccar/protocol/H02ProtocolEncoder.java b/src/org/traccar/protocol/H02ProtocolEncoder.java index 302773eaa..0b41b9c93 100644 --- a/src/org/traccar/protocol/H02ProtocolEncoder.java +++ b/src/org/traccar/protocol/H02ProtocolEncoder.java @@ -23,20 +23,15 @@ import org.traccar.model.Command; public class H02ProtocolEncoder extends StringProtocolEncoder { - DateTime getActualDateTime() { - return new DateTime(DateTimeZone.UTC); - } - - private Object formatCommand(String uniqueId, String cmd, String... params) { + private Object formatCommand(DateTime dt, String uniqueId, String cmd, String... params) { - DateTime now = getActualDateTime(); String result = String.format( "*HQ,%s,%s,%02d%02d%02d", uniqueId, cmd, - now.getHourOfDay(), - now.getMinuteOfHour(), - now.getSecondOfMinute() + dt.getHourOfDay(), + dt.getMinuteOfHour(), + dt.getSecondOfMinute() ); for(String param : params) { @@ -48,15 +43,14 @@ public class H02ProtocolEncoder extends StringProtocolEncoder { return result; } - @Override - protected Object encodeCommand(Command command) { + protected Object encodeCommand(Command command, DateTime dt) { String uniqueId = getUniqueId(command.getDeviceId()); switch (command.getType()) { case Command.TYPE_ALARM_ARM: - return formatCommand(uniqueId, "SCF", "0", "0"); + return formatCommand(dt, uniqueId, "SCF", "0", "0"); case Command.TYPE_ALARM_DISARM: - return formatCommand(uniqueId, "SCF", "1", "1"); + return formatCommand(dt, uniqueId, "SCF", "1", "1"); default: Log.warning(new UnsupportedOperationException(command.getType())); break; @@ -64,4 +58,10 @@ public class H02ProtocolEncoder extends StringProtocolEncoder { 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 index d50e66d72..50f36c12d 100644 --- a/test/org/traccar/protocol/H02ProtocolEncoderTest.java +++ b/test/org/traccar/protocol/H02ProtocolEncoderTest.java @@ -2,26 +2,14 @@ package org.traccar.protocol; import org.joda.time.DateTime; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; -import org.mockito.MockitoAnnotations; -import org.mockito.Spy; import org.traccar.ProtocolTest; import org.traccar.model.Command; -import static org.mockito.Mockito.when; - public class H02ProtocolEncoderTest extends ProtocolTest { - @Spy - H02ProtocolEncoder encoder; - - @Before - public void before() { - MockitoAnnotations.initMocks(this); - DateTime dt = new DateTime().withHourOfDay(1).withMinuteOfHour(2).withSecondOfMinute(3); - when(encoder.getActualDateTime()).thenReturn(dt); - } + H02ProtocolEncoder encoder = new H02ProtocolEncoder(); + DateTime dt = new DateTime().withHourOfDay(1).withMinuteOfHour(2).withSecondOfMinute(3);; @Test public void testAlarmArmEncode() throws Exception { @@ -30,7 +18,7 @@ public class H02ProtocolEncoderTest extends ProtocolTest { command.setDeviceId(1); command.setType(Command.TYPE_ALARM_ARM); - Assert.assertEquals("*HQ,123456789012345,SCF,010203,0,0#", encoder.encodeCommand(command)); + Assert.assertEquals("*HQ,123456789012345,SCF,010203,0,0#", encoder.encodeCommand(command, dt)); } @Test @@ -40,6 +28,6 @@ public class H02ProtocolEncoderTest extends ProtocolTest { command.setDeviceId(1); command.setType(Command.TYPE_ALARM_DISARM); - Assert.assertEquals("*HQ,123456789012345,SCF,010203,1,1#", encoder.encodeCommand(command)); + Assert.assertEquals("*HQ,123456789012345,SCF,010203,1,1#", encoder.encodeCommand(command, dt)); } } -- cgit v1.2.3