From 0d580a2b6e4ac2013ba5cbab046bdabf956b301b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 14 八月 2024 15:18:17 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java b/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
index 2d2c049..1bcb965 100644
--- a/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
+++ b/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
@@ -3,6 +3,7 @@
import java.nio.charset.StandardCharsets;
import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
@@ -10,6 +11,7 @@
import android.util.Log;
import com.example.agvcontroller.Item;
+import com.example.agvcontroller.protocol.AgvAction;
import org.greenrobot.eventbus.EventBus;
@@ -44,19 +46,6 @@
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
// 澶勭悊鎺ユ敹鍒扮殑娑堟伅
ByteBuf byteBuf = (ByteBuf) msg;
- //byte[] data = new byte[byteBuf.readableBytes()];
- //byteBuf.readBytes(data);
- //String received = new String(data, StandardCharsets.UTF_8);
- //System.out.println("Received from client: " + received);
- //
- //// 鍥炲娑堟伅
- ////ByteBuf response = Unpooled.copiedBuffer("Response from server", StandardCharsets.UTF_8);
- ////ctx.writeAndFlush(response);
- //
- //byte[] responseHex = hexStringToByteArray("48656c6c6f20576f726c64"); // "Hello World" in hex
- //ByteBuf response = Unpooled.wrappedBuffer(responseHex);
- //ctx.writeAndFlush(response);
-
try {
while (byteBuf.isReadable()) {
byte[] bytes = new byte[byteBuf.readableBytes()];
@@ -90,16 +79,28 @@
}
public static void sendMessageToClient(String clientId, byte[] message) {
-
Channel channel = channelMap.get(clientId);
if (channel != null && channel.isActive()) {
ByteBuf buf = Unpooled.wrappedBuffer(message);
+ String upperCase = ByteBufUtil.hexDump(buf).toUpperCase();
+ Log.d(TAG, "upperCase " + upperCase);
channel.writeAndFlush(buf);
} else {
Log.d(TAG, "Client " + clientId + " is not connected");
}
+ }
- Log.d(TAG, "Client " + clientId + " is not connected");
+ public static void sendMessageToClient(String clientId, AgvAction<?> action) {
+
+
+
+ Channel channel = channelMap.get(clientId);
+ if (channel != null && channel.isActive()) {
+
+ channel.writeAndFlush(action);
+ } else {
+ Log.d(TAG, "Client " + clientId + " is not connected");
+ }
}
@Override
--
Gitblit v1.9.1