diff options
| -rw-r--r-- | debug.xml | 1 | ||||
| -rw-r--r-- | src/org/traccar/model/Position.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/GpsmtaProtocol.java | 45 | ||||
| -rw-r--r-- | src/org/traccar/protocol/GpsmtaProtocolDecoder.java | 94 | ||||
| -rw-r--r-- | test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java | 20 |
5 files changed, 161 insertions, 1 deletions
@@ -285,6 +285,7 @@ <entry key='ywt.port'>5035</entry> <entry key='tk102.port'>5036</entry> <entry key='intellitrac.port'>5037</entry> + <entry key='gpsmta.port'>5038</entry> <entry key='wialon.port'>5039</entry> <entry key='carscop.port'>5040</entry> <entry key='apel.port'>5041</entry> diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 62c999d94..8a6084775 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -30,7 +30,7 @@ public class Position extends Event implements Factory { public void setTime(Date time) { setDeviceTime(time); - fixTime = time; + setFixTime(time); } private boolean valid; diff --git a/src/org/traccar/protocol/GpsmtaProtocol.java b/src/org/traccar/protocol/GpsmtaProtocol.java new file mode 100644 index 000000000..41e7ad8b8 --- /dev/null +++ b/src/org/traccar/protocol/GpsmtaProtocol.java @@ -0,0 +1,45 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * 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 org.jboss.netty.bootstrap.ServerBootstrap; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder; +import org.jboss.netty.handler.codec.string.StringDecoder; +import org.jboss.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.TrackerServer; + +import java.util.List; + +public class GpsmtaProtocol extends BaseProtocol { + + public GpsmtaProtocol() { + super("gpsmta"); + } + + @Override + public void initTrackerServers(List<TrackerServer> serverList) { + serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new GpsmtaProtocolDecoder(GpsmtaProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/GpsmtaProtocolDecoder.java b/src/org/traccar/protocol/GpsmtaProtocolDecoder.java new file mode 100644 index 000000000..32648bc5e --- /dev/null +++ b/src/org/traccar/protocol/GpsmtaProtocolDecoder.java @@ -0,0 +1,94 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * 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 org.jboss.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.model.Event; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class GpsmtaProtocolDecoder extends BaseProtocolDecoder { + + public GpsmtaProtocolDecoder(GpsmtaProtocol protocol) { + super(protocol); + } + + private static final Pattern pattern = Pattern.compile( + "(\\d+) " + // UID + "(\\d+) " + // Time + "(\\d+\\.\\d+) " + // Latitude + "(\\d+\\.\\d+) " + // Longitude + "(\\d+) " + // Speed + "(\\d+) " + // Course + "(\\d+) " + // Accuracy + "(\\d+) " + // Altitude + "(\\d+) " + // Flags + "(\\d+) " + // Battery + "(\\d+) " + // Temperature + "(\\d).*"); // Changing status + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) + throws Exception { + + String sentence = (String) msg; + + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + return null; + } + + Position position = new Position(); + position.setProtocol(getProtocolName()); + + Integer index = 1; + + if (!identify(parser.group(index++), channel, remoteAddress)) { + return null; + } + position.setDeviceId(getDeviceId()); + + String time = parser.group(index++); + position.setTime(new Date(Long.parseLong(time) * 1000)); + + position.setLatitude(Double.parseDouble(parser.group(index++))); + position.setLongitude(Double.parseDouble(parser.group(index++))); + position.setSpeed(Integer.parseInt(parser.group(index++))); + position.setCourse(Integer.parseInt(parser.group(index++))); + index++; // accuracy + position.setAltitude(Integer.parseInt(parser.group(index++))); + + position.set(Event.KEY_STATUS, Integer.parseInt(parser.group(index++))); + position.set(Event.KEY_BATTERY, Integer.parseInt(parser.group(index++))); + position.set(Event.PREFIX_TEMP + 1, Integer.parseInt(parser.group(index++))); + position.set(Event.KEY_CHARGE, Integer.parseInt(parser.group(index++)) == 1); + + if (channel != null) { + channel.write(time, remoteAddress); + } + + return position; + } + +} diff --git a/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java b/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java new file mode 100644 index 000000000..a5ac56a6e --- /dev/null +++ b/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java @@ -0,0 +1,20 @@ +package org.traccar.protocol; + +import org.junit.Test; + +import static org.junit.Assert.assertNull; +import static org.traccar.helper.DecoderVerifier.verify; + +public class GpsmtaProtocolDecoderTest extends ProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + GpsmtaProtocolDecoder decoder = new GpsmtaProtocolDecoder(new GpsmtaProtocol()); + + verify(decoder.decode(null, null, + "359144048138856 1442932957 49.85064 24.003979 1 0 40 0 10 110 26 0 0")); + + } + +} |