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/HuabaoProtocolEncoder.java | |
| parent | 1216e3bee2abfecedfe1250a9dd5d45c83a2fc02 (diff) | |
| parent | 38c1ff9bccc1c417a0c2b412271aa7240a3b7db7 (diff) | |
| download | trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.gz trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.tar.bz2 trackermap-server-25a36fe2fb8045e455de5e936c286c4db8b40563.zip | |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/protocol/HuabaoProtocolEncoder.java')
| -rw-r--r-- | src/org/traccar/protocol/HuabaoProtocolEncoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/HuabaoProtocolEncoder.java b/src/org/traccar/protocol/HuabaoProtocolEncoder.java index 7d6f0510d..d1889bf5e 100644 --- a/src/org/traccar/protocol/HuabaoProtocolEncoder.java +++ b/src/org/traccar/protocol/HuabaoProtocolEncoder.java @@ -18,10 +18,10 @@ package org.traccar.protocol; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.traccar.BaseProtocolEncoder; +import org.traccar.helper.DataConverter; import org.traccar.helper.Log; import org.traccar.model.Command; -import javax.xml.bind.DatatypeConverter; import java.text.SimpleDateFormat; import java.util.Date; @@ -31,10 +31,10 @@ public class HuabaoProtocolEncoder extends BaseProtocolEncoder { protected Object encodeCommand(Command command) { ChannelBuffer id = ChannelBuffers.wrappedBuffer( - DatatypeConverter.parseHexBinary(getUniqueId(command.getDeviceId()))); + DataConverter.parseHex(getUniqueId(command.getDeviceId()))); ChannelBuffer data = ChannelBuffers.dynamicBuffer(); - byte[] time = DatatypeConverter.parseHexBinary(new SimpleDateFormat("yyMMddHHmmss").format(new Date())); + byte[] time = DataConverter.parseHex(new SimpleDateFormat("yyMMddHHmmss").format(new Date())); switch (command.getType()) { case Command.TYPE_ENGINE_STOP: |