From 9c414520fd00319683a0021bb512f5003aff2800 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 21 一月 2025 14:40:53 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 6496e59..28297aa 100644
--- a/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
+++ b/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
@@ -13,7 +13,7 @@
import android.os.Message;
import android.util.Log;
-import com.example.agvcontroller.Item;
+import com.example.agvcontroller.AGVCar;
import com.example.agvcontroller.MainActivity;
import com.example.agvcontroller.action.AGV_11_UP;
import com.example.agvcontroller.action.AckMsgBuilder;
@@ -23,7 +23,6 @@
import com.example.agvcontroller.protocol.AGV_A1_DOWN;
import com.example.agvcontroller.protocol.AGV_F0_DOWN;
import com.example.agvcontroller.protocol.AGV_F0_UP;
-import com.example.agvcontroller.protocol.AGV_F0_UP8;
import com.example.agvcontroller.protocol.AgvAction;
import com.example.agvcontroller.protocol.AgvPackage;
import com.example.agvcontroller.protocol.ProtocolType;
@@ -58,7 +57,7 @@
String ip = remoteAddress.getAddress().getHostAddress();
int port = remoteAddress.getPort();
channelMap.put(clientId, ctx.channel());
- EventBus.getDefault().post(new Item(clientId,ip,port,"--",0));
+ EventBus.getDefault().post(new AGVCar(clientId,ip,port,"--",0));
Log.d(TAG, "Client connected: " + clientId);
// 鍙栨秷寤惰繜鍒犻櫎鎿嶄綔
@@ -150,13 +149,13 @@
AGV_12_UP agv_12_up = (AGV_12_UP) pac.getBody().getMessageBody();
agvNo = pac.getHeader().getUniqueNo();
channelMap.put(clientId, ctx.channel());
- EventBus.getDefault().post(new Item(clientId,ip,port,agvNo,1));
+ EventBus.getDefault().post(new AGVCar(clientId,ip,port,agvNo,1));
break label;
case DATA_WITHOUT_CODE_REPORT:
AGV_13_UP agv_13_up = (AGV_13_UP) pac.getBody().getMessageBody();
agvNo = pac.getHeader().getUniqueNo();
channelMap.put(clientId, ctx.channel());
- EventBus.getDefault().post(new Item(clientId,ip,port,agvNo,1));
+ EventBus.getDefault().post(new AGVCar(clientId,ip,port,agvNo,1));
break label;
case LOGIN_REPORT:
AGV_F0_UP agv_f0_up = (AGV_F0_UP) pac.getBody().getMessageBody();
@@ -167,7 +166,7 @@
}
agvNo = pac.getHeader().getUniqueNo();
channelMap.put(clientId, ctx.channel());
- EventBus.getDefault().post(new Item(clientId,ip,port,agvNo,1));
+ EventBus.getDefault().post(new AGVCar(clientId,ip,port,agvNo,1));
break label;
}
--
Gitblit v1.9.1