diff options
| author | Abyss777 <abyss@fox5.ru> | 2016-05-20 11:45:40 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2016-05-20 11:45:40 +0500 |
| commit | 970040bce55605b58e622fd382df073b5f8b97e5 (patch) | |
| tree | 10eb5f09fc5752a705d75821bbf627f33d87a03c /src/org/traccar/protocol/WondexFrameDecoder.java | |
| parent | 8249d9f7dc2cd4b7bb32e8d528d387f5ce88a60d (diff) | |
| parent | 0d755bebbcb801ad7f1dd5ca6f085aa82c64cb26 (diff) | |
| download | trackermap-server-970040bce55605b58e622fd382df073b5f8b97e5.tar.gz trackermap-server-970040bce55605b58e622fd382df073b5f8b97e5.tar.bz2 trackermap-server-970040bce55605b58e622fd382df073b5f8b97e5.zip | |
Merge branch 'wondex_command_result'
Diffstat (limited to 'src/org/traccar/protocol/WondexFrameDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/WondexFrameDecoder.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java index c217166e8..7502c3320 100644 --- a/src/org/traccar/protocol/WondexFrameDecoder.java +++ b/src/org/traccar/protocol/WondexFrameDecoder.java @@ -15,7 +15,9 @@ */ package org.traccar.protocol; +import java.nio.charset.StandardCharsets; import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.frame.FrameDecoder; @@ -40,6 +42,9 @@ public class WondexFrameDecoder extends FrameDecoder { if (channel != null) { channel.write(frame); } + // Pass deviceId to protocol decoder + long deviceId = ((Long.reverseBytes((frame.getLong(0)))) >> 32) & 0xFFFFFFFFL; + return ChannelBuffers.copiedBuffer("$ID:"+String.valueOf(deviceId), StandardCharsets.US_ASCII); } else { |