From 00fd3eb5037f07763d4e8d3e5729066d3dc097ea Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 14:47:43 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 a33faad..81dd64f 100644
--- a/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
+++ b/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
@@ -14,7 +14,10 @@
import com.example.agvcontroller.action.AGV_11_UP;
import com.example.agvcontroller.action.AckMsgBuilder;
import com.example.agvcontroller.met.AbstractInboundHandler;
+import com.example.agvcontroller.protocol.AGV_12_UP;
+import com.example.agvcontroller.protocol.AGV_13_UP;
import com.example.agvcontroller.protocol.AGV_A1_DOWN;
+import com.example.agvcontroller.protocol.AGV_F0_UP;
import com.example.agvcontroller.protocol.AgvAction;
import com.example.agvcontroller.protocol.AgvPackage;
import com.example.agvcontroller.protocol.ProtocolType;
@@ -32,10 +35,10 @@
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
- String clientId = ctx.channel().remoteAddress().toString();
- channelMap.put(clientId, ctx.channel());
- EventBus.getDefault().post(new Item("1",clientId,"3"));
- Log.d(TAG, "Client connected: " + clientId);
+// String clientId = ctx.channel().remoteAddress().toString();
+// channelMap.put(clientId, ctx.channel());
+// EventBus.getDefault().post(new Item("",clientId,"3"));
+// Log.d(TAG, "Client connected: " + clientId);
}
@Override
@@ -66,33 +69,42 @@
@Override
protected boolean channelRead0(ChannelHandlerContext ctx, AgvPackage pac) throws Exception {
-
+ String clientId = ctx.channel().remoteAddress().toString();
+ Log.i("clientId--->",clientId);
+ Log.i("substring",pac.toString());
String serialNum = pac.getBody().getMessageBody().getSerialNo();
Log.i("substring",serialNum);
MainActivity.map.put(serialNum, Boolean.TRUE);
// ack
ProtocolType ackType = isNeedAck(pac);
final String uniqueNo = pac.getHeader().getUniqueNo();
+ String agvNo;
label : switch (pac.getHeader().getProtocolType()){
case ACTION_COMPLETE: // 鍔ㄤ綔瀹屾垚鏁版嵁鍖�
-
-
AGV_11_UP agv_11_up = (AGV_11_UP) pac.getBody().getMessageBody();
// redis.push(RedisConstant.AGV_COMPLETE_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_11_up));
-
// 鍔ㄤ綔瀹屾垚搴旂瓟
if (null != ackType) {
AgvPackage ackPac = AckMsgBuilder.ofSuccess(pac, ackType);
-
AGV_A1_DOWN agv_a1_down = (AGV_A1_DOWN) ackPac.getBody().getMessageBody();
agv_a1_down.setAckSign((byte) agv_11_up.getCompleteCode());
-
ctx.writeAndFlush(ackPac);
}
-
-
-
break label;
+ case DATA_CODE_REPORT:
+ AGV_12_UP agv_12_up = (AGV_12_UP) pac.getBody().getMessageBody();
+ agvNo = pac.getHeader().getUniqueNo();
+ EventBus.getDefault().post(new Item("",clientId,agvNo));
+ break label;
+ case DATA_WITHOUT_CODE_REPORT:
+ AGV_13_UP agv_13_up = (AGV_13_UP) pac.getBody().getMessageBody();
+ break label;
+ case LOGIN_REPORT:
+ AGV_F0_UP agv_f0_up = (AGV_F0_UP) pac.getBody().getMessageBody();
+ agvNo = pac.getHeader().getUniqueNo();
+ EventBus.getDefault().post(new Item("",clientId,agvNo));
+ break label;
+
}
return false;
}
--
Gitblit v1.9.1