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/StartActivity.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/StartActivity.java b/app/src/main/java/com/example/agvcontroller/StartActivity.java
index 628ccb8..c6eef62 100644
--- a/app/src/main/java/com/example/agvcontroller/StartActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/StartActivity.java
@@ -27,7 +27,7 @@
public class StartActivity extends AppCompatActivity {
private RecyclerView recyclerView;
- private List<Item> items;
+ private List<AGVCar> items;
private ItemAdapter adapter;
private Button addItem;
private SharedPreferences sharedPreferences;
@@ -48,16 +48,16 @@
}
});
- recyclerView = findViewById(R.id.recyclerView);
- recyclerView.setLayoutManager(new LinearLayoutManager(this));
+
sharedPreferences = getSharedPreferences("AGVControllerPrefs", MODE_PRIVATE);
// Load items from SharedPreferences
items = loadItemsFromSharedPreferences();
- items = new ArrayList<>();
-
+// items = new ArrayList<>();
+ recyclerView = findViewById(R.id.recyclerView);
+ recyclerView.setLayoutManager(new LinearLayoutManager(this));
adapter = new ItemAdapter(items);
recyclerView.setAdapter(adapter);
@@ -84,24 +84,25 @@
socketManager.startServer(8022);
}
- private List<Item> loadItemsFromSharedPreferences() {
+ private List<AGVCar> loadItemsFromSharedPreferences() {
Gson gson = new Gson();
String json = sharedPreferences.getString("items", null);
+ Log.i("SharedPreferences", "Loading items from shared preferences: " + json);
if (json != null) {
- Type type = new TypeToken<List<Item>>(){}.getType();
+ Type type = new TypeToken<List<AGVCar>>(){}.getType();
return gson.fromJson(json, type);
}
return new ArrayList<>();
}
@Subscribe(threadMode = ThreadMode.MAIN)
- public void onDeviceConnected(Item deviceAddress) {
+ public void onDeviceConnected(AGVCar deviceAddress) {
Log.i("EventBus", "Received device connected: " + deviceAddress);
if (!items.isEmpty()) {
int sameIp = 0;
- for (Item item : items) {
+ for (AGVCar item : items) {
if (item.getIp().equals(deviceAddress.getIp())) {
item.setAgvNo(deviceAddress.getAgvNo());
item.setPort(deviceAddress.getPort());
@@ -115,14 +116,14 @@
Log.i("Item",item.getClientId());
}
if (sameIp == 0) {
- items.add(new Item(deviceAddress.getClientId()
+ items.add(new AGVCar(deviceAddress.getClientId()
,deviceAddress.getIp()
,deviceAddress.getPort()
,deviceAddress.getAgvNo()
,deviceAddress.getStatus()));
}
} else {
- items.add(new Item(deviceAddress.getClientId()
+ items.add(new AGVCar(deviceAddress.getClientId()
,deviceAddress.getIp()
,deviceAddress.getPort()
,deviceAddress.getAgvNo()
--
Gitblit v1.9.1