From 6f1275502e0d7be1b919f9d6eb308436cc8958fa Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 一月 2025 09:22:01 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/StartActivity.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/StartActivity.java b/app/src/main/java/com/example/agvcontroller/StartActivity.java
index ebc0cdf..d8d5a29 100644
--- a/app/src/main/java/com/example/agvcontroller/StartActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/StartActivity.java
@@ -47,22 +47,33 @@
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);
}
});
socketManager = new SocketManager();
- socketManager.startServer(8024);
+ socketManager.startServer(8022);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onDeviceConnected(Item deviceAddress) {
Log.i("EventBus", "Received device connected: " + deviceAddress);
- items.add(new Item("1",deviceAddress.getIp(),"3"));
+
+
if (items.size() > 0) {
+ int sameIp = 0;
for (Item item : items) {
+ if (item.getIp().equals(deviceAddress.getIp())) {
+ sameIp++;
+ }
Log.i("Item",item.getIp());
}
+ if (sameIp == 0) {
+ items.add(new Item(deviceAddress.getText(),deviceAddress.getIp(),deviceAddress.getAgvNo()));
+ }
+ } else {
+ items.add(new Item(deviceAddress.getText(),deviceAddress.getIp(),deviceAddress.getAgvNo()));
}
adapter.notifyDataSetChanged();
}
--
Gitblit v1.9.1