diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:48:34 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:48:34 +1200 |
| commit | d1c4cd526845aad56c5b0a3e20454638bbc7fecc (patch) | |
| tree | 565ee245ea0e98b88674b775147fbc6d3e1933cb /src/org/traccar/protocol/T55ProtocolDecoder.java | |
| parent | 88b3f00f3855aa408c7859051efdcb5b37fe559f (diff) | |
| download | trackermap-server-d1c4cd526845aad56c5b0a3e20454638bbc7fecc.tar.gz trackermap-server-d1c4cd526845aad56c5b0a3e20454638bbc7fecc.tar.bz2 trackermap-server-d1c4cd526845aad56c5b0a3e20454638bbc7fecc.zip | |
Merge commands implmentation (fix #1271)
Diffstat (limited to 'src/org/traccar/protocol/T55ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/T55ProtocolDecoder.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java index f20eb1bf7..ce9f98f2d 100644 --- a/src/org/traccar/protocol/T55ProtocolDecoder.java +++ b/src/org/traccar/protocol/T55ProtocolDecoder.java @@ -29,7 +29,7 @@ import org.traccar.model.Position; public class T55ProtocolDecoder extends BaseProtocolDecoder { - public T55ProtocolDecoder(String protocol) { + public T55ProtocolDecoder(T55Protocol protocol) { super(protocol); } @@ -92,33 +92,33 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder { if (id.endsWith(",")) { id = id.substring(0, id.length() - 1); } - identify(id); + identify(id, channel); sentence = sentence.substring(index); } // Identification if (sentence.startsWith("$PGID")) { - identify(sentence.substring(6, sentence.length() - 3)); + identify(sentence.substring(6, sentence.length() - 3), channel); } // Identification else if (sentence.startsWith("$PCPTI")) { - identify(sentence.substring(7, sentence.indexOf(",", 7))); + identify(sentence.substring(7, sentence.indexOf(",", 7)), channel); } // Identification else if (sentence.startsWith("IMEI")) { - identify(sentence.substring(5, sentence.length())); + identify(sentence.substring(5, sentence.length()), channel); } // Identification else if (sentence.startsWith("$GPFID")) { - identify(sentence.substring(6, sentence.length())); + identify(sentence.substring(6, sentence.length()), channel); } // Identification else if (Character.isDigit(sentence.charAt(0)) & sentence.length() == 15) { - identify(sentence); + identify(sentence, channel); } // Location @@ -137,7 +137,7 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); position.setDeviceId(getDeviceId()); Integer index = 1; @@ -195,7 +195,7 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); position.setDeviceId(getDeviceId()); Integer index = 1; @@ -236,7 +236,7 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); position.setDeviceId(getDeviceId()); Integer index = 1; @@ -284,7 +284,7 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); position.setDeviceId(getDeviceId()); Integer index = 1; |