diff options
| author | Kevin Goos <kevingoos@telenet.be> | 2018-03-16 13:24:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 13:24:17 +0100 |
| commit | 25a36fe2fb8045e455de5e936c286c4db8b40563 (patch) | |
| tree | 074a212284fdc3e8779ca55f8694f8e92c24e8a7 /src/org/traccar/protocol/MeiligaoProtocolEncoder.java | |
| parent | 1216e3bee2abfecedfe1250a9dd5d45c83a2fc02 (diff) | |
| parent | 38c1ff9bccc1c417a0c2b412271aa7240a3b7db7 (diff) | |
| download | traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.gz traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.bz2 traccar-server-25a36fe2fb8045e455de5e936c286c4db8b40563.zip | |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/protocol/MeiligaoProtocolEncoder.java')
| -rw-r--r-- | src/org/traccar/protocol/MeiligaoProtocolEncoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/MeiligaoProtocolEncoder.java b/src/org/traccar/protocol/MeiligaoProtocolEncoder.java index 2e0a1e84c..340d947e3 100644 --- a/src/org/traccar/protocol/MeiligaoProtocolEncoder.java +++ b/src/org/traccar/protocol/MeiligaoProtocolEncoder.java @@ -19,10 +19,10 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.traccar.BaseProtocolEncoder; import org.traccar.helper.Checksum; +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.util.TimeZone; @@ -44,7 +44,7 @@ public class MeiligaoProtocolEncoder extends BaseProtocolEncoder { buf.writeShort(2 + 2 + 7 + 2 + content.readableBytes() + 2 + 2); // message length - buf.writeBytes(DatatypeConverter.parseHexBinary((getUniqueId(deviceId) + "FFFFFFFFFFFFFF").substring(0, 14))); + buf.writeBytes(DataConverter.parseHex((getUniqueId(deviceId) + "FFFFFFFFFFFFFF").substring(0, 14))); buf.writeShort(type); |