From 8e6d7c8275117ca2659e7f82051f8af19741aa9d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 07 二月 2025 16:51:33 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/protocol/ProtocolEncoder.java | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 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 9cb2cd5..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,7 +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;
@@ -27,14 +37,18 @@
@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);
} else if (obj instanceof byte[]){
- out.writeBytes((byte[]) obj);
+// out.writeBytes((byte[]) obj);
-
+ out.writeBytes((byte[]) new byte[]{
+ 0x0D, 0x0A
+ });
} else if (obj instanceof AgvAction<?>){
@@ -66,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;
@@ -77,7 +100,7 @@
//String uniqueNo = pac.getHeader().getUniqueNo();
- //byte[] uniquenoBytes = RadixTools.intToBytes(Integer.parseInt(pac.getHeader().getUniqueNo())); // uniqueno
+ byte[] uniquenoBytes = RadixTools.intToBytes(Integer.parseInt(pac.getHeader().getUniqueNo())); // uniqueno
int len = PackagePart.UNIQUENO.getLen() // len
@@ -87,7 +110,7 @@
out.writeByte(pac.getHeader().getStartSymbol()) // symbol
.writeShortLE(len)
- //.writeBytes(Utils.reverse(uniquenoBytes)) // uniqueno
+ .writeBytes(Utils.reverse(uniquenoBytes)) // uniqueno
.writeIntLE((int) (System.currentTimeMillis() / 1000)) // timestamp
.writeByte(pac.getHeader().getProtocolType().getCode()) // type
.writeBytes(bodyBytes) // body
@@ -99,17 +122,40 @@
out.writerIndex(out.readableBytes() - 2);
out.writeShortLE(pac.getValidCode());
+ // 鐢熸垚鏁翠釜鎶ユ枃鐨勫瓧鑺傛暟缁�
+ byte[] buffer = new byte[out.readableBytes()];
+ out.getBytes(out.readerIndex(), buffer);
-
- if (systemProperties.isPrintPacLog()){
- //log.info("Agv [{}] 涓嬭 [{}] >>> {}", uniqueNo, pac.getHeader().getProtocolType().getDes(), ByteBufUtil.hexDump(out).toUpperCase());
- }
-
+ // 灏嗗瓧鑺傛暟缁勮浆鎹负 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