aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/tk103
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/protocol/tk103')
-rw-r--r--src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java57
1 files changed, 5 insertions, 52 deletions
diff --git a/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java
index bc5685ecd..db3280d91 100644
--- a/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java
@@ -18,40 +18,24 @@ package org.traccar.protocol.tk103;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;
-import java.util.Timer;
-import java.util.TimerTask;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
import org.traccar.Position;
import org.traccar.DataManager;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
+import org.traccar.GenericProtocolDecoder;
/**
* Gps 103 tracker protocol decoder
*/
-public class Tk103ProtocolDecoder extends OneToOneDecoder {
+public class Tk103ProtocolDecoder extends GenericProtocolDecoder {
/**
- * Data manager
- */
- private DataManager dataManager;
-
- /**
- * Reset connection delay
- */
- private Integer resetDelay;
-
- /**
- * Init device table
+ * Initialize
*/
public Tk103ProtocolDecoder(DataManager dataManager, Integer resetDelay) {
- this.dataManager = dataManager;
- this.resetDelay = resetDelay;
+ super(dataManager, resetDelay);
}
/**
@@ -99,7 +83,7 @@ public class Tk103ProtocolDecoder extends OneToOneDecoder {
// Get device by IMEI
String imei = parser.group(index++);
- position.setDeviceId(dataManager.getDeviceByImei(imei).getId());
+ position.setDeviceId(getDataManager().getDeviceByImei(imei).getId());
// Date
Calendar time = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
@@ -141,35 +125,4 @@ public class Tk103ProtocolDecoder extends OneToOneDecoder {
return position;
}
- /**
- * Disconnect channel
- */
- class DisconnectTask extends TimerTask {
- private Channel channel;
-
- public DisconnectTask(Channel channel) {
- this.channel = channel;
- }
-
- public void run() {
- channel.disconnect();
- }
- }
-
- /**
- * Handle connect event
- */
- @Override
- public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent evt) throws Exception {
- super.handleUpstream(ctx, evt);
-
- if (evt instanceof ChannelStateEvent) {
- ChannelStateEvent event = (ChannelStateEvent) evt;
-
- if (event.getState() == ChannelState.CONNECTED && event.getValue() != null && resetDelay != 0) {
- new Timer().schedule(new DisconnectTask(evt.getChannel()), resetDelay);
- }
- }
- }
-
}