diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-09 00:11:14 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-09 00:11:14 +1200 |
commit | 46274ffddf31d0f09a7c370b2e374f53f6ecc2b6 (patch) | |
tree | 8d0869a71665898524fc67bfb5940a21a73c07e5 /src/org/traccar/protocol/TrvProtocolDecoder.java | |
parent | fb543fb413652f4cb0408a6caafbdd7f4a4ca369 (diff) | |
parent | c176b7b4bf4eef6f71767f92ada2591ef27c1cfa (diff) | |
download | traccar-server-46274ffddf31d0f09a7c370b2e374f53f6ecc2b6.tar.gz traccar-server-46274ffddf31d0f09a7c370b2e374f53f6ecc2b6.tar.bz2 traccar-server-46274ffddf31d0f09a7c370b2e374f53f6ecc2b6.zip |
Merge pull request #3921 from Abyss777/netty4_tz-tl
Migrate part of T protocols
Diffstat (limited to 'src/org/traccar/protocol/TrvProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/TrvProtocolDecoder.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/TrvProtocolDecoder.java b/src/org/traccar/protocol/TrvProtocolDecoder.java index e0cebc9a5..9c4968974 100644 --- a/src/org/traccar/protocol/TrvProtocolDecoder.java +++ b/src/org/traccar/protocol/TrvProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2017 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.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; @@ -119,11 +120,11 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder { String responseHeader = id + (char) (type.charAt(0) + 1) + type.substring(1); if (type.equals("AP00") && id.equals("IW")) { String time = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); - channel.write(responseHeader + "," + time + ",0#"); + channel.writeAndFlush(new NetworkMessage(responseHeader + "," + time + ",0#", remoteAddress)); } else if (type.equals("AP14")) { - channel.write(responseHeader + ",0.000,0.000#"); + channel.writeAndFlush(new NetworkMessage(responseHeader + ",0.000,0.000#", remoteAddress)); } else { - channel.write(responseHeader + "#"); + channel.writeAndFlush(new NetworkMessage(responseHeader + "#", remoteAddress)); } } |