From b18d80471dd99381df631a9754421a3e63e21cb4 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 29 Jun 2015 13:27:58 +1200 Subject: Combine Syrus and Taip protocols --- src/org/traccar/protocol/SyrusProtocol.java | 50 ------ src/org/traccar/protocol/SyrusProtocolDecoder.java | 181 --------------------- src/org/traccar/protocol/TaipProtocol.java | 17 +- src/org/traccar/protocol/TaipProtocolDecoder.java | 181 +++++++++++++++++++++ 4 files changed, 194 insertions(+), 235 deletions(-) delete mode 100644 src/org/traccar/protocol/SyrusProtocol.java delete mode 100644 src/org/traccar/protocol/SyrusProtocolDecoder.java create mode 100644 src/org/traccar/protocol/TaipProtocolDecoder.java (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/SyrusProtocol.java b/src/org/traccar/protocol/SyrusProtocol.java deleted file mode 100644 index e68215c24..000000000 --- a/src/org/traccar/protocol/SyrusProtocol.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.string.StringDecoder; -import org.jboss.netty.handler.codec.string.StringEncoder; -import org.traccar.BaseProtocol; -import org.traccar.CharacterDelimiterFrameDecoder; -import org.traccar.TrackerServer; -import org.traccar.protocol.commands.CommandTemplate; -import org.traccar.http.commands.CommandType; - -import java.util.List; -import java.util.Map; - -public class SyrusProtocol extends BaseProtocol { - - public SyrusProtocol() { - super("syrus"); - } - - @Override - public void initTrackerServers(List serverList) { - serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { - @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 SyrusProtocolDecoder(SyrusProtocol.this, true)); - } - }); - } - -} diff --git a/src/org/traccar/protocol/SyrusProtocolDecoder.java b/src/org/traccar/protocol/SyrusProtocolDecoder.java deleted file mode 100644 index 236ded2dc..000000000 --- a/src/org/traccar/protocol/SyrusProtocolDecoder.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright 2013 - 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.util.Calendar; -import java.util.Date; -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.Protocol; -import org.traccar.helper.UnitsConverter; -import org.traccar.model.Position; - -public class SyrusProtocolDecoder extends BaseProtocolDecoder { - - boolean sendResponse; - - public SyrusProtocolDecoder(Protocol protocol, boolean sendResponse) { - super(protocol); - this.sendResponse = sendResponse; - } - - private static final Pattern pattern = Pattern.compile( - "(?:R[EP]V" + // Type - "(?:\\d{2}" + // Event index - "(\\d{4})" + // Week - "(\\d))?" + // Day - "(\\d{5})|" + // Seconds - "RGP" + // Type - "(\\d{2})(\\d{2})(\\d{2})" + // Date - "(\\d{2})(\\d{2})(\\d{2}))" + // Time - "([\\+\\-]\\d{2})(\\d{5})" + // Latitude - "([\\+\\-]\\d{3})(\\d{5})" + // Longitude - "(\\d{3})" + // Speed - "(\\d{3})" + // Course - "(\\d)" + // Fix mode - ".*\r?\n?"); - - private Date getTime(long week, long day, long seconds) { - Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - time.clear(); - time.set(Calendar.YEAR, 1980); - time.set(Calendar.MONTH, 0); - time.set(Calendar.DAY_OF_MONTH, 6); - - long millis = time.getTimeInMillis(); - millis += ((week * 7 + day) * 24 * 60 * 60 + seconds) * 1000; - - return new Date(millis); - } - - private Date getTime(long seconds) { - Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - time.set(Calendar.HOUR_OF_DAY, 0); - time.set(Calendar.MINUTE, 0); - time.set(Calendar.SECOND, 0); - time.set(Calendar.MILLISECOND, 0); - - long millis = time.getTimeInMillis() + seconds * 1000; - - long diff = new Date().getTime() - millis; - - if (diff > 12 * 60 * 60 * 1000) { - millis += 24 * 60 * 60 * 1000; - } else if (diff < -12 * 60 * 60 * 1000) { - millis -= 24 * 60 * 60 * 1000; - } - - return new Date(millis); - } - - @Override - protected Object decode( - ChannelHandlerContext ctx, Channel channel, Object msg) - throws Exception { - - String sentence = (String) msg; - - // Find message start - int beginIndex = sentence.indexOf('>'); - if (beginIndex != -1) { - sentence = sentence.substring(beginIndex + 1); - } - - // Find device ID - beginIndex = sentence.indexOf(";ID="); - if (beginIndex != -1) { - beginIndex += 4; - int endIndex = sentence.indexOf(';', beginIndex); - if (endIndex == -1) { - endIndex = sentence.length(); - } - - // Find device in database - String id = sentence.substring(beginIndex, endIndex); - if (!identify(id, channel)) { - return null; - } - - // Send response - if (sendResponse && channel != null) { - channel.write(id); - } - } else { - return null; - } - - // Parse message - Matcher parser = pattern.matcher(sentence); - if (!parser.matches()) { - return null; - } - - // Create new position - Position position = new Position(); - position.setProtocol(getProtocolName()); - position.setDeviceId(getDeviceId()); - - Integer index = 1; - - // Time - String week = parser.group(index++); - String day = parser.group(index++); - String seconds = parser.group(index++); - if (seconds != null) { - if (week != null && day != null) { - position.setTime(getTime(Integer.valueOf(week), Integer.valueOf(day), Integer.valueOf(seconds))); - } else { - position.setTime(getTime(Integer.valueOf(seconds))); - } - index += 6; - } else { - 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.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()); - } - - // Latitude - String latitude = parser.group(index) + '.' + parser.group(index + 1); - index += 2; - position.setLatitude(Double.valueOf(latitude)); - - // Latitude - String longitude = parser.group(index) + '.' + parser.group(index + 1); - index += 2; - position.setLongitude(Double.valueOf(longitude)); - - // Speed and Course - position.setSpeed(UnitsConverter.knotsFromMph(Double.valueOf(parser.group(index++)))); - position.setCourse(Double.valueOf(parser.group(index++))); - - // Validity - position.setValid(Integer.valueOf(parser.group(index++)) != 0); - return position; - } - -} diff --git a/src/org/traccar/protocol/TaipProtocol.java b/src/org/traccar/protocol/TaipProtocol.java index 7d9f3015f..439fe7696 100644 --- a/src/org/traccar/protocol/TaipProtocol.java +++ b/src/org/traccar/protocol/TaipProtocol.java @@ -16,15 +16,15 @@ package org.traccar.protocol; import org.jboss.netty.bootstrap.ConnectionlessBootstrap; +import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.string.StringDecoder; +import org.jboss.netty.handler.codec.string.StringEncoder; import org.traccar.BaseProtocol; +import org.traccar.CharacterDelimiterFrameDecoder; import org.traccar.TrackerServer; -import org.traccar.protocol.commands.CommandTemplate; -import org.traccar.http.commands.CommandType; import java.util.List; -import java.util.Map; public class TaipProtocol extends BaseProtocol { @@ -34,11 +34,20 @@ public class TaipProtocol extends BaseProtocol { @Override public void initTrackerServers(List serverList) { + serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { + @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 TaipProtocolDecoder(TaipProtocol.this, true)); + } + }); serverList.add(new TrackerServer(new ConnectionlessBootstrap(), this.getName()) { @Override protected void addSpecificHandlers(ChannelPipeline pipeline) { pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("objectDecoder", new SyrusProtocolDecoder(TaipProtocol.this, false)); + pipeline.addLast("objectDecoder", new TaipProtocolDecoder(TaipProtocol.this, false)); } }); } diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java new file mode 100644 index 000000000..518efac0d --- /dev/null +++ b/src/org/traccar/protocol/TaipProtocolDecoder.java @@ -0,0 +1,181 @@ +/* + * Copyright 2013 - 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.util.Calendar; +import java.util.Date; +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.Protocol; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Position; + +public class TaipProtocolDecoder extends BaseProtocolDecoder { + + boolean sendResponse; + + public TaipProtocolDecoder(TaipProtocol protocol, boolean sendResponse) { + super(protocol); + this.sendResponse = sendResponse; + } + + private static final Pattern pattern = Pattern.compile( + "(?:R[EP]V" + // Type + "(?:\\d{2}" + // Event index + "(\\d{4})" + // Week + "(\\d))?" + // Day + "(\\d{5})|" + // Seconds + "RGP" + // Type + "(\\d{2})(\\d{2})(\\d{2})" + // Date + "(\\d{2})(\\d{2})(\\d{2}))" + // Time + "([\\+\\-]\\d{2})(\\d{5})" + // Latitude + "([\\+\\-]\\d{3})(\\d{5})" + // Longitude + "(\\d{3})" + // Speed + "(\\d{3})" + // Course + "(\\d)" + // Fix mode + ".*\r?\n?"); + + private Date getTime(long week, long day, long seconds) { + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.clear(); + time.set(Calendar.YEAR, 1980); + time.set(Calendar.MONTH, 0); + time.set(Calendar.DAY_OF_MONTH, 6); + + long millis = time.getTimeInMillis(); + millis += ((week * 7 + day) * 24 * 60 * 60 + seconds) * 1000; + + return new Date(millis); + } + + private Date getTime(long seconds) { + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.set(Calendar.HOUR_OF_DAY, 0); + time.set(Calendar.MINUTE, 0); + time.set(Calendar.SECOND, 0); + time.set(Calendar.MILLISECOND, 0); + + long millis = time.getTimeInMillis() + seconds * 1000; + + long diff = new Date().getTime() - millis; + + if (diff > 12 * 60 * 60 * 1000) { + millis += 24 * 60 * 60 * 1000; + } else if (diff < -12 * 60 * 60 * 1000) { + millis -= 24 * 60 * 60 * 1000; + } + + return new Date(millis); + } + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + String sentence = (String) msg; + + // Find message start + int beginIndex = sentence.indexOf('>'); + if (beginIndex != -1) { + sentence = sentence.substring(beginIndex + 1); + } + + // Find device ID + beginIndex = sentence.indexOf(";ID="); + if (beginIndex != -1) { + beginIndex += 4; + int endIndex = sentence.indexOf(';', beginIndex); + if (endIndex == -1) { + endIndex = sentence.length(); + } + + // Find device in database + String id = sentence.substring(beginIndex, endIndex); + if (!identify(id, channel)) { + return null; + } + + // Send response + if (sendResponse && channel != null) { + channel.write(id); + } + } else { + return null; + } + + // Parse message + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + return null; + } + + // Create new position + Position position = new Position(); + position.setProtocol(getProtocolName()); + position.setDeviceId(getDeviceId()); + + Integer index = 1; + + // Time + String week = parser.group(index++); + String day = parser.group(index++); + String seconds = parser.group(index++); + if (seconds != null) { + if (week != null && day != null) { + position.setTime(getTime(Integer.valueOf(week), Integer.valueOf(day), Integer.valueOf(seconds))); + } else { + position.setTime(getTime(Integer.valueOf(seconds))); + } + index += 6; + } else { + 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.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()); + } + + // Latitude + String latitude = parser.group(index) + '.' + parser.group(index + 1); + index += 2; + position.setLatitude(Double.valueOf(latitude)); + + // Latitude + String longitude = parser.group(index) + '.' + parser.group(index + 1); + index += 2; + position.setLongitude(Double.valueOf(longitude)); + + // Speed and Course + position.setSpeed(UnitsConverter.knotsFromMph(Double.valueOf(parser.group(index++)))); + position.setCourse(Double.valueOf(parser.group(index++))); + + // Validity + position.setValid(Integer.valueOf(parser.group(index++)) != 0); + return position; + } + +} -- cgit v1.2.3