diff options
Diffstat (limited to 'src/org/traccar/protocol/NoranProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/NoranProtocolDecoder.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java index ddfa4cba6..62f0b4219 100644 --- a/src/org/traccar/protocol/NoranProtocolDecoder.java +++ b/src/org/traccar/protocol/NoranProtocolDecoder.java @@ -76,13 +76,10 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder { type == MSG_ALARM) { boolean newFormat = false; - /*if (((type == MSG_UPLOAD_POSITION || type == MSG_ALARM) && buf.readableBytes() == 30) || - ((type == MSG_CONTROL_RESPONSE) && buf.readableBytes() == 39)) { - newFormat = false; - }*/ - if (((type == MSG_UPLOAD_POSITION || type == MSG_ALARM) && buf.readableBytes() == 48) || - ((type == MSG_CONTROL_RESPONSE) && buf.readableBytes() == 57) || - ((type == MSG_UPLOAD_POSITION_NEW))) { + if (type == MSG_UPLOAD_POSITION && buf.readableBytes() == 48 || + type == MSG_ALARM && buf.readableBytes() == 48 || + type == MSG_CONTROL_RESPONSE && buf.readableBytes() == 57 || + type == MSG_UPLOAD_POSITION_NEW) { newFormat = true; } |