3 files changed, 171 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Laipac2Protocol.java b/src/org/traccar/protocol/Laipac2Protocol.java
new file mode 100644
index 000000000..5f132f626
--- /dev/null
+++ b/src/org/traccar/protocol/Laipac2Protocol.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ *
+ * 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 Laipac2Protocol extends BaseProtocol {
+
+    public Laipac2Protocol() {
+        super("laipac2");
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
+                pipeline.addLast("stringEncoder", new StringEncoder());
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectDecoder", new Laipac2ProtocolDecoder(Laipac2Protocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/Laipac2ProtocolDecoder.java b/src/org/traccar/protocol/Laipac2ProtocolDecoder.java
new file mode 100644
index 000000000..ba40c0dce
--- /dev/null
+++ b/src/org/traccar/protocol/Laipac2ProtocolDecoder.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2013 - 2017 Anton Tananaev (anton@traccar.org)
+ *
+ * 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.Checksum;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.Parser;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.model.Position;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+public class Laipac2ProtocolDecoder extends BaseProtocolDecoder {
+
+    public Laipac2ProtocolDecoder(Laipac2Protocol protocol) {
+        super(protocol);
+    }
+
+    private static final Pattern PATTERN = new PatternBuilder()
+            .text("$AVRMC,")
+            .expression("([^,]+),")             // identifier
+            .number("(dd)(dd)(dd),")            // time (hhmmss)
+            .expression("([AVRPavrp]),")        // validity
+            .number("(dd)(dd.d+),")             // latitude
+            .expression("([NS]),")
+            .number("(ddd)(dd.d+),")            // longitude
+            .number("([EW]),")
+            .number("(d+.d+),")                 // speed
+            .number("(d+.d+),")                 // course
+            .number("(dd)(dd)(dd),")            // date (ddmmyy)
+            .expression("([abZXMHE86430]),")    // event code
+            .number("(d+),")                    // battery voltage
+            .number("(d+),")                    // current mileage
+            .number("(d),")                     // GPS on/off (1 = on, 0 = off)
+            .number("(d),")                     // Analog port 1
+            .number("(d+),")                    // Analog port 2
+            .expression("([0-9a-fA-F]{4})")     // Cell 1 - Cell Net Code
+            .expression("([0-9a-fA-F]{4}),")    // Cell 1 - Cell ID Code
+            .number("(d+)")                     // Cell 2
+            .text("*")
+            .number("(xx)")                     // checksum
+            .compile();
+
+    @Override
+    protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+        String sentence = (String) msg;
+
+        if (sentence.startsWith("$ECHK") && channel != null) {
+            channel.write(sentence + "\r\n"); // heartbeat
+            return null;
+        }
+
+        Parser parser = new Parser(PATTERN, sentence);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
+        if (deviceSession == null) {
+            return null;
+        }
+
+        Position position = new Position(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        DateBuilder dateBuilder = new DateBuilder()
+                .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
+
+        String status = parser.next();
+        position.setValid(status.toUpperCase().equals("A"));
+
+        position.setLatitude(parser.nextCoordinate());
+        position.setLongitude(parser.nextCoordinate());
+        position.setSpeed(parser.nextDouble(0));
+        position.setCourse(parser.nextDouble(0));
+
+        dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
+        position.setTime(dateBuilder.getDate());
+
+        String type = parser.next();
+        position.set(Position.KEY_BATTERY_LEVEL, parser.nextDouble());
+        //position.set(Position.KEY_, parser.nextDouble());
+        String checksum = parser.next();
+
+        if (channel != null) {
+
+            if (Character.isLowerCase(status.charAt(0))) {
+                String response = "$EAVACK," + type + "," + checksum;
+                response += Checksum.nmea(response);
+                channel.write(response);
+            }
+
+            if (type.equals("S") || type.equals("T")) {
+                channel.write("$AVCFG,00000000,t*21");
+            } else if (type.equals("3")) {
+                channel.write("$AVCFG,00000000,d*31");
+            } else if (type.equals("X") || type.equals("4")) {
+                channel.write("$AVCFG,00000000,x*2D");
+            }
+
+        }
+
+        return position;
+    }
+
+}
diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
index 03abdd588..014ebb233 100644
--- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java
+++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
@@ -42,8 +42,7 @@ public class OsmAndProtocolDecoder extends BaseHttpProtocolDecoder {
     }
 
     @Override
-    protected Object decode(
-            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+    protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
         HttpRequest request = (HttpRequest) msg;
         QueryStringDecoder decoder = new QueryStringDecoder(request.getUri());