From 09f411e381f885619b32e05fc89cad26bb20824d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 01 三月 2021 14:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'obdserver2/master'
---
src/main/kotlin/com/flightfeather/uav/socket/SocketServerClient.kt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/SocketServerClient.kt b/src/main/kotlin/com/flightfeather/uav/socket/SocketServerClient.kt
index 3baeaa1..80eddb7 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/SocketServerClient.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/SocketServerClient.kt
@@ -6,6 +6,7 @@
import io.netty.channel.nio.NioEventLoopGroup
import io.netty.channel.socket.nio.NioServerSocketChannel
import io.netty.channel.socket.nio.NioSocketChannel
+import io.netty.handler.codec.string.StringDecoder
import io.netty.handler.codec.string.StringEncoder
import java.nio.charset.Charset
@@ -41,7 +42,7 @@
override fun initChannel(p0: NioSocketChannel?) {
p0?.pipeline()
// ?.addLast("decoder", StringDecoder())
- ?.addLast(ObdByteDataDecoder())
+ ?.addLast(UAVByteDataDecoder())
?.addLast("encoder", StringEncoder(Charset.forName("UTF-8")))
?.addLast(ServerHandler())
}
--
Gitblit v1.9.3