From 7c97c54ec8064c52627c49fe32a3880f31712df4 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 09 一月 2025 10:38:03 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/MainActivity.java | 3 ++-
app/src/main/java/com/example/agvcontroller/StartActivity.java | 3 ++-
app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java | 7 +++++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/MainActivity.java b/app/src/main/java/com/example/agvcontroller/MainActivity.java
index 3fb66dc..eda4c32 100644
--- a/app/src/main/java/com/example/agvcontroller/MainActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/MainActivity.java
@@ -327,7 +327,8 @@
Intent intent = getIntent();
- clientId = intent.getStringExtra("message");
+ clientId = intent.getStringExtra("ip");
+ AgvNo = intent.getStringExtra("agvNo");
Log.i("message1",clientId);
// 鍓嶆嫧鏉嗕几鍑�
diff --git a/app/src/main/java/com/example/agvcontroller/StartActivity.java b/app/src/main/java/com/example/agvcontroller/StartActivity.java
index e2b4401..d8d5a29 100644
--- a/app/src/main/java/com/example/agvcontroller/StartActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/StartActivity.java
@@ -47,7 +47,8 @@
public void onItemClick(View view, int position) {
Context context = view.getContext();
Intent intent = new Intent(context,MainActivity.class);
- intent.putExtra("message", items.get(position).getIp());
+ intent.putExtra("ip", items.get(position).getIp());
+ intent.putExtra("agvNo", items.get(position).getAgvNo());
startActivityForResult(intent,1);
}
});
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 81dd64f..921875a 100644
--- a/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
+++ b/app/src/main/java/com/example/agvcontroller/socket/NettyServerHandler.java
@@ -17,6 +17,7 @@
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_DOWN;
import com.example.agvcontroller.protocol.AGV_F0_UP;
import com.example.agvcontroller.protocol.AgvAction;
import com.example.agvcontroller.protocol.AgvPackage;
@@ -94,6 +95,7 @@
case DATA_CODE_REPORT:
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,agvNo));
break label;
case DATA_WITHOUT_CODE_REPORT:
@@ -101,7 +103,12 @@
break label;
case LOGIN_REPORT:
AGV_F0_UP agv_f0_up = (AGV_F0_UP) pac.getBody().getMessageBody();
+ if (null != ackType) {
+ AgvPackage ackPac = AckMsgBuilder.ofSuccess(pac, ackType);
+ ctx.writeAndFlush(ackPac);
+ }
agvNo = pac.getHeader().getUniqueNo();
+ channelMap.put(clientId, ctx.channel());
EventBus.getDefault().post(new Item("",clientId,agvNo));
break label;
--
Gitblit v1.9.1