aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/FlextrackProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-06-06 21:56:37 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-06-06 21:56:37 +1200
commit681b8f42633d7c6741e6fbac4308ba25c4aff9fa (patch)
tree488c6d1d43399899243adebcb565edd0cf294374 /src/org/traccar/protocol/FlextrackProtocolDecoder.java
parent35bef1115f73da97b15ae3c1de03db1cd6d733c5 (diff)
downloadtrackermap-server-681b8f42633d7c6741e6fbac4308ba25c4aff9fa.tar.gz
trackermap-server-681b8f42633d7c6741e6fbac4308ba25c4aff9fa.tar.bz2
trackermap-server-681b8f42633d7c6741e6fbac4308ba25c4aff9fa.zip
Migrate D, E, F protocols
Diffstat (limited to 'src/org/traccar/protocol/FlextrackProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/FlextrackProtocolDecoder.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/FlextrackProtocolDecoder.java b/src/org/traccar/protocol/FlextrackProtocolDecoder.java
index 8f7525147..f2a5579d2 100644
--- a/src/org/traccar/protocol/FlextrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/FlextrackProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 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.
@@ -15,9 +15,10 @@
*/
package org.traccar.protocol;
-import org.jboss.netty.channel.Channel;
+import io.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.DeviceSession;
+import org.traccar.NetworkMessage;
import org.traccar.helper.Parser;
import org.traccar.helper.PatternBuilder;
import org.traccar.helper.UnitsConverter;
@@ -65,9 +66,9 @@ public class FlextrackProtocolDecoder extends BaseProtocolDecoder {
.number("(d+)") // odometer
.compile();
- private void sendAcknowledgement(Channel channel, String index) {
+ private void sendAcknowledgement(Channel channel, SocketAddress remoteAddress, String index) {
if (channel != null) {
- channel.write(index + ",ACK\r");
+ channel.write(new NetworkMessage(index + ",ACK\r", remoteAddress));
}
}
@@ -84,7 +85,7 @@ public class FlextrackProtocolDecoder extends BaseProtocolDecoder {
return null;
}
- sendAcknowledgement(channel, parser.next());
+ sendAcknowledgement(channel, remoteAddress, parser.next());
String id = parser.next();
String iccid = parser.next();
@@ -106,7 +107,7 @@ public class FlextrackProtocolDecoder extends BaseProtocolDecoder {
Position position = new Position(getProtocolName());
position.setDeviceId(deviceSession.getDeviceId());
- sendAcknowledgement(channel, parser.next());
+ sendAcknowledgement(channel, remoteAddress, parser.next());
position.setTime(parser.nextDateTime());