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/NvsProtocolDecoder.java | |
parent | e954e95547d05a34bbd36e3aa5003f4ddaf2ccd0 (diff) | |
parent | 00e2f8a3575855a8b863e245005b8f83b3314bfb (diff) | |
download | traccar-server-20f603076210073e122c720e21a3e8999478b11a.tar.gz traccar-server-20f603076210073e122c720e21a3e8999478b11a.tar.bz2 traccar-server-20f603076210073e122c720e21a3e8999478b11a.zip |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'src/org/traccar/protocol/NvsProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/NvsProtocolDecoder.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/NvsProtocolDecoder.java b/src/org/traccar/protocol/NvsProtocolDecoder.java index 2a195c599..c32501d56 100644 --- a/src/org/traccar/protocol/NvsProtocolDecoder.java +++ b/src/org/traccar/protocol/NvsProtocolDecoder.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.UnitsConverter; import org.traccar.model.Position; @@ -53,13 +54,18 @@ public class NvsProtocolDecoder extends BaseProtocolDecoder { String imei = buf.toString(buf.readerIndex(), 15, StandardCharsets.US_ASCII); - if (!identify(imei, channel, remoteAddress)) { - sendResponse(channel, "NO01"); - } else { + if (getDeviceSession(channel, remoteAddress, imei) != null) { sendResponse(channel, "OK"); + } else { + sendResponse(channel, "NO01"); } - } else if (hasDeviceId()) { + } else { + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress); + if (deviceSession == null) { + return null; + } List<Position> positions = new LinkedList<>(); @@ -72,7 +78,7 @@ public class NvsProtocolDecoder extends BaseProtocolDecoder { for (int i = 0; i < count; i++) { Position position = new Position(); position.setProtocol(getProtocolName()); - position.setDeviceId(getDeviceId()); + position.setDeviceId(deviceSession.getDeviceId()); position.setTime(new Date(buf.readUnsignedInt() * 1000)); |