diff options
| -rw-r--r-- | default.cfg | 4 | ||||
| -rw-r--r-- | src/org/traccar/ServerManager.java | 15 | ||||
| -rw-r--r-- | src/org/traccar/protocol/XirgoProtocolDecoder.java | 123 | ||||
| -rw-r--r-- | test/org/traccar/protocol/XirgoProtocolDecoderTest.java | 19 |
4 files changed, 161 insertions, 0 deletions
diff --git a/default.cfg b/default.cfg index 3b1b1113d..97bc61005 100644 --- a/default.cfg +++ b/default.cfg @@ -395,4 +395,8 @@ <entry key='bce.enable'>true</entry> <entry key='bce.port'>5080</entry> + <!-- Xirgo server configuration --> + <entry key='xirgo.enable'>true</entry> + <entry key='xirgo.port'>5081</entry> + </properties> diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 57cb3ea4e..378d8a52d 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -181,6 +181,7 @@ public class ServerManager { initGoSafeServer("gosafe"); initAutoFon45Server("autofon45"); initBceServer("bce"); + initXirgoServer("xirgo"); initProtocolDetector(); @@ -1337,5 +1338,19 @@ public class ServerManager { serverList.add(server); } } + + private void initXirgoServer(final String protocol) throws SQLException { + if (isProtocolEnabled(properties, protocol)) { + serverList.add(new TrackerServer(this, new ServerBootstrap(), protocol) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, "##")); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("objectDecoder", new XirgoProtocolDecoder(dataManager, protocol, properties)); + } + }); + } + } } diff --git a/src/org/traccar/protocol/XirgoProtocolDecoder.java b/src/org/traccar/protocol/XirgoProtocolDecoder.java new file mode 100644 index 000000000..e6a7bd10b --- /dev/null +++ b/src/org/traccar/protocol/XirgoProtocolDecoder.java @@ -0,0 +1,123 @@ +/* + * 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 java.net.SocketAddress; +import java.util.Calendar; +import java.util.Properties; +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.BaseProtocolDecoder; +import org.traccar.database.DataManager; +import org.traccar.helper.Log; +import org.traccar.model.ExtendedInfoFormatter; +import org.traccar.model.Position; + +public class XirgoProtocolDecoder extends BaseProtocolDecoder { + + public XirgoProtocolDecoder(DataManager dataManager, String protocol, Properties properties) { + super(dataManager, protocol, properties); + } + + private static final Pattern pattern = Pattern.compile( + "\\$\\$" + + "(\\d+)," + // IMEI + "(\\d+)," + // Event + "(\\d{4})/(\\d{2})/(\\d{2})," + // Date + "(\\d{2}):(\\d{2}):(\\d{2})," + // Time + "(-?\\d+\\.?\\d*)," + // Latitude + "(-?\\d+\\.?\\d*)," + // Longitude + "(-?\\d+\\.?\\d*)," + // Altitude + "(\\d+\\.?\\d*)," + // Speed + "(\\d+\\.?\\d*)," + // Course + "(\\d+)," + // Satellites + "(\\d+)," + // HDOP + "(\\d+\\.\\d+)," + // Battery + "(\\d+)," + // GSM + "(\\d+\\.?\\d*)," + // Milage + "(\\d+)," + // GPS + ".*"); + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, SocketAddress remoteAddress, 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(); + ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter(getProtocol()); + + Integer index = 1; + + // Get device by IMEI + String imei = parser.group(index++); + try { + position.setDeviceId(getDataManager().getDeviceByImei(imei).getId()); + } catch(Exception error) { + Log.warning("Unknown device - " + imei); + return null; + } + + extendedInfo.set("event", parser.group(index++)); + + // Date + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.clear(); + time.set(Calendar.YEAR, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); + time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++))); + time.set(Calendar.HOUR_OF_DAY, 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()); + + // Location + position.setLatitude(Double.valueOf(parser.group(index++))); + position.setLongitude(Double.valueOf(parser.group(index++))); + position.setAltitude(Double.valueOf(parser.group(index++))); + position.setSpeed(Double.valueOf(parser.group(index++)) * 0.868976); + position.setCourse(Double.valueOf(parser.group(index++))); + + // Additional data + extendedInfo.set("satellites", parser.group(index++)); + extendedInfo.set("hdop", parser.group(index++)); + extendedInfo.set("battery", parser.group(index++)); + extendedInfo.set("gsm", parser.group(index++)); + extendedInfo.set("milage", parser.group(index++)); + + // Validity + position.setValid(Integer.valueOf(parser.group(index++)) == 1); + + // Extended info + position.setExtendedInfo(extendedInfo.toString()); + + return position; + } + +} diff --git a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java new file mode 100644 index 000000000..81133104c --- /dev/null +++ b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java @@ -0,0 +1,19 @@ +package org.traccar.protocol; + +import org.traccar.helper.TestDataManager; +import static org.traccar.helper.DecoderVerifier.verify; +import org.junit.Test; + +public class XirgoProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + XirgoProtocolDecoder decoder = new XirgoProtocolDecoder(new TestDataManager(), null, null); + + verify(decoder.decode(null, null, null, + "$$354898045650537,6031,2015/02/26,15:47:26,33.42552,-112.30308,287.8,0,0,0,0,0.0,7,1.2,2,0.0,12.2,22,1,0,82.3")); + + } + +} |