diff options
| author | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
|---|---|---|
| committer | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
| commit | 7338b8730949ed027b3f8b31d7dca20687ebbb8b (patch) | |
| tree | c2d171e6121818ab511460a786f69aab97a2a628 /src/main/java/org/traccar/protocol/BceProtocolDecoder.java | |
| parent | cdecd3fa4427a382c0b09f8ad9d69ec14388960a (diff) | |
| parent | 85501f9cf4918d5eee345f83aed7a31eecb26b8d (diff) | |
| download | trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.gz trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.bz2 trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'src/main/java/org/traccar/protocol/BceProtocolDecoder.java')
| -rw-r--r-- | src/main/java/org/traccar/protocol/BceProtocolDecoder.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/protocol/BceProtocolDecoder.java b/src/main/java/org/traccar/protocol/BceProtocolDecoder.java index c1a69981d..2c9459584 100644 --- a/src/main/java/org/traccar/protocol/BceProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/BceProtocolDecoder.java @@ -19,7 +19,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; -import org.traccar.DeviceSession; +import org.traccar.session.DeviceSession; import org.traccar.NetworkMessage; import org.traccar.Protocol; import org.traccar.helper.BitUtil; @@ -90,11 +90,13 @@ public class BceProtocolDecoder extends BaseProtocolDecoder { } if (BitUtil.check(mask, 14)) { - position.setNetwork(new Network(CellTower.from( - buf.readUnsignedShortLE(), buf.readUnsignedByte(), - buf.readUnsignedShortLE(), buf.readUnsignedShortLE(), - buf.readUnsignedByte()))); - buf.readUnsignedByte(); + int mcc = buf.readUnsignedShortLE(); + int mnc = buf.readUnsignedByte(); + int lac = buf.readUnsignedShortLE(); + int cid = buf.readUnsignedShortLE(); + buf.readUnsignedByte(); // time advance + int rssi = -buf.readUnsignedByte(); + position.setNetwork(new Network(CellTower.from(mcc, mnc, lac, cid, rssi))); } } |