From d62797376e7dc1d5810c1b8728da1e5443cc8e14 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 18 Jul 2017 06:56:03 +1200
Subject: Refactor TAIP decoder

---
 src/org/traccar/protocol/TaipProtocolDecoder.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/protocol')

diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java
index 7702a89fb..a08bb6f2b 100644
--- a/src/org/traccar/protocol/TaipProtocolDecoder.java
+++ b/src/org/traccar/protocol/TaipProtocolDecoder.java
@@ -104,15 +104,21 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder {
         Position position = new Position();
         position.setProtocol(getProtocolName());
 
+        Integer event = null;
+
         if (parser.hasNext(3)) {
-            position.set(Position.KEY_EVENT, parser.nextInt(0));
+            event = parser.nextInt();
             position.setTime(getTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)));
         } else if (parser.hasNext()) {
             position.setTime(getTime(parser.nextInt(0)));
         }
 
         if (parser.hasNext()) {
-            position.set(Position.KEY_EVENT, parser.nextInt(0));
+            event = parser.nextInt();
+        }
+
+        if (event != null) {
+            position.set(Position.KEY_EVENT, event);
         }
 
         if (parser.hasNext(6)) {
@@ -150,6 +156,12 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder {
             attributes = sentence.substring(beginIndex, endIndex).split(";");
         }
 
+        return decodeAttributes(channel, remoteAddress, position, attributes);
+    }
+
+    private Position decodeAttributes(
+            Channel channel, SocketAddress remoteAddress, Position position, String[] attributes) {
+
         String uniqueId = null;
         DeviceSession deviceSession = null;
         String messageIndex = null;
-- 
cgit v1.2.3