diff options
| author | Kevin Goos <kevingoos@telenet.be> | 2018-03-16 13:35:11 +0100 |
|---|---|---|
| committer | Kevin Goos <kevingoos@telenet.be> | 2018-03-16 13:35:11 +0100 |
| commit | 3b7c9c56e198ce213d3e113a2fbc4148b5d85558 (patch) | |
| tree | a04b64fc484c6832b8f023412db020e3e5e9a657 /src/org/traccar/protocol/WatchProtocolEncoder.java | |
| parent | b34cf25b5ac1f178d783a512d3b95faed4bdb010 (diff) | |
| parent | 25a36fe2fb8045e455de5e936c286c4db8b40563 (diff) | |
| download | traccar-server-3b7c9c56e198ce213d3e113a2fbc4148b5d85558.tar.gz traccar-server-3b7c9c56e198ce213d3e113a2fbc4148b5d85558.tar.bz2 traccar-server-3b7c9c56e198ce213d3e113a2fbc4148b5d85558.zip | |
Merge branch 'master' of https://github.com/kevingoos/traccar
Diffstat (limited to 'src/org/traccar/protocol/WatchProtocolEncoder.java')
| -rw-r--r-- | src/org/traccar/protocol/WatchProtocolEncoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java index d2d3b52d1..5206fbf10 100644 --- a/src/org/traccar/protocol/WatchProtocolEncoder.java +++ b/src/org/traccar/protocol/WatchProtocolEncoder.java @@ -16,10 +16,10 @@ package org.traccar.protocol; import org.traccar.StringProtocolEncoder; +import org.traccar.helper.DataConverter; import org.traccar.helper.Log; import org.traccar.model.Command; -import javax.xml.bind.DatatypeConverter; import java.nio.charset.StandardCharsets; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -68,7 +68,7 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin } private String getBinaryData(Command command) { - byte[] data = DatatypeConverter.parseHexBinary(command.getString(Command.KEY_DATA)); + byte[] data = DataConverter.parseHex(command.getString(Command.KEY_DATA)); int encodedLength = data.length; for (byte b : data) { |