diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:49:13 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:49:13 +1200 |
commit | 55448d82b2971bc16c67bfa2b2e996d81c4c702e (patch) | |
tree | 565ee245ea0e98b88674b775147fbc6d3e1933cb /src/org/traccar/protocol/WialonProtocolDecoder.java | |
parent | 88b3f00f3855aa408c7859051efdcb5b37fe559f (diff) | |
parent | d1c4cd526845aad56c5b0a3e20454638bbc7fecc (diff) | |
download | trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.tar.gz trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.tar.bz2 trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.zip |
Merge branch implement commands (fix #1271)
Diffstat (limited to 'src/org/traccar/protocol/WialonProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/WialonProtocolDecoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/WialonProtocolDecoder.java b/src/org/traccar/protocol/WialonProtocolDecoder.java index 423f614bc..d85a64d31 100644 --- a/src/org/traccar/protocol/WialonProtocolDecoder.java +++ b/src/org/traccar/protocol/WialonProtocolDecoder.java @@ -32,7 +32,7 @@ import org.traccar.model.Position; public class WialonProtocolDecoder extends BaseProtocolDecoder { - public WialonProtocolDecoder(String protocol) { + public WialonProtocolDecoder(WialonProtocol protocol) { super(protocol); } @@ -77,7 +77,7 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); position.setDeviceId(getDeviceId()); Integer index = 1; @@ -174,7 +174,7 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder { // Detect device ID if (sentence.startsWith("#L#")) { String imei = sentence.substring(3, sentence.indexOf(';')); - if (identify(imei)) { + if (identify(imei, channel)) { sendResponse(channel, "#AL#", 1); } } |