From 33f20c440ee2a132c222781c4197dff10ecc6b3c Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 13 Nov 2021 10:26:56 -0800 Subject: Add Topin protocol encoder --- .../java/org/traccar/protocol/TopinProtocol.java | 6 +- .../org/traccar/protocol/TopinProtocolDecoder.java | 1 + .../org/traccar/protocol/TopinProtocolEncoder.java | 66 ++++++++++++++++++++++ .../traccar/protocol/TopinProtocolEncoderTest.java | 24 ++++++++ 4 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/traccar/protocol/TopinProtocolEncoder.java create mode 100644 src/test/java/org/traccar/protocol/TopinProtocolEncoderTest.java diff --git a/src/main/java/org/traccar/protocol/TopinProtocol.java b/src/main/java/org/traccar/protocol/TopinProtocol.java index 844dd7518..d28afbf94 100644 --- a/src/main/java/org/traccar/protocol/TopinProtocol.java +++ b/src/main/java/org/traccar/protocol/TopinProtocol.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Anton Tananaev (anton@traccar.org) + * Copyright 2019 - 2021 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. @@ -18,13 +18,17 @@ package org.traccar.protocol; import org.traccar.BaseProtocol; import org.traccar.PipelineBuilder; import org.traccar.TrackerServer; +import org.traccar.model.Command; public class TopinProtocol extends BaseProtocol { public TopinProtocol() { + setSupportedDataCommands( + Command.TYPE_SOS_NUMBER); addServer(new TrackerServer(false, getName()) { @Override protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new TopinProtocolEncoder(TopinProtocol.this)); pipeline.addLast(new TopinProtocolDecoder(TopinProtocol.this)); } }); diff --git a/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java b/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java index 7fd939caa..267bce562 100644 --- a/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java @@ -50,6 +50,7 @@ public class TopinProtocolDecoder extends BaseProtocolDecoder { public static final int MSG_STATUS = 0x13; public static final int MSG_WIFI_OFFLINE = 0x17; public static final int MSG_TIME_UPDATE = 0x30; + public static final int MSG_SOS_NUMBER = 0x41; public static final int MSG_WIFI = 0x69; public static final int MSG_VIBRATION_ON = 0x92; public static final int MSG_VIBRATION_OFF = 0x93; diff --git a/src/main/java/org/traccar/protocol/TopinProtocolEncoder.java b/src/main/java/org/traccar/protocol/TopinProtocolEncoder.java new file mode 100644 index 000000000..77f80b9d4 --- /dev/null +++ b/src/main/java/org/traccar/protocol/TopinProtocolEncoder.java @@ -0,0 +1,66 @@ +/* + * Copyright 2021 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 io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import org.traccar.BaseProtocolEncoder; +import org.traccar.Protocol; +import org.traccar.model.Command; + +import java.nio.charset.StandardCharsets; + +public class TopinProtocolEncoder extends BaseProtocolEncoder { + + public TopinProtocolEncoder(Protocol protocol) { + super(protocol); + } + + private ByteBuf encodeContent(int type, ByteBuf content) { + + ByteBuf buf = Unpooled.buffer(); + + buf.writeByte(0x78); + buf.writeByte(0x78); + + buf.writeByte(1 + content.readableBytes()); // message length + + buf.writeByte(type); + + buf.writeBytes(content); + content.release(); + + buf.writeByte('\r'); + buf.writeByte('\n'); + + return buf; + } + + @Override + protected Object encodeCommand(Command command) { + + ByteBuf content = Unpooled.buffer(); + + switch (command.getType()) { + case Command.TYPE_SOS_NUMBER: + content.writeCharSequence(command.getString(Command.KEY_PHONE), StandardCharsets.US_ASCII); + return encodeContent(TopinProtocolDecoder.MSG_SOS_NUMBER, content); + default: + return null; + } + } + +} diff --git a/src/test/java/org/traccar/protocol/TopinProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/TopinProtocolEncoderTest.java new file mode 100644 index 000000000..d3ff13941 --- /dev/null +++ b/src/test/java/org/traccar/protocol/TopinProtocolEncoderTest.java @@ -0,0 +1,24 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; +import org.traccar.model.Command; + +public class TopinProtocolEncoderTest extends ProtocolTest { + + @Test + public void testEncode() throws Exception { + + var encoder = new TopinProtocolEncoder(null); + + Command command = new Command(); + command.setDeviceId(1); + command.setType(Command.TYPE_SOS_NUMBER); + command.set(Command.KEY_INDEX, 1); + command.set(Command.KEY_PHONE, "13533333333"); + + verifyCommand(encoder, command, binary("78780C4131333533333333333333330D0A")); + + } + +} -- cgit v1.2.3