aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/database/StatisticsManager.java24
-rw-r--r--src/org/traccar/model/Statistics.java1
-rw-r--r--src/org/traccar/protocol/AtrackFrameDecoder.java43
-rw-r--r--src/org/traccar/protocol/DmtProtocolDecoder.java1
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolDecoder.java3
5 files changed, 59 insertions, 13 deletions
diff --git a/src/org/traccar/database/StatisticsManager.java b/src/org/traccar/database/StatisticsManager.java
index 8abadddc5..5b42416ad 100644
--- a/src/org/traccar/database/StatisticsManager.java
+++ b/src/org/traccar/database/StatisticsManager.java
@@ -15,6 +15,9 @@
*/
package org.traccar.database;
+import com.ning.http.client.Request;
+import com.ning.http.client.RequestBuilder;
+import org.joda.time.format.ISODateTimeFormat;
import org.traccar.Context;
import org.traccar.helper.Log;
import org.traccar.model.Statistics;
@@ -63,6 +66,27 @@ public class StatisticsManager {
Log.warning(e);
}
+ String url = Context.getConfig().getString("server.statistics");
+ if (url != null) {
+ String time = ISODateTimeFormat.dateTime().print(statistics.getCaptureTime().getTime());
+ Request request = new RequestBuilder("POST")
+ .setUrl(url)
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .addFormParam("version", Log.getAppVersion())
+ .addFormParam("captureTime", time)
+ .addFormParam("activeUsers", String.valueOf(statistics.getActiveUsers()))
+ .addFormParam("activeDevices", String.valueOf(statistics.getActiveDevices()))
+ .addFormParam("requests", String.valueOf(statistics.getRequests()))
+ .addFormParam("messagesReceived", String.valueOf(statistics.getMessagesReceived()))
+ .addFormParam("messagesStored", String.valueOf(statistics.getMessagesStored()))
+ .addFormParam("mailSent", String.valueOf(statistics.getMailSent()))
+ .addFormParam("smsSent", String.valueOf(statistics.getSmsSent()))
+ .addFormParam("geocoderRequests", String.valueOf(statistics.getGeocoderRequests()))
+ .addFormParam("geolocationRequests", String.valueOf(statistics.getGeolocationRequests()))
+ .build();
+ Context.getAsyncHttpClient().prepareRequest(request).execute();
+ }
+
users.clear();
devices.clear();
requests = 0;
diff --git a/src/org/traccar/model/Statistics.java b/src/org/traccar/model/Statistics.java
index 93a9c0d39..c7ae5af7a 100644
--- a/src/org/traccar/model/Statistics.java
+++ b/src/org/traccar/model/Statistics.java
@@ -116,6 +116,7 @@ public class Statistics extends Extensible {
public void setGeocoderRequests(int geocoderRequests) {
this.geocoderRequests = geocoderRequests;
}
+
private int geolocationRequests;
public int getGeolocationRequests() {
diff --git a/src/org/traccar/protocol/AtrackFrameDecoder.java b/src/org/traccar/protocol/AtrackFrameDecoder.java
index a075254ea..ce4a9a65f 100644
--- a/src/org/traccar/protocol/AtrackFrameDecoder.java
+++ b/src/org/traccar/protocol/AtrackFrameDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2014 Anton Tananaev (anton@traccar.org)
+ * Copyright 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.
@@ -18,27 +18,46 @@ 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.LengthFieldBasedFrameDecoder;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import org.traccar.helper.StringFinder;
-public class AtrackFrameDecoder extends LengthFieldBasedFrameDecoder {
+public class AtrackFrameDecoder extends FrameDecoder {
private static final int KEEPALIVE_LENGTH = 12;
- public AtrackFrameDecoder() {
- super(1024, 4, 2);
- }
-
@Override
protected Object decode(
ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
- // Keep alive message
- if (buf.readableBytes() >= KEEPALIVE_LENGTH
- && buf.getUnsignedShort(buf.readerIndex()) == 0xfe02) {
- return buf.readBytes(KEEPALIVE_LENGTH);
+ if (buf.readableBytes() >= 2) {
+
+ if (buf.getUnsignedShort(buf.readerIndex()) == 0xfe02) {
+
+ if (buf.readableBytes() >= KEEPALIVE_LENGTH) {
+ return buf.readBytes(KEEPALIVE_LENGTH);
+ }
+
+ } else if (buf.getUnsignedShort(buf.readerIndex()) == 0x4050) {
+
+ if (buf.readableBytes() > 6) {
+ int length = buf.getUnsignedShort(buf.readerIndex() + 4) + 4 + 2;
+ if (buf.readableBytes() >= length) {
+ return buf.readBytes(length);
+ }
+ }
+
+ } else {
+
+ int endIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), new StringFinder("\r\n"));
+ if (endIndex > 0) {
+ return buf.readBytes(endIndex - buf.readerIndex() + 2);
+ }
+
+ }
+
}
- return super.decode(ctx, channel, buf);
+ return null;
}
}
diff --git a/src/org/traccar/protocol/DmtProtocolDecoder.java b/src/org/traccar/protocol/DmtProtocolDecoder.java
index 9b4f9400b..de51cce7a 100644
--- a/src/org/traccar/protocol/DmtProtocolDecoder.java
+++ b/src/org/traccar/protocol/DmtProtocolDecoder.java
@@ -117,6 +117,7 @@ public class DmtProtocolDecoder extends BaseProtocolDecoder {
position.setFixTime(new Date(1356998400000L + buf.readUnsignedInt() * 1000));
position.setLatitude(buf.readInt() * 0.0000001);
position.setLongitude(buf.readInt() * 0.0000001);
+ position.setLongitude(buf.readShort());
position.setSpeed(UnitsConverter.knotsFromCps(buf.readUnsignedShort()));
buf.readUnsignedByte(); // speed accuracy
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index 2b546bb26..ec8871865 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -92,7 +92,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
.number("(d+.d+)?,") // fuel average
.number("(d+)?,") // hours
.number("(d+),") // speed
- .number("d+.?d*%,") // power load
+ .number("(d+.?d*%),") // power load
.number("(?:([-+]?d+)|[-+]?),") // temperature
.number("(d+.?d*%),") // throttle
.number("(d+),") // rpm
@@ -211,6 +211,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextDouble(0));
position.set(Position.KEY_HOURS, parser.nextInt());
position.set(Position.KEY_OBD_SPEED, parser.nextInt(0));
+ position.set("powerLoad", parser.next());
position.set(Position.PREFIX_TEMP + 1, parser.nextInt());
position.set(Position.KEY_THROTTLE, parser.next());
position.set(Position.KEY_RPM, parser.nextInt(0));
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 07:09:12 +0000