diff options
| -rw-r--r-- | setup/default.xml | 1 | ||||
| -rw-r--r-- | src/main/java/org/traccar/protocol/EnnfuProtocol.java | 39 | ||||
| -rw-r--r-- | src/main/java/org/traccar/protocol/EnnfuProtocolDecoder.java | 91 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/EnnfuProtocolDecoderTest.java | 24 |
4 files changed, 155 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml index 1794cb84f..eca6e56ff 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -284,5 +284,6 @@ <entry key='swiftech.port'>5217</entry> <entry key='iotm.port'>5218</entry> <entry key='dolphin.port'>5219</entry> + <entry key='ennfu.port'>5220</entry> </properties> diff --git a/src/main/java/org/traccar/protocol/EnnfuProtocol.java b/src/main/java/org/traccar/protocol/EnnfuProtocol.java new file mode 100644 index 000000000..cfae54198 --- /dev/null +++ b/src/main/java/org/traccar/protocol/EnnfuProtocol.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.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 EnnfuProtocol extends BaseProtocol { + + public EnnfuProtocol() { + addServer(new TrackerServer(false, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, '$')); + pipeline.addLast(new StringEncoder()); + pipeline.addLast(new StringDecoder()); + pipeline.addLast(new Ardi01ProtocolDecoder(EnnfuProtocol.this)); + } + }); + } + +} diff --git a/src/main/java/org/traccar/protocol/EnnfuProtocolDecoder.java b/src/main/java/org/traccar/protocol/EnnfuProtocolDecoder.java new file mode 100644 index 000000000..792ed1098 --- /dev/null +++ b/src/main/java/org/traccar/protocol/EnnfuProtocolDecoder.java @@ -0,0 +1,91 @@ +/* + * 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.DateBuilder; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class EnnfuProtocolDecoder extends BaseProtocolDecoder { + + public EnnfuProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("Ennfu:") + .number("(d+),") // imei + .number("(dd)(dd)(dd).dd,") // time (hhmmss) + .expression("([AV]),") // validity + .number("(dd)(dd.d+),") // latitude + .expression("([NS]),") + .number("(ddd)(dd.d+),") // longitude + .expression("([EW]),") + .number("(d+.d+)?,") // speed + .number("(d+.d+)?,") // course + .number("(dd)(dd)(dd),") // date (ddmmyy) + .number("(d+),") // rssi + .number("(d+.d+),") // battery + .number("(d+.d+),") // battery level + .number("(Vd.dd)") // firmware version + .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()); + + DateBuilder dateBuilder = new DateBuilder() + .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt()); + + position.setValid(parser.next().equals("A")); + position.setLatitude(parser.nextCoordinate()); + position.setLongitude(parser.nextCoordinate()); + position.setSpeed(parser.nextDouble(0)); + position.setCourse(parser.nextDouble(0)); + + dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt()); + position.setTime(dateBuilder.getDate()); + + position.set(Position.KEY_RSSI, parser.nextInt()); + position.set(Position.KEY_BATTERY, parser.nextDouble()); + position.set(Position.KEY_BATTERY_LEVEL, parser.nextDouble()); + position.set(Position.KEY_VERSION_FW, parser.next()); + + return position; + } + +} diff --git a/src/test/java/org/traccar/protocol/EnnfuProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EnnfuProtocolDecoderTest.java new file mode 100644 index 000000000..7d40d956b --- /dev/null +++ b/src/test/java/org/traccar/protocol/EnnfuProtocolDecoderTest.java @@ -0,0 +1,24 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class EnnfuProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + EnnfuProtocolDecoder decoder = new EnnfuProtocolDecoder(null); + + verifyPosition(decoder, text( + "Ennfu:354679095321652,041504.00,A,3154.86654,N,11849.08737,E,0.053,,080121,20,3.72,21.4,V0.01")); + + verifyPosition(decoder, text( + "Ennfu:354679095321652,060951.00,A,3154.86786,N,11849.09042,E,0.058,,060121,17,4.0,86.8,V0.01")); + + verifyNull(decoder, text( + "Ennfu:HeartBeat,354679095321652")); + + } + +} |