diff options
author | ninioe <ninioe@gmail.com> | 2016-07-19 15:20:15 +0300 |
---|---|---|
committer | ninioe <ninioe@gmail.com> | 2016-07-19 15:20:15 +0300 |
commit | 20f603076210073e122c720e21a3e8999478b11a (patch) | |
tree | 668a50e6c55601c2420bf0f4b986ed0b194c2e32 /src/org/traccar/protocol/Avl301ProtocolDecoder.java | |
parent | e954e95547d05a34bbd36e3aa5003f4ddaf2ccd0 (diff) | |
parent | 00e2f8a3575855a8b863e245005b8f83b3314bfb (diff) | |
download | trackermap-server-20f603076210073e122c720e21a3e8999478b11a.tar.gz trackermap-server-20f603076210073e122c720e21a3e8999478b11a.tar.bz2 trackermap-server-20f603076210073e122c720e21a3e8999478b11a.zip |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'src/org/traccar/protocol/Avl301ProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/Avl301ProtocolDecoder.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/Avl301ProtocolDecoder.java b/src/org/traccar/protocol/Avl301ProtocolDecoder.java index 1f7e3470c..4d2dfe126 100644 --- a/src/org/traccar/protocol/Avl301ProtocolDecoder.java +++ b/src/org/traccar/protocol/Avl301ProtocolDecoder.java @@ -19,6 +19,7 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; import org.traccar.helper.DateBuilder; import org.traccar.model.Position; @@ -46,7 +47,7 @@ public class Avl301ProtocolDecoder extends BaseProtocolDecoder { public static final int MSG_STATUS = 'H'; public static final int MSG_GPS_LBS_STATUS = '$'; - private static void sendResponse(Channel channel, int type) { + private void sendResponse(Channel channel, int type) { if (channel != null) { ChannelBuffer response = ChannelBuffers.directBuffer(5); response.writeByte('$'); @@ -69,18 +70,24 @@ public class Avl301ProtocolDecoder extends BaseProtocolDecoder { if (type == MSG_LOGIN) { - if (identify(readImei(buf), channel, remoteAddress)) { + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, readImei(buf)); + if (deviceSession == null) { sendResponse(channel, type); } - } else if (hasDeviceId() && type == MSG_STATUS) { + } else if (type == MSG_STATUS) { sendResponse(channel, type); - } else if (hasDeviceId() && type == MSG_GPS_LBS_STATUS) { + } else if (type == MSG_GPS_LBS_STATUS) { + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress); + if (deviceSession == null) { + return null; + } Position position = new Position(); - position.setDeviceId(getDeviceId()); + position.setDeviceId(deviceSession.getDeviceId()); position.setProtocol(getProtocolName()); DateBuilder dateBuilder = new DateBuilder() |