diff options
| -rw-r--r-- | default.cfg | 4 | ||||
| -rw-r--r-- | src/org/traccar/Server.java | 26 | ||||
| -rw-r--r-- | src/org/traccar/protocol/V680ProtocolDecoder.java | 146 | ||||
| -rwxr-xr-x | test.sh | 3 | ||||
| -rw-r--r-- | test/org/traccar/protocol/V680ProtocolDecoderTest.java | 18 |
5 files changed, 197 insertions, 0 deletions
diff --git a/default.cfg b/default.cfg index 7801a457b..a64759e21 100644 --- a/default.cfg +++ b/default.cfg @@ -155,4 +155,8 @@ <entry key="ev603.enable">true</entry> <entry key="ev603.port">5015</entry> + <!-- V680 server configuration --> + <entry key="v680.enable">true</entry> + <entry key="v680.port">5016</entry> + </properties> diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java index f61edcede..0cca284d0 100644 --- a/src/org/traccar/Server.java +++ b/src/org/traccar/Server.java @@ -102,6 +102,7 @@ public class Server { initH02Server(properties); initJt600Server(properties); initEv603Server(properties); + initV680Server(properties); // Initialize web server if (Boolean.valueOf(properties.getProperty("http.enable"))) { @@ -594,4 +595,29 @@ public class Server { serverList.add(server); } } + + /** + * Init V680 server + */ + private void initV680Server(Properties properties) throws SQLException { + + String protocol = "v680"; + if (isProtocolEnabled(properties, protocol)) { + + TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol)); + final Integer resetDelay = getProtocolResetDelay(properties, protocol); + + server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) { + protected void addSpecificHandlers(ChannelPipeline pipeline) { + byte delimiter[] = { (byte) '#', (byte) '#' }; + pipeline.addLast("frameDecoder", + new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new V680ProtocolDecoder(getDataManager(), resetDelay)); + } + }); + + serverList.add(server); + } + } } diff --git a/src/org/traccar/protocol/V680ProtocolDecoder.java b/src/org/traccar/protocol/V680ProtocolDecoder.java new file mode 100644 index 000000000..5d2427ca4 --- /dev/null +++ b/src/org/traccar/protocol/V680ProtocolDecoder.java @@ -0,0 +1,146 @@ +/* + * Copyright 2012 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 java.util.Calendar; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.GenericProtocolDecoder; +import org.traccar.model.DataManager; +import org.traccar.model.Position; + +/** + * V680 tracker protocol decoder + */ +public class V680ProtocolDecoder extends GenericProtocolDecoder { + + /** + * Initialize + */ + public V680ProtocolDecoder(DataManager dataManager, Integer resetDelay) { + super(dataManager, resetDelay); + } + + /** + * Regular expressions pattern + */ + static private Pattern pattern = Pattern.compile( + "#" + + "(\\d+)#" + // IMEI + "([^#]+)#" + // User + "([01])#" + // Fix + "([^#]+)#" + // Password + "[^#]+#" + + "(\\d+)#" + // Packet number + "([^#]+)#" + // GSM base station + "(\\d{3})(\\d{2}\\.\\d{4})," + // Longitude (DDDMM.MMMM) + "([EW])," + + "(\\d{2})(\\d{2}\\.\\d{4})," + // Latitude (DDMM.MMMM) + "([NS])," + + "(\\d+\\.\\d+)," + // Speed + "(\\d+)#" + // Course + "(\\d{2})(\\d{2})(\\d{2})#" + // Date (DDMMYY) + "(\\d{2})(\\d{2})(\\d{2})"); // Time (HHMMSS) + + /** + * Decode message + */ + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + String sentence = (String) msg; + + // Parse message + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + return null; + } + + // Create new position + Position position = new Position(); + StringBuilder extendedInfo = new StringBuilder("<protocol>V680</protocol>"); + Integer index = 1; + + // Get device by IMEI + String imei = parser.group(index++); + position.setDeviceId(getDataManager().getDeviceByImei(imei).getId()); + + // User + extendedInfo.append("<user>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</user>"); + + // Validity + position.setValid(parser.group(index++).compareTo("1") == 0 ? true : false); + + // Password + extendedInfo.append("<password>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</password>"); + + // Packet number + extendedInfo.append("<packet>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</packet>"); + + // GSM base station + extendedInfo.append("<gsm>"); + extendedInfo.append(parser.group(index++)); + extendedInfo.append("</gsm>"); + + // Longitude + Double lonlitude = Double.valueOf(parser.group(index++)); + lonlitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude; + position.setLongitude(lonlitude); + + // Latitude + Double latitude = Double.valueOf(parser.group(index++)); + latitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("S") == 0) latitude = -latitude; + position.setLatitude(latitude); + + // Altitude + position.setAltitude(0.0); + + // Speed and Course + position.setSpeed(Double.valueOf(parser.group(index++))); + position.setCourse(Double.valueOf(parser.group(index++))); + + // Date + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.clear(); + time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); + time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++))); + + // Time + time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++))); + time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++))); + position.setTime(time.getTime()); + + // Extended info + position.setExtendedInfo(extendedInfo.toString()); + + return position; + } + +} @@ -56,3 +56,6 @@ echo "14. jt600" echo "15. ev603" (echo -n -e "!1,123456789012345;!A,01/01/12,12:15:00,60.000000,130.000000,0.0,25101,0;";) | nc -v localhost 5015 + +echo "16. v680" +(echo -n -e "#123456789012345#1000#0#1000#AUT#1#66830FFB#13000.0000,E,6000.0000,N,001.41,259#010112#121600##";) | nc -v localhost 5016 diff --git a/test/org/traccar/protocol/V680ProtocolDecoderTest.java b/test/org/traccar/protocol/V680ProtocolDecoderTest.java new file mode 100644 index 000000000..ef0f5f403 --- /dev/null +++ b/test/org/traccar/protocol/V680ProtocolDecoderTest.java @@ -0,0 +1,18 @@ +package org.traccar.protocol; + +import static org.junit.Assert.assertNotNull; +import org.junit.Test; + +public class V680ProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + V680ProtocolDecoder decoder = new V680ProtocolDecoder(new TestDataManager(), 0); + + assertNotNull(decoder.decode(null, null, + "#356823033219838#1000#0#1478#AUT#1#66830FFB#03855.6628,E,4716.6821,N,001.41,259#130812#143905")); + + } + +} |