From 318bd727e2fe02e4f541dfe943f77606af41d509 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 06 二月 2025 14:30:11 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java b/app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java
index 15f2a0a..9231846 100644
--- a/app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java
+++ b/app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java
@@ -1,8 +1,17 @@
package com.example.agvcontroller.protocol;
+import static com.example.agvcontroller.utils.DateUtils.formatDate;
+
+import android.util.Log;
+
+import com.example.agvcontroller.AGVApplication;
import com.example.agvcontroller.socket.RadixTools;
+import org.greenrobot.eventbus.EventBus;
+
+import java.net.InetSocketAddress;
+import java.util.Date;
import java.util.logging.Logger;
import io.netty.buffer.ByteBuf;
@@ -28,6 +37,8 @@
@Override
protected void encode(ChannelHandlerContext ctx, Object obj, ByteBuf out) {
+ InetSocketAddress remoteAddress = (InetSocketAddress) ctx.channel().remoteAddress();
+ String ip = remoteAddress.getAddress().getHostAddress();
if (obj instanceof ByteBuf){
out.writeBytes((ByteBuf) obj);
@@ -69,7 +80,16 @@
out.writerIndex(out.readableBytes() - 2);
out.writeShortLE(validCode);
+ // 鐢熸垚鏁翠釜鎶ユ枃鐨勫瓧鑺傛暟缁�
+ byte[] buffer = new byte[out.readableBytes()];
+ out.getBytes(out.readerIndex(), buffer);
+ // 灏嗗瓧鑺傛暟缁勮浆鎹负 16 杩涘埗瀛楃涓�
+ String hexMessage = bytesToHex(buffer);
+ String log = formatDate(new Date(), "yyyy-MM-dd HH:mm:ss") + " 涓嬭: " + ip + "[" + action.getHandleCmdType().getDesc() + "]>>>" + hexMessage;
+ Log.d("updown", log);
+ AGVApplication.addLog(log);
+// EventBus.getDefault().post(log);
} else if (obj instanceof AgvPackage){
AgvPackage pac = (AgvPackage)obj;
@@ -102,12 +122,40 @@
out.writerIndex(out.readableBytes() - 2);
out.writeShortLE(pac.getValidCode());
+ // 鐢熸垚鏁翠釜鎶ユ枃鐨勫瓧鑺傛暟缁�
+ byte[] buffer = new byte[out.readableBytes()];
+ out.getBytes(out.readerIndex(), buffer);
+ // 灏嗗瓧鑺傛暟缁勮浆鎹负 16 杩涘埗瀛楃涓�
+ String hexMessage = bytesToHex(buffer);
+ String log = formatDate(new Date(), "yyyy-MM-dd HH:mm:ss") + " 涓嬭: " + ip + "[" + pac.getHeader().getProtocolType().getDes() + "]>>>" + hexMessage;
+ Log.d("updown", log);
+ AGVApplication.addLog(log);
+// EventBus.getDefault().post(log);
}
}
+ private String bytesToHex(byte[] bytes) {
+ StringBuilder sb = new StringBuilder();
+ for (byte b : bytes) {
+ sb.append(String.format("%02X", b));
+ }
+ return sb.toString();
+ }
+
+ // 灏嗗崄鍏繘鍒跺瓧绗︿覆杞崲涓哄瓧鑺傛暟缁�
+ private byte[] hexStringToByteArray(String s) {
+ int len = s.length();
+ byte[] data = new byte[len / 2];
+ for (int i = 0; i < len; i += 2) {
+ data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+ + Character.digit(s.charAt(i+1), 16));
+ }
+ return data;
+ }
+
// EE | 11 00 | 01 00 00 00 | 0C AB 12 64 | F0 | 01 00 | 01 01 | 00 00 00 00 | 4C F7
// # | len | uniqueno | timestamp | cmd | content | crc
--
Gitblit v1.9.1