From c9a3c06b37b5b2eb9b02d4e6348e5c53145284d9 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 16 九月 2019 17:40:20 +0800
Subject: [PATCH] 1. 添加注释 2. 添加粘包分包解码器 3. 修改数据单元信息体获取逻辑 4. 修改接收数据转换后的string列表，展示为16进制数时，小于16的应该在前面补0，否则之后计算会出错
---
src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt b/src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt
index 9dd08db..475a87b 100644
--- a/src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt
+++ b/src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt
@@ -1,11 +1,11 @@
package com.flightfeather.obd.socket
-import com.flightfeather.obd.domain.entity.ObdData
-import com.google.gson.Gson
-import io.netty.channel.ChannelHandler
import io.netty.channel.ChannelHandlerContext
import io.netty.channel.ChannelInboundHandlerAdapter
import io.netty.util.AttributeKey
+import java.lang.StringBuilder
+import java.text.SimpleDateFormat
+import java.util.*
class ServerHandler : ChannelInboundHandlerAdapter() {
@@ -14,6 +14,7 @@
override fun channelRegistered(ctx: ChannelHandlerContext?) {
super.channelRegistered(ctx)
+// ctx?.fireChannelActive()
}
override fun channelActive(ctx: ChannelHandlerContext?) {
@@ -22,16 +23,32 @@
override fun channelRead(ctx: ChannelHandlerContext?, msg: Any?) {
super.channelRead(ctx, msg)
- println("------鏀跺埌鐨勫師濮嬫暟鎹細$msg")
- if (msg is String) {
- MessageManager().dealMsg(msg, ctx)
- }
-// val attribute = ctx?.channel()?.attr(attributeKey)?.apply {
-// if (get() == null) {
-// set(data.obdVin)
-// }
-// }
+ val sb = StringBuilder()
+
+ if (msg is ByteArray) {
+ println("------鏀跺埌鐨勫師濮嬫暟鎹細[ip:${ctx?.channel()?.remoteAddress()}] ${SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Date())}")
+ msg.forEach {
+ var a = 0
+ a = if (it < 0) {
+ it + 256
+ } else {
+ it.toInt()
+ }
+ val s = if (a < 16) {
+ "0${a.toString(16)}"
+ } else {
+ a.toString(16)
+ }
+ print(s)
+ sb.append(s).append(" ")
+ }
+ sb.deleteCharAt(sb.length - 1)
+ }
+ val str = sb.toString()
+ if (str.isNotEmpty()) {
+ MessageManager().dealStringMsg(str, ctx)
+ }
}
--
Gitblit v1.9.3