From d8ba1eccc5ee74bc3bf90724c726de71233a0421 Mon Sep 17 00:00:00 2001 From: nyash Date: Sun, 18 Sep 2016 14:39:10 +0200 Subject: Add jpkorjar protocol --- src/org/traccar/protocol/JpKorjarProtocol.java | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/org/traccar/protocol/JpKorjarProtocol.java (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/JpKorjarProtocol.java b/src/org/traccar/protocol/JpKorjarProtocol.java new file mode 100644 index 000000000..e48e6ea21 --- /dev/null +++ b/src/org/traccar/protocol/JpKorjarProtocol.java @@ -0,0 +1,45 @@ +/* + * Copyright 2016 nyashh (nyashh@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.traccar.BaseProtocol; +import org.traccar.TrackerServer; + +import java.util.List; + +public class JpKorjarProtocol extends BaseProtocol { + + public JpKorjarProtocol() { + super("jpkorjar"); + } + + @Override + public void initTrackerServers(List serverList) { + serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + + pipeline.addLast("frameDecoder", new JpKorjarFrameDecoder()); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new JpKorjarProtocolDecoder(JpKorjarProtocol.this)); + } + }); + } + +} -- cgit v1.2.3 From cff3579737ae906c34670f9bf44f62473c7a7466 Mon Sep 17 00:00:00 2001 From: nyash Date: Sun, 18 Sep 2016 14:39:39 +0200 Subject: Add jpkorjar frame decoder --- src/org/traccar/protocol/JpKorjarFrameDecoder.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/org/traccar/protocol/JpKorjarFrameDecoder.java (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/JpKorjarFrameDecoder.java b/src/org/traccar/protocol/JpKorjarFrameDecoder.java new file mode 100644 index 000000000..0b32a7f0b --- /dev/null +++ b/src/org/traccar/protocol/JpKorjarFrameDecoder.java @@ -0,0 +1,46 @@ +/* + * Copyright 2016 nyashh (nyashh@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.buffer.ChannelBuffer; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.handler.codec.frame.FrameDecoder; + +public class JpKorjarFrameDecoder extends FrameDecoder { + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception { + + if (buf.readableBytes() < 80) { + return null; + } + + int spaceIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ' '); + if (spaceIndex == -1) { + return null; + } + + int endIndex = buf.indexOf(spaceIndex, buf.writerIndex(), (byte) ','); + if (endIndex == -1) { + return null; + } + + return buf.readBytes(endIndex + 1); + } + +} -- cgit v1.2.3 From 786a6b0b5f3777583a6c6fe6d0365bbcbf4e708b Mon Sep 17 00:00:00 2001 From: nyash Date: Sun, 18 Sep 2016 14:40:48 +0200 Subject: Add jpkorjar protocol decoder --- .../traccar/protocol/JpKorjarProtocolDecoder.java | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 src/org/traccar/protocol/JpKorjarProtocolDecoder.java (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java b/src/org/traccar/protocol/JpKorjarProtocolDecoder.java new file mode 100644 index 000000000..e5c80ee82 --- /dev/null +++ b/src/org/traccar/protocol/JpKorjarProtocolDecoder.java @@ -0,0 +1,105 @@ +/* + * Copyright 2016 nyashh (nyashh@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.DeviceSession; +import org.traccar.helper.DateBuilder; +import org.traccar.model.Position; + +import java.net.SocketAddress; + +public class JpKorjarProtocolDecoder extends BaseProtocolDecoder { + + public JpKorjarProtocolDecoder(JpKorjarProtocol protocol) { + super(protocol); + } + + @Override + protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + String line = (String) msg; + + String[] parts = line.split(","); + + if (parts.length == 0) { + return null; + } + + if (!parts[0].equals("KORJAR.PL")) { + return null; + } + + Long imei = Long.parseLong(parts[1]); + + int year = Integer.parseInt(parts[2].substring(0, 2)); + int month = Integer.parseInt(parts[2].substring(2, 4)); + int day = Integer.parseInt(parts[2].substring(4, 6)); + int hour = Integer.parseInt(parts[2].substring(6, 8)); + int minute = Integer.parseInt(parts[2].substring(8, 10)); + int second = Integer.parseInt(parts[2].substring(10, 12)); + + Double latitude = Double.parseDouble(parts[3].substring(0, + Math.max(0, parts[3].length() - 1))); + + Double longitude = Double.parseDouble(parts[4].substring(0, + Math.max(0, parts[4].length() - 1))); + + Double speed = Double.parseDouble(parts[5]); + Double course = Double.parseDouble(parts[6]); + + String[] batteryParts = parts[7].split(":"); + + String batteryLevel = batteryParts[0]; + Double batteryVoltage = Double.parseDouble(batteryParts[1].substring(0, + Math.max(0, batteryParts[1].length() - 1))); + + String[] codeParts = parts[8].split(" "); + + int gpsSignal = Integer.parseInt(codeParts[0]); //0 - low, 1 - high + int mcc = Integer.parseInt(codeParts[1]); + int mnc = Integer.parseInt(codeParts[2]); + int lac = Integer.parseInt(codeParts[3], 16); + int cid = Integer.parseInt(codeParts[4], 16); + + DateBuilder builder = new DateBuilder().setDate(year, month, day) + .setTime(hour, minute, second); + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parts[1]); + if (deviceSession == null) { + return null; + } + + Position position = new Position(); + position.setProtocol(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + position.setLatitude(latitude); + position.setLongitude(longitude); + position.setSpeed(speed); + position.setCourse(course); + position.set("signal", gpsSignal); + position.set(Position.KEY_POWER, batteryVoltage); + position.set(Position.KEY_MNC, mnc); + position.set(Position.KEY_MCC, mcc); + position.set(Position.KEY_LAC, lac); + position.set(Position.KEY_CID, cid); + position.setTime(builder.getDate()); + position.setValid(true); + + return position; + } +} -- cgit v1.2.3 From 24c846056fc6bdca120ce96c32d75ff6c36f3ba0 Mon Sep 17 00:00:00 2001 From: nyash Date: Mon, 19 Sep 2016 12:20:49 +0200 Subject: use primitives and remove unused variables --- src/org/traccar/protocol/JpKorjarProtocolDecoder.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java b/src/org/traccar/protocol/JpKorjarProtocolDecoder.java index e5c80ee82..0cdc958c9 100644 --- a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java +++ b/src/org/traccar/protocol/JpKorjarProtocolDecoder.java @@ -44,8 +44,6 @@ public class JpKorjarProtocolDecoder extends BaseProtocolDecoder { return null; } - Long imei = Long.parseLong(parts[1]); - int year = Integer.parseInt(parts[2].substring(0, 2)); int month = Integer.parseInt(parts[2].substring(2, 4)); int day = Integer.parseInt(parts[2].substring(4, 6)); @@ -53,19 +51,18 @@ public class JpKorjarProtocolDecoder extends BaseProtocolDecoder { int minute = Integer.parseInt(parts[2].substring(8, 10)); int second = Integer.parseInt(parts[2].substring(10, 12)); - Double latitude = Double.parseDouble(parts[3].substring(0, + double latitude = Double.parseDouble(parts[3].substring(0, Math.max(0, parts[3].length() - 1))); - Double longitude = Double.parseDouble(parts[4].substring(0, + double longitude = Double.parseDouble(parts[4].substring(0, Math.max(0, parts[4].length() - 1))); - Double speed = Double.parseDouble(parts[5]); - Double course = Double.parseDouble(parts[6]); + double speed = Double.parseDouble(parts[5]); + double course = Double.parseDouble(parts[6]); String[] batteryParts = parts[7].split(":"); - String batteryLevel = batteryParts[0]; - Double batteryVoltage = Double.parseDouble(batteryParts[1].substring(0, + double batteryVoltage = Double.parseDouble(batteryParts[1].substring(0, Math.max(0, batteryParts[1].length() - 1))); String[] codeParts = parts[8].split(" "); -- cgit v1.2.3