aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-04-24 06:51:06 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-04-24 06:51:06 +1200
commitb342537302665a679ff7458aad27d8137a8838f3 (patch)
treefc5736db844b09cfc7c74934809abf58a0bdf47f
parent72f12c56689bc5b90e4b2256027a88289e5f47fa (diff)
downloadtraccar-server-b342537302665a679ff7458aad27d8137a8838f3.tar.gz
traccar-server-b342537302665a679ff7458aad27d8137a8838f3.tar.bz2
traccar-server-b342537302665a679ff7458aad27d8137a8838f3.zip
Implement PT33 protocol variant
-rw-r--r--src/org/traccar/protocol/TrvProtocolDecoder.java21
-rw-r--r--test/org/traccar/protocol/TrvProtocolDecoderTest.java15
2 files changed, 30 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/TrvProtocolDecoder.java b/src/org/traccar/protocol/TrvProtocolDecoder.java
index 415828ffd..88ac76134 100644
--- a/src/org/traccar/protocol/TrvProtocolDecoder.java
+++ b/src/org/traccar/protocol/TrvProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 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.
@@ -27,6 +27,8 @@ import org.traccar.model.Network;
import org.traccar.model.Position;
import java.net.SocketAddress;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.regex.Pattern;
public class TrvProtocolDecoder extends BaseProtocolDecoder {
@@ -36,7 +38,7 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder {
}
private static final Pattern PATTERN = new PatternBuilder()
- .text("TRV")
+ .expression("[A-Z]{2,3}")
.number("APdd")
.number("(dd)(dd)(dd)") // date (yymmdd)
.expression("([AV])") // validity
@@ -61,7 +63,7 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder {
.compile();
private static final Pattern PATTERN_HEATRBEAT = new PatternBuilder()
- .text("TRV")
+ .expression("[A-Z]{2,3}")
.text("CP01,")
.number("(ddd)") // gsm
.number("(ddd)") // gps
@@ -78,13 +80,20 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder {
String sentence = (String) msg;
- String type = sentence.substring(3, 7);
+ String id = sentence.startsWith("TRV") ? sentence.substring(0, 3) : sentence.substring(0, 2);
+ String type = sentence.substring(id.length(), id.length() + 4);
+
if (channel != null) {
- channel.write("TRV" + (char) (type.charAt(0) + 1) + type.substring(1) + "#"); // response
+ if (type.equals("AP00") && id.equals("IW")) {
+ String time = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+ channel.write(id + (char) (type.charAt(0) + 1) + type.substring(1) + "," + time + ",0#");
+ } else {
+ channel.write(id + (char) (type.charAt(0) + 1) + type.substring(1) + "#");
+ }
}
if (type.equals("AP00")) {
- getDeviceSession(channel, remoteAddress, sentence.substring(7));
+ getDeviceSession(channel, remoteAddress, sentence.substring(id.length() + type.length()));
return null;
}
diff --git a/test/org/traccar/protocol/TrvProtocolDecoderTest.java b/test/org/traccar/protocol/TrvProtocolDecoderTest.java
index f7b9ed1ab..319455b9f 100644
--- a/test/org/traccar/protocol/TrvProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TrvProtocolDecoderTest.java
@@ -11,6 +11,21 @@ public class TrvProtocolDecoderTest extends ProtocolTest {
TrvProtocolDecoder decoder = new TrvProtocolDecoder(new TrvProtocol());
verifyNull(decoder, text(
+ "IWAP00353456789012345"));
+
+ verifyPosition(decoder, text(
+ "IWAP01080524A2232.9806N11404.9355E000.1061830323.8706000908000102,460,0,9520,3671,Home|74-DE-2B-44-88-8C|97& Home1|74-DE-2B-44-88-8C|97&Home2|74-DE-2B-44-88-8C|97& Home3|74-DE-2B-44-88-8C|97"));
+
+ verifyNull(decoder, text(
+ "IWAP02,zh_cn,0,7,460,0,9520|3671|13,9520|3672|12,9520|3673|11,9520|3674|10,9520|3675|9,9520|3676|8,9520|3677|7,4,1|D8-24-BD-79-FA-1F|59&2|3C-46-D8-6D-CE-01|81&3|0C-4C-39-1A-7C-65|69&4|70-A8-E3-5D-D7-C0|65"));
+
+ verifyPosition(decoder, text(
+ "IWAP10080524A2232.9806N11404.9355E000.1061830323.8706000908000502,460,0,9520,3671,00,zh-cn,00,HOME|74-DE-2B-44-88-8C|97&HOME1|74-DE-2B-44-88-8C|97&HOME2|74-DE-2B-44-88-8C|97&HOME3|74-DE-2B-44-88-8C|97"));
+
+ verifyNull(decoder, text(
+ "IWAP03,06000908000102,5555,30"));
+
+ verifyNull(decoder, text(
"TRVAP00353456789012345"));
verifyAttributes(decoder, text(