From 939b5236eb4ca25b42d363fef134cd3adce2992c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 09 八月 2024 12:55:04 +0800
Subject: [PATCH] #
---
app/src/main/java/com/example/agvcontroller/StartActivity.java | 5 +++++
app/src/main/java/com/example/agvcontroller/ItemAdapter.java | 43 ++++++++++++++++++++++++-------------------
2 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/example/agvcontroller/ItemAdapter.java b/app/src/main/java/com/example/agvcontroller/ItemAdapter.java
index da01989..513356f 100644
--- a/app/src/main/java/com/example/agvcontroller/ItemAdapter.java
+++ b/app/src/main/java/com/example/agvcontroller/ItemAdapter.java
@@ -31,11 +31,12 @@
@Override
public int getItemViewType(int position) {
- if (itemList == null || itemList.isEmpty()) {
- return R.layout.item_layout;
- } else {
- return R.layout.item_view_linear;
- }
+ return R.layout.item_view_linear;
+ //if (itemList == null || itemList.isEmpty()) {
+ // return R.layout.item_layout;
+ //} else {
+ // return R.layout.item_view_linear;
+ //}
}
@NonNull
@Override
@@ -46,24 +47,28 @@
@Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
- if (itemList == null || itemList.isEmpty()) {
- // 榛樿鏄剧ず椤甸潰
- //return 1;
- } else {
- // 鏁版嵁鏄剧ず椤甸潰
- Item item = itemList.get(position);
- holder.ip.setText("璁惧IP锛� " + item.getIp());
- holder.title.setText("璁惧缂栧彿锛� " + item.getText());
- }
+ Item item = itemList.get(position);
+ holder.ip.setText("璁惧IP锛� " + item.getIp());
+ holder.title.setText("璁惧缂栧彿锛� " + item.getText());
+ //if (itemList == null || itemList.isEmpty()) {
+ // // 榛樿鏄剧ず椤甸潰
+ // //return 1;
+ //} else {
+ // // 鏁版嵁鏄剧ず椤甸潰
+ // Item item = itemList.get(position);
+ // holder.ip.setText("璁惧IP锛� " + item.getIp());
+ // holder.title.setText("璁惧缂栧彿锛� " + item.getText());
+ //}
}
@Override
public int getItemCount() {
- if (itemList == null || itemList.isEmpty()) {
- return 1;
- } else {
- return itemList.size();
- }
+ return itemList.size();
+ //if (itemList == null || itemList.isEmpty()) {
+ // return 1;
+ //} else {
+ // return itemList.size();
+ //}
}
public void addItem (Item item) {
diff --git a/app/src/main/java/com/example/agvcontroller/StartActivity.java b/app/src/main/java/com/example/agvcontroller/StartActivity.java
index 9b18685..0a37be5 100644
--- a/app/src/main/java/com/example/agvcontroller/StartActivity.java
+++ b/app/src/main/java/com/example/agvcontroller/StartActivity.java
@@ -6,6 +6,8 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import com.example.agvcontroller.socket.SocketManager;
+
import java.util.ArrayList;
import java.util.List;
@@ -14,11 +16,14 @@
private RecyclerView recyclerView;
private List<Item> items;
private ItemAdapter adapter;
+ SocketManager socketManager;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_start);
+ socketManager = new SocketManager();
+ socketManager.startServer(8080);
recyclerView = findViewById(R.id.recyclerView);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
--
Gitblit v1.9.1