diff options
| -rw-r--r-- | setup/default.xml | 1 | ||||
| -rw-r--r-- | src/org/traccar/CharacterDelimiterFrameDecoder.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/protocol/C2stekProtocol.java | 39 | ||||
| -rw-r--r-- | src/org/traccar/protocol/C2stekProtocolDecoder.java | 123 | ||||
| -rw-r--r-- | test/org/traccar/protocol/C2stekProtocolDecoderTest.java | 21 |
5 files changed, 188 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml index c847f749e..0d515001d 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -256,5 +256,6 @@ <entry key='smartsole.port'>5178</entry> <entry key='its.port'>5179</entry> <entry key='xrb28.port'>5180</entry> + <entry key='c2stek.port'>5181</entry> </properties> diff --git a/src/org/traccar/CharacterDelimiterFrameDecoder.java b/src/org/traccar/CharacterDelimiterFrameDecoder.java index 7ce83ff78..eeb8834dc 100644 --- a/src/org/traccar/CharacterDelimiterFrameDecoder.java +++ b/src/org/traccar/CharacterDelimiterFrameDecoder.java @@ -50,6 +50,10 @@ public class CharacterDelimiterFrameDecoder extends DelimiterBasedFrameDecoder { super(maxFrameLength, createDelimiter(delimiter)); } + public CharacterDelimiterFrameDecoder(int maxFrameLength, boolean stripDelimiter, String delimiter) { + super(maxFrameLength, stripDelimiter, createDelimiter(delimiter)); + } + public CharacterDelimiterFrameDecoder(int maxFrameLength, String... delimiters) { super(maxFrameLength, convertDelimiters(delimiters)); } diff --git a/src/org/traccar/protocol/C2stekProtocol.java b/src/org/traccar/protocol/C2stekProtocol.java new file mode 100644 index 000000000..804621fd3 --- /dev/null +++ b/src/org/traccar/protocol/C2stekProtocol.java @@ -0,0 +1,39 @@ +/* + * Copyright 2018 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.string.StringDecoder; +import io.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.CharacterDelimiterFrameDecoder; +import org.traccar.PipelineBuilder; +import org.traccar.TrackerServer; + +public class C2stekProtocol extends BaseProtocol { + + public C2stekProtocol() { + addServer(new TrackerServer(false, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, false, "$AP")); + pipeline.addLast(new StringEncoder()); + pipeline.addLast(new StringDecoder()); + pipeline.addLast(new C2stekProtocolDecoder(C2stekProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/C2stekProtocolDecoder.java b/src/org/traccar/protocol/C2stekProtocolDecoder.java new file mode 100644 index 000000000..001cfe6ba --- /dev/null +++ b/src/org/traccar/protocol/C2stekProtocolDecoder.java @@ -0,0 +1,123 @@ +/* + * Copyright 2018 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.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class C2stekProtocolDecoder extends BaseProtocolDecoder { + + public C2stekProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("PA$") + .number("(d+)") // imei + .text("$") + .expression(".#") // data type + .number("(dd)(dd)(dd)#") // date (yymmdd) + .number("(dd)(dd)(dd)#") // time (hhmmss) + .number("([01])#") // valid + .number("(-?d+.d+)#") // latitude + .number("(-?d+.d+)#") // longitude + .number("(d+.d+)#") // speed + .number("(d+.d+)#") // course + .number("(-?d+.d+)#") // altitude + .number("(d+)#") // battery + .number("d+#") // geo area alarm + .number("(x+)#") // alarm + .number("([01])") // armed + .number("([01])") // door + .number("([01])#") // ignition + .any() + .text("$AP") + .compile(); + + private String decodeAlarm(int alarm) { + switch (alarm) { + case 0x2: + return Position.ALARM_SHOCK; + case 0x3: + return Position.ALARM_POWER_CUT; + case 0x4: + return Position.ALARM_OVERSPEED; + case 0x5: + return Position.ALARM_SOS; + case 0x6: + return Position.ALARM_DOOR; + case 0xA: + return Position.ALARM_LOW_BATTERY; + case 0xB: + return Position.ALARM_FAULT; + default: + return null; + } + } + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + org.traccar.helper.PatternUtil.MatchResult matchResult = + org.traccar.helper.PatternUtil.checkPattern(PATTERN.pattern(), (String) msg); + + String sentence = (String) msg; + if (sentence.contains("$20$") && channel != null) { + channel.writeAndFlush(new NetworkMessage(sentence, remoteAddress)); + } + + Parser parser = new Parser(PATTERN, (String) msg); + if (!parser.matches()) { + return null; + } + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + position.setTime(parser.nextDateTime()); + position.setValid(parser.nextInt() > 0); + position.setLatitude(parser.nextDouble()); + position.setLongitude(parser.nextDouble()); + position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble())); + position.setCourse(parser.nextDouble()); + position.setAltitude(parser.nextDouble()); + + position.set(Position.KEY_BATTERY, parser.nextInt() * 0.001); + position.set(Position.KEY_ALARM, decodeAlarm(parser.nextHexInt())); + + position.set(Position.KEY_ARMED, parser.nextInt() > 0); + position.set(Position.KEY_DOOR, parser.nextInt() > 0); + position.set(Position.KEY_IGNITION, parser.nextInt() > 0); + + return position; + } + +} diff --git a/test/org/traccar/protocol/C2stekProtocolDecoderTest.java b/test/org/traccar/protocol/C2stekProtocolDecoderTest.java new file mode 100644 index 000000000..0a5690f76 --- /dev/null +++ b/test/org/traccar/protocol/C2stekProtocolDecoderTest.java @@ -0,0 +1,21 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class C2stekProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + C2stekProtocolDecoder decoder = new C2stekProtocolDecoder(null); + + verifyPosition(decoder, text( + "PA$353990030327618$D#091117#020928#1#22.537222#114.020948#0.00#0.0#42.1#4183#011#1#101#Wsz-wl001#B0101940#C+3.0,-5.0,+2.0$AP")); + + verifyNull(decoder, text( + "PA$863083030602124$20$AP")); + + } + +} |