From 88e5b090d7a71255a29fe6ad2ae1525c1c0a03be Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 14 Nov 2021 16:28:57 -0800 Subject: Rename protocol to Techto Cruz --- setup/default.xml | 2 +- .../org/traccar/protocol/CruzTechoProtocol.java | 39 -------- .../traccar/protocol/CruzTechoProtocolDecoder.java | 108 --------------------- .../org/traccar/protocol/TechtoCruzProtocol.java | 39 ++++++++ .../protocol/TechtoCruzProtocolDecoder.java | 108 +++++++++++++++++++++ .../protocol/CruzTechoProtocolDecoderTest.java | 18 ---- .../protocol/TechtoCruzProtocolDecoderTest.java | 18 ++++ 7 files changed, 166 insertions(+), 166 deletions(-) delete mode 100644 src/main/java/org/traccar/protocol/CruzTechoProtocol.java delete mode 100644 src/main/java/org/traccar/protocol/CruzTechoProtocolDecoder.java create mode 100644 src/main/java/org/traccar/protocol/TechtoCruzProtocol.java create mode 100644 src/main/java/org/traccar/protocol/TechtoCruzProtocolDecoder.java delete mode 100644 src/test/java/org/traccar/protocol/CruzTechoProtocolDecoderTest.java create mode 100644 src/test/java/org/traccar/protocol/TechtoCruzProtocolDecoderTest.java diff --git a/setup/default.xml b/setup/default.xml index d691bec62..f314413f1 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -299,6 +299,6 @@ 5231 5232 5233 - 5234 + 5234 diff --git a/src/main/java/org/traccar/protocol/CruzTechoProtocol.java b/src/main/java/org/traccar/protocol/CruzTechoProtocol.java deleted file mode 100644 index da54e118a..000000000 --- a/src/main/java/org/traccar/protocol/CruzTechoProtocol.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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 CruzTechoProtocol extends BaseProtocol { - - public CruzTechoProtocol() { - 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 CruzTechoProtocolDecoder(CruzTechoProtocol.this)); - } - }); - } - -} diff --git a/src/main/java/org/traccar/protocol/CruzTechoProtocolDecoder.java b/src/main/java/org/traccar/protocol/CruzTechoProtocolDecoder.java deleted file mode 100644 index 9809fa5a8..000000000 --- a/src/main/java/org/traccar/protocol/CruzTechoProtocolDecoder.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * 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.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 CruzTechoProtocolDecoder extends BaseProtocolDecoder { - - public CruzTechoProtocolDecoder(Protocol protocol) { - super(protocol); - } - - private static final Pattern PATTERN = new PatternBuilder() - .text("$$A") - .number("d+,") // length - .number("(d+),") // imei - .number("(dd)(dd)(dd)") // date (yymmdd) - .number("(dd)(dd)(dd),") // time (hhmmss) - .expression("([AV]),") // valid - .expression("[^,]+,") // manufacturer - .expression("([^,]+),") // license plate - .number("(d+.d+),") // speed - .number("(d+),") // odometer - .number("(-?d+.d+),[NS],") // latitude - .number("(-?d+.d+),[WE],") // longitude - .number("(-?d+.d+),") // altitude - .number("(d+.d+),") // course - .number("(d+),") // satellites - .number("(d+),") // rssi - .number("(d+.d+),") // power - .number("(d+.d+),") // battery - .number("([01]),") // charge - .number("[01],") // speed sensor - .number("[01],") // gps status - .number("([01]),") // ignition - .number("([01]),") // overspeed - .any() - .compile(); - - @Override - protected Object decode( - Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { - - 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.next().equals("A")); - - position.set("registration", parser.next()); - - position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble())); - - position.set(Position.KEY_ODOMETER, parser.nextInt()); - - position.setLatitude(parser.nextDouble()); - position.setLongitude(parser.nextDouble()); - position.setAltitude(parser.nextDouble()); - position.setCourse(parser.nextDouble()); - - position.set(Position.KEY_SATELLITES, parser.nextInt()); - position.set(Position.KEY_RSSI, parser.nextInt()); - position.set(Position.KEY_POWER, parser.nextDouble()); - position.set(Position.KEY_BATTERY, parser.nextDouble()); - position.set(Position.KEY_CHARGE, parser.nextInt() > 0); - position.set(Position.KEY_IGNITION, parser.nextInt() > 0); - - if (parser.nextInt() > 0) { - position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED); - } - - return position; - } - -} diff --git a/src/main/java/org/traccar/protocol/TechtoCruzProtocol.java b/src/main/java/org/traccar/protocol/TechtoCruzProtocol.java new file mode 100644 index 000000000..890a8abb1 --- /dev/null +++ b/src/main/java/org/traccar/protocol/TechtoCruzProtocol.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 TechtoCruzProtocol extends BaseProtocol { + + public TechtoCruzProtocol() { + 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 TechtoCruzProtocolDecoder(TechtoCruzProtocol.this)); + } + }); + } + +} diff --git a/src/main/java/org/traccar/protocol/TechtoCruzProtocolDecoder.java b/src/main/java/org/traccar/protocol/TechtoCruzProtocolDecoder.java new file mode 100644 index 000000000..6b9f0edb6 --- /dev/null +++ b/src/main/java/org/traccar/protocol/TechtoCruzProtocolDecoder.java @@ -0,0 +1,108 @@ +/* + * 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.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 TechtoCruzProtocolDecoder extends BaseProtocolDecoder { + + public TechtoCruzProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("$$A") + .number("d+,") // length + .number("(d+),") // imei + .number("(dd)(dd)(dd)") // date (yymmdd) + .number("(dd)(dd)(dd),") // time (hhmmss) + .expression("([AV]),") // valid + .expression("[^,]+,") // manufacturer + .expression("([^,]+),") // license plate + .number("(d+.d+),") // speed + .number("(d+),") // odometer + .number("(-?d+.d+),[NS],") // latitude + .number("(-?d+.d+),[WE],") // longitude + .number("(-?d+.d+),") // altitude + .number("(d+.d+),") // course + .number("(d+),") // satellites + .number("(d+),") // rssi + .number("(d+.d+),") // power + .number("(d+.d+),") // battery + .number("([01]),") // charge + .number("[01],") // speed sensor + .number("[01],") // gps status + .number("([01]),") // ignition + .number("([01]),") // overspeed + .any() + .compile(); + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + 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.next().equals("A")); + + position.set("registration", parser.next()); + + position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble())); + + position.set(Position.KEY_ODOMETER, parser.nextInt()); + + position.setLatitude(parser.nextDouble()); + position.setLongitude(parser.nextDouble()); + position.setAltitude(parser.nextDouble()); + position.setCourse(parser.nextDouble()); + + position.set(Position.KEY_SATELLITES, parser.nextInt()); + position.set(Position.KEY_RSSI, parser.nextInt()); + position.set(Position.KEY_POWER, parser.nextDouble()); + position.set(Position.KEY_BATTERY, parser.nextDouble()); + position.set(Position.KEY_CHARGE, parser.nextInt() > 0); + position.set(Position.KEY_IGNITION, parser.nextInt() > 0); + + if (parser.nextInt() > 0) { + position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED); + } + + return position; + } + +} diff --git a/src/test/java/org/traccar/protocol/CruzTechoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CruzTechoProtocolDecoderTest.java deleted file mode 100644 index 3dfe9ef62..000000000 --- a/src/test/java/org/traccar/protocol/CruzTechoProtocolDecoderTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.traccar.protocol; - -import org.junit.Test; -import org.traccar.ProtocolTest; - -public class CruzTechoProtocolDecoderTest extends ProtocolTest { - - @Test - public void testDecode() throws Exception { - - var decoder = new CruzTechoProtocolDecoder(null); - - verifyPosition(decoder, text( - "$$A120,8612345678910,211005105836,A,FLEX,KCB 947C,000.0,0,-1.38047,S,36.93951,E,1648.4,243.140,21,28,12.1,3.7,0,1,0,0,0,*F6")); - - } - -} diff --git a/src/test/java/org/traccar/protocol/TechtoCruzProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TechtoCruzProtocolDecoderTest.java new file mode 100644 index 000000000..8f4a7915d --- /dev/null +++ b/src/test/java/org/traccar/protocol/TechtoCruzProtocolDecoderTest.java @@ -0,0 +1,18 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class TechtoCruzProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + var decoder = new TechtoCruzProtocolDecoder(null); + + verifyPosition(decoder, text( + "$$A120,8612345678910,211005105836,A,FLEX,KCB 947C,000.0,0,-1.38047,S,36.93951,E,1648.4,243.140,21,28,12.1,3.7,0,1,0,0,0,*F6")); + + } + +} -- cgit v1.2.3