diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-27 17:00:45 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 17:00:45 +1200 |
| commit | 495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598 (patch) | |
| tree | 4b65fbe2d6081f31762a0d8aa790b9fcf81e81f7 /src/org/traccar/protocol/MeitrackProtocolDecoder.java | |
| parent | 194263a9dc8040ebcbf62c80733aca5097eb3e36 (diff) | |
| parent | 49fa4893269b1732806f7176c279742291e02edf (diff) | |
| download | trackermap-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.gz trackermap-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.bz2 trackermap-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.zip | |
Merge pull request #3391 from Abyss777/refactor_drivers_groups
Split Drivers and Groups management
Diffstat (limited to 'src/org/traccar/protocol/MeitrackProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/MeitrackProtocolDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/org/traccar/protocol/MeitrackProtocolDecoder.java index 711697fc4..469ef3f76 100644 --- a/src/org/traccar/protocol/MeitrackProtocolDecoder.java +++ b/src/org/traccar/protocol/MeitrackProtocolDecoder.java @@ -160,7 +160,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { } } - String deviceModel = Context.getIdentityManager().getDeviceById(deviceSession.getDeviceId()).getModel(); + String deviceModel = Context.getIdentityManager().getById(deviceSession.getDeviceId()).getModel(); if (deviceModel == null) { deviceModel = ""; } @@ -316,7 +316,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder { case "D03": if (channel != null) { DeviceSession deviceSession = getDeviceSession(channel, remoteAddress); - String imei = Context.getIdentityManager().getDeviceById(deviceSession.getDeviceId()).getUniqueId(); + String imei = Context.getIdentityManager().getById(deviceSession.getDeviceId()).getUniqueId(); channel.write("@@O46," + imei + ",D00,camera_picture.jpg,0*00\r\n"); } return null; |