diff options
| author | casswarry0 <casswarry0@gmail.com> | 2021-11-23 10:39:19 -0700 |
|---|---|---|
| committer | casswarry0 <casswarry0@gmail.com> | 2021-11-23 10:39:19 -0700 |
| commit | 17370d68fe7383226d1d23a967985e9da4153601 (patch) | |
| tree | 97014218ca76da64e7b81978c04f3cc47bc2379a /src/main/java/org/traccar | |
| parent | 26e3d8eb0c40822e5f39d144ecb053916c463e8f (diff) | |
| download | trackermap-server-17370d68fe7383226d1d23a967985e9da4153601.tar.gz trackermap-server-17370d68fe7383226d1d23a967985e9da4153601.tar.bz2 trackermap-server-17370d68fe7383226d1d23a967985e9da4153601.zip | |
Revert changes to POSITION data type. Fix error with protocol version reporting from Traccar server to eeLink device to prevent eeLink device from sending LTE cell info.
Diffstat (limited to 'src/main/java/org/traccar')
| -rw-r--r-- | src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java b/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java index 3e805097c..8fe12fe69 100644 --- a/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java @@ -218,17 +218,6 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder { buf.skipBytes(7); // bss2 } - if (BitUtil.check(flags, 7)) { - buf.readUnsignedByte(); // rat - short noc = buf.readUnsignedByte(); // noc - if (noc > 0) { - buf.skipBytes(19); // lte-srv - for (short i = 1; i < noc; i++) { - buf.skipBytes(5); // lte-nbr - } - } - } - if (type == MSG_WARNING) { position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte())); @@ -432,7 +421,7 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder { ByteBuf content = Unpooled.buffer(); if (type == MSG_LOGIN) { content.writeInt((int) (System.currentTimeMillis() / 1000)); - content.writeByte(1); // protocol version + content.writeShort(1); // protocol version content.writeByte(0); // action mask } ByteBuf response = EelinkProtocolEncoder.encodeContent( |