Add RFID support for GPS103 protocol

1 files changed, 6 insertions, 1 deletions

diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index f6cd57d9e..2c7397231 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -37,7 +37,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
             .expression("([^,]+),")              // alarm
             .number("(dd)/?(dd)/?(dd) ?")        // local date
             .number("(dd):?(dd)(?:dd)?,")        // local time
-            .expression("[^,]*,")
+            .expression("([^,]+)?,")             // rfid
             .expression("[FL],")                 // full / low
             .groupBegin()
             .number("(dd)(dd)(dd).(d+)")         // time utc (hhmmss.sss)
@@ -147,6 +147,11 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
         int localHours = parser.nextInt();
         int localMinutes = parser.nextInt();
 
+        String rfid = parser.next();
+        if (alarm.equals("rfid")) {
+            position.set(Event.KEY_RFID, rfid);
+        }
+
         String utcHours = parser.next();
         String utcMinutes = parser.next();