Merge remote-tracking branch 'upstream/master'

1 files changed, 127 insertions, 18 deletions

diff --git a/src/org/traccar/protocol/UproProtocolDecoder.java b/src/org/traccar/protocol/UproProtocolDecoder.java
index b4000c37a..e47dd8595 100644
--- a/src/org/traccar/protocol/UproProtocolDecoder.java
+++ b/src/org/traccar/protocol/UproProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2016 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.
@@ -15,15 +15,20 @@
  */
 package org.traccar.protocol;
 
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.DeviceSession;
+import org.traccar.helper.BitUtil;
 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.nio.charset.StandardCharsets;
+import java.text.ParseException;
 import java.util.regex.Pattern;
 
 public class UproProtocolDecoder extends BaseProtocolDecoder {
@@ -32,48 +37,152 @@ public class UproProtocolDecoder extends BaseProtocolDecoder {
         super(protocol);
     }
 
-    private static final Pattern PATTERN = new PatternBuilder()
-            .text("*AI20")
+    private static final Pattern PATTERN_HEADER = new PatternBuilder()
+            .text("*")
+            .expression("..20")
+            .expression("([01])")                // ack
             .number("(d+),")                     // device id
-            .expression("A.+&A")
+            .expression("(.)")                   // type
+            .expression("(.)")                   // subtype
+            .any()
+            .compile();
+
+    private static final Pattern PATTERN_LOCATION = new PatternBuilder()
             .number("(dd)(dd)(dd)")              // time
             .number("(dd)(dd)(dddd)")            // latitude
             .number("(ddd)(dd)(dddd)")           // longitude
-            .number("d{5}")
+            .number("(d)")                       // flags
+            .number("(dd)")                      // speed
+            .number("(dd)")                      // course
             .number("(dd)(dd)(dd)")              // date
-            .expression("&B")
-            .any()
             .compile();
 
+    private void decodeLocation(Position position, String data) {
+        Parser parser = new Parser(PATTERN_LOCATION, data);
+        if (parser.matches()) {
+
+            DateBuilder dateBuilder = new DateBuilder()
+                    .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+
+            position.setValid(true);
+            position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN));
+            position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN));
+
+            int flags = parser.nextInt();
+            position.setValid(BitUtil.check(flags, 0));
+            if (!BitUtil.check(flags, 1)) {
+                position.setLatitude(-position.getLatitude());
+            }
+            if (!BitUtil.check(flags, 2)) {
+                position.setLongitude(-position.getLongitude());
+            }
+
+            position.setSpeed(parser.nextInt() * 2);
+            position.setCourse(parser.nextInt() * 10);
+
+            dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
+            position.setTime(dateBuilder.getDate());
+
+        }
+    }
+
     @Override
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        Parser parser = new Parser(PATTERN, (String) msg);
+        ChannelBuffer buf = (ChannelBuffer) msg;
+
+        if (buf.getByte(buf.readerIndex()) != '*') {
+            throw new ParseException(null, 0);
+        }
+
+        int headerIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '&');
+        if (headerIndex < 0) {
+            headerIndex = buf.writerIndex();
+        }
+        String header = buf.readBytes(headerIndex - buf.readerIndex()).toString(StandardCharsets.US_ASCII);
+
+        Parser parser = new Parser(PATTERN_HEADER, header);
         if (!parser.matches()) {
             return null;
         }
 
-        Position position = new Position();
-        position.setProtocol(getProtocolName());
+        boolean reply = parser.next().equals("1");
 
         DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
         if (deviceSession == null) {
             return null;
         }
+
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
         position.setDeviceId(deviceSession.getDeviceId());
 
-        DateBuilder dateBuilder = new DateBuilder()
-                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+        String type = parser.next();
+        String subtype = parser.next();
+
+        if (reply && channel != null) {
+            channel.write("*MG20Y" + type + subtype + "#");
+        }
+
+        while (buf.readable()) {
+
+            buf.readByte(); // skip delimiter
+
+            byte dataType = buf.readByte();
+
+            int delimiterIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '&');
+            if (delimiterIndex < 0) {
+                delimiterIndex = buf.writerIndex();
+            }
 
-        position.setValid(true);
-        position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN));
-        position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_MIN_MIN));
+            ChannelBuffer data = buf.readBytes(delimiterIndex - buf.readerIndex());
 
-        dateBuilder.setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt());
-        position.setTime(dateBuilder.getDate());
+            switch (dataType) {
+                case 'A':
+                    decodeLocation(position, data.toString(StandardCharsets.US_ASCII));
+                    break;
+                case 'B':
+                    position.set(Position.KEY_STATUS, data.toString(StandardCharsets.US_ASCII));
+                    break;
+                case 'C':
+                    long odometer = 0;
+                    while (data.readable()) {
+                        odometer <<= 4;
+                        odometer += data.readByte() - (byte) '0';
+                    }
+                    position.set(Position.KEY_ODOMETER, odometer * 2 * 1852 / 3600);
+                    break;
+                case 'P':
+                    position.set(Position.KEY_MCC,
+                            Integer.parseInt(data.readBytes(4).toString(StandardCharsets.US_ASCII)));
+                    position.set(Position.KEY_MNC,
+                            Integer.parseInt(data.readBytes(4).toString(StandardCharsets.US_ASCII)));
+                    position.set(Position.KEY_LAC,
+                            Integer.parseInt(data.readBytes(4).toString(StandardCharsets.US_ASCII), 16));
+                    position.set(Position.KEY_CID,
+                            Integer.parseInt(data.readBytes(4).toString(StandardCharsets.US_ASCII), 16));
+                    break;
+                case 'Q':
+                    position.set("obd-pid", ChannelBuffers.hexDump(data));
+                    break;
+                case 'R':
+                    position.set("odb-travel", ChannelBuffers.hexDump(data));
+                    break;
+                case 'S':
+                    position.set("obd-traffic", ChannelBuffers.hexDump(data));
+                    break;
+                default:
+                    break;
+            }
+
+        }
+
+        if (position.getLatitude() != 0 && position.getLongitude() != 0) {
+            return position;
+        }
 
-        return position;
+        return null;
     }
 
 }