diff options
| -rw-r--r-- | src/org/traccar/protocol/EelinkProtocolDecoder.java | 5 | ||||
| -rw-r--r-- | src/org/traccar/protocol/T55ProtocolDecoder.java | 6 | ||||
| -rw-r--r-- | test/org/traccar/protocol/T55ProtocolDecoderTest.java | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/EelinkProtocolDecoder.java b/src/org/traccar/protocol/EelinkProtocolDecoder.java index 009baebd0..e63189dae 100644 --- a/src/org/traccar/protocol/EelinkProtocolDecoder.java +++ b/src/org/traccar/protocol/EelinkProtocolDecoder.java @@ -99,10 +99,11 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder { } } - else if (type == MSG_GPS || + else if (deviceId != null && + (type == MSG_GPS || type == MSG_ALARM || type == MSG_STATE || - type == MSG_SMS) { + type == MSG_SMS)) { // Create new position Position position = new Position(); diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java index 0f2da7d65..25b7f367f 100644 --- a/src/org/traccar/protocol/T55ProtocolDecoder.java +++ b/src/org/traccar/protocol/T55ProtocolDecoder.java @@ -101,7 +101,11 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder { if (!sentence.startsWith("$") && sentence.contains("$")) { int index = sentence.indexOf("$"); - identify(sentence.substring(0, index)); + String id = sentence.substring(0, index); + if (id.endsWith(",")) { + id = id.substring(0, id.length() - 1); + } + identify(id); sentence = sentence.substring(index); } diff --git a/test/org/traccar/protocol/T55ProtocolDecoderTest.java b/test/org/traccar/protocol/T55ProtocolDecoderTest.java index 4f4818d82..48f462775 100644 --- a/test/org/traccar/protocol/T55ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/T55ProtocolDecoderTest.java @@ -55,6 +55,9 @@ public class T55ProtocolDecoderTest { verify(decoder.decode(null, null, "123456789$GPRMC,155708.252,V,4610.1676,N,00606.4586,E,000.0,000.0,060214,,,N*76")); + + verify(decoder.decode(null, null, + "990000561287964,$GPRMC,213516.0,A,4337.216791,N,11611.995877,W,0.0,335.4,181214,,,A * 72")); } |