diff options
| author | Parveen Kumar Yadav <parveenkumardeeva@gmail.com> | 2018-04-13 10:47:42 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 10:47:42 +0530 |
| commit | d448823edd0e8a7833c79b980cfe9778b849843a (patch) | |
| tree | 50ad1ab51b93915cff422a1834baa5a2c579fce8 /src/org/traccar/protocol/T55ProtocolDecoder.java | |
| parent | 2c8392a0e16044905d983da56ab0919eadbb3858 (diff) | |
| parent | 617393cf9f052298f7fb35f0c58138c87a6dd5c3 (diff) | |
| download | traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.gz traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.bz2 traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.zip | |
Merge pull request #1 from traccar/master
Bringing Fork Up to Date
Diffstat (limited to 'src/org/traccar/protocol/T55ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/T55ProtocolDecoder.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/org/traccar/protocol/T55ProtocolDecoder.java index dbc467993..be3cb5f67 100644 --- a/src/org/traccar/protocol/T55ProtocolDecoder.java +++ b/src/org/traccar/protocol/T55ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2012 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -250,9 +250,11 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder { } else if (sentence.startsWith("$PCPTI")) { getDeviceSession(channel, remoteAddress, sentence.substring(7, sentence.indexOf(",", 7))); } else if (sentence.startsWith("IMEI")) { - getDeviceSession(channel, remoteAddress, sentence.substring(5, sentence.length())); + getDeviceSession(channel, remoteAddress, sentence.substring(5)); + } else if (sentence.startsWith("$IMEI")) { + getDeviceSession(channel, remoteAddress, sentence.substring(6)); } else if (sentence.startsWith("$GPFID")) { - deviceSession = getDeviceSession(channel, remoteAddress, sentence.substring(7, sentence.length())); + deviceSession = getDeviceSession(channel, remoteAddress, sentence.substring(7)); if (deviceSession != null && position != null) { Position position = this.position; position.setDeviceId(deviceSession.getDeviceId()); |