From d5a391ccb44bb526417d33f1e11fd2540b28103b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 23 May 2021 12:17:10 -0700 Subject: Start R12W protocol implementation --- setup/default.xml | 1 + .../java/org/traccar/protocol/R12wProtocol.java | 39 ++++++++++++++ .../org/traccar/protocol/R12wProtocolDecoder.java | 62 ++++++++++++++++++++++ .../traccar/protocol/R12wProtocolDecoderTest.java | 18 +++++++ 4 files changed, 120 insertions(+) create mode 100644 src/main/java/org/traccar/protocol/R12wProtocol.java create mode 100644 src/main/java/org/traccar/protocol/R12wProtocolDecoder.java create mode 100644 src/test/java/org/traccar/protocol/R12wProtocolDecoderTest.java diff --git a/setup/default.xml b/setup/default.xml index a518bff50..4e9e96de8 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -290,5 +290,6 @@ 5223 5224 5225 + 5226 diff --git a/src/main/java/org/traccar/protocol/R12wProtocol.java b/src/main/java/org/traccar/protocol/R12wProtocol.java new file mode 100644 index 000000000..3726233b4 --- /dev/null +++ b/src/main/java/org/traccar/protocol/R12wProtocol.java @@ -0,0 +1,39 @@ +/* + * 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.handler.codec.LineBasedFrameDecoder; +import io.netty.handler.codec.string.StringDecoder; +import io.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.PipelineBuilder; +import org.traccar.TrackerServer; + +public class R12wProtocol extends BaseProtocol { + + public R12wProtocol() { + addServer(new TrackerServer(false, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new LineBasedFrameDecoder(1024)); + pipeline.addLast(new StringEncoder()); + pipeline.addLast(new StringDecoder()); + pipeline.addLast(new R12wProtocolDecoder(R12wProtocol.this)); + } + }); + } + +} diff --git a/src/main/java/org/traccar/protocol/R12wProtocolDecoder.java b/src/main/java/org/traccar/protocol/R12wProtocolDecoder.java new file mode 100644 index 000000000..d60318447 --- /dev/null +++ b/src/main/java/org/traccar/protocol/R12wProtocolDecoder.java @@ -0,0 +1,62 @@ +/* + * 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.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.NetworkMessage; +import org.traccar.Protocol; +import org.traccar.helper.Checksum; + +import java.net.SocketAddress; + +public class R12wProtocolDecoder extends BaseProtocolDecoder { + + public R12wProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private void sendResponse(Channel channel, String type, String id, String data) { + if (channel != null) { + String sentence = String.format("$HX,%s,%s,%s,#", type, id, data); + sentence += String.format(",%02x,\r\n", Checksum.xor(sentence)); + channel.writeAndFlush(new NetworkMessage(sentence, channel.remoteAddress())); + } + } + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + String sentence = (String) msg; + String[] values = sentence.split(","); + String type = values[1]; + String id = values[2]; + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id); + if (deviceSession == null) { + return null; + } + + if (type.equals("0001")) { + sendResponse(channel, "1001", id, values[3] + ",OK"); + } + + return null; + } + +} diff --git a/src/test/java/org/traccar/protocol/R12wProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/R12wProtocolDecoderTest.java new file mode 100644 index 000000000..acb7277b5 --- /dev/null +++ b/src/test/java/org/traccar/protocol/R12wProtocolDecoderTest.java @@ -0,0 +1,18 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class R12wProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + var decoder = new R12wProtocolDecoder(null); + + verifyNull(decoder, text( + "$HX,0001,860721009104316,e92c,933402042499509,55792760080,12345678,01,a8d940a9,#,50,")); + + } + +} -- cgit v1.2.3