aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/YwtProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-06-06 23:14:56 +1200
committerGitHub <noreply@github.com>2018-06-06 23:14:56 +1200
commit6520327938582d5e4928d78fc70f95c60e9ac909 (patch)
treee9c8e8e14d5e8db8271475fdd0d511adc320aee6 /src/org/traccar/protocol/YwtProtocolDecoder.java
parent681b8f42633d7c6741e6fbac4308ba25c4aff9fa (diff)
parentc8028d9b85dd9a5cf6f75de6be64a7aadf56e9a6 (diff)
downloadtrackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.tar.gz
trackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.tar.bz2
trackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.zip
Merge pull request #3913 from Abyss777/netty4_yxw
Migrate Y, X, W protocols
Diffstat (limited to 'src/org/traccar/protocol/YwtProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/YwtProtocolDecoder.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/YwtProtocolDecoder.java b/src/org/traccar/protocol/YwtProtocolDecoder.java
index 3182b838d..4c71b0aea 100644
--- a/src/org/traccar/protocol/YwtProtocolDecoder.java
+++ b/src/org/traccar/protocol/YwtProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2014 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 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.model.Position;
@@ -67,7 +68,7 @@ public class YwtProtocolDecoder extends BaseProtocolDecoder {
end = sentence.length();
}
- channel.write("%AT+SN=" + sentence.substring(start, end));
+ channel.writeAndFlush(new NetworkMessage("%AT+SN=" + sentence.substring(start, end), remoteAddress));
return null;
}
@@ -104,7 +105,7 @@ public class YwtProtocolDecoder extends BaseProtocolDecoder {
// Send response
if ((type.equals("KP") || type.equals("EP")) && channel != null) {
- channel.write("%AT+" + type + "=" + reportId + "\r\n");
+ channel.writeAndFlush(new NetworkMessage("%AT+" + type + "=" + reportId + "\r\n", remoteAddress));
}
return position;