diff options
author | Anton Tananaev <anton@traccar.org> | 2024-02-19 11:53:08 -0800 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2024-02-19 11:53:14 -0800 |
commit | efd9e261791942334dbf4a911883a1b2b791f282 (patch) | |
tree | 8aa830282cd64b9b3a28e858865a8783b1eea3bc /src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java | |
parent | 26548bb534de6c9944ece5a2aa5216da83cb8819 (diff) | |
download | trackermap-server-efd9e261791942334dbf4a911883a1b2b791f282.tar.gz trackermap-server-efd9e261791942334dbf4a911883a1b2b791f282.tar.bz2 trackermap-server-efd9e261791942334dbf4a911883a1b2b791f282.zip |
Streamline model name access
Diffstat (limited to 'src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java')
-rw-r--r-- | src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java index 965c8ee0d..88b6380a5 100644 --- a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java @@ -20,7 +20,6 @@ import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; -import org.traccar.model.Device; import org.traccar.session.DeviceSession; import org.traccar.NetworkMessage; import org.traccar.Protocol; @@ -38,6 +37,7 @@ import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.regex.Pattern; public class MeitrackProtocolDecoder extends BaseProtocolDecoder { @@ -206,11 +206,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { position.set(Position.PREFIX_ADC + i, parser.nextHexInt()); } - String model = getCacheManager().getObject(Device.class, deviceSession.getDeviceId()).getModel(); - if (model == null) { - model = ""; - } - switch (model.toUpperCase()) { + switch (Objects.requireNonNullElse(getDeviceModel(deviceSession), "").toUpperCase()) { case "MVT340": case "MVT380": position.set(Position.KEY_BATTERY, parser.nextHexInt() * 3.0 * 2.0 / 1024.0); |