aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-09-10 00:08:35 +1200
committerGitHub <noreply@github.com>2016-09-10 00:08:35 +1200
commitd62941c0bf39c6c9d7f31e5048306ec1b1908e85 (patch)
treeaf6119c309410a5724d01ab79ca9906c3476d1c3
parent9bbb70a0eb76bd81c494c410772a31f19d6fd584 (diff)
parent91cc83f8d09f7ee591c9109e61cee6492226a612 (diff)
downloadtrackermap-server-d62941c0bf39c6c9d7f31e5048306ec1b1908e85.tar.gz
trackermap-server-d62941c0bf39c6c9d7f31e5048306ec1b1908e85.tar.bz2
trackermap-server-d62941c0bf39c6c9d7f31e5048306ec1b1908e85.zip
Merge pull request #2297 from Abyss777/watch_pulse
Handle Watch answer on pulse command
-rw-r--r--src/org/traccar/protocol/WatchProtocolDecoder.java13
-rw-r--r--test/org/traccar/protocol/WatchProtocolDecoderTest.java3
2 files changed, 16 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolDecoder.java b/src/org/traccar/protocol/WatchProtocolDecoder.java
index 326552e7f..d74fdbe81 100644
--- a/src/org/traccar/protocol/WatchProtocolDecoder.java
+++ b/src/org/traccar/protocol/WatchProtocolDecoder.java
@@ -25,6 +25,7 @@ import org.traccar.helper.UnitsConverter;
import org.traccar.model.Position;
import java.net.SocketAddress;
+import java.util.Date;
import java.util.regex.Pattern;
public class WatchProtocolDecoder extends BaseProtocolDecoder {
@@ -146,6 +147,18 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
sendResponse(channel, manufacturer, id, "TKQ");
+ } else if (type.equals("PULSE")) {
+
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+ position.setDeviceId(deviceSession.getDeviceId());
+ getLastLocation(position, new Date());
+ position.setValid(false);
+ String pulse = content.substring(1);
+ position.set("pulse", pulse);
+ position.set(Position.KEY_RESULT, pulse);
+ return position;
+
}
return null;
diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/test/org/traccar/protocol/WatchProtocolDecoderTest.java
index a8f7b12bc..6116c2c2b 100644
--- a/test/org/traccar/protocol/WatchProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/WatchProtocolDecoderTest.java
@@ -54,6 +54,9 @@ public class WatchProtocolDecoderTest extends ProtocolTest {
verifyPosition(decoder, text(
"[SG*8800000015*0087*AL,220414,134652,A,22.571707,N,113.8613968,E,0.1,0.0,100,7,60,90,1000,50,0001,4,1,460,0,9360,4082,131,9360,4092,148,9360,4091,143,9360,4153,141"));
+ verifyAttributes(decoder, text(
+ "[CS*8800000015*0008*PULSE,72"));
+
}
}