From 1a822a73b6fe7b67fc741e565959ac118e37358c Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期四, 08 八月 2024 13:27:27 +0800 Subject: [PATCH] # --- app/src/main/java/com/example/agvcontroller/Item.java | 17 +++++++- app/src/main/java/com/example/agvcontroller/StartActivity.java | 16 ++++--- app/src/main/AndroidManifest.xml | 2 app/src/main/res/layout/activity_start.xml | 12 ++++-- app/src/main/res/layout/item_view_linear.xml | 32 ++++++++++------ app/src/main/java/com/example/agvcontroller/ItemAdapter.java | 10 +++- 6 files changed, 60 insertions(+), 29 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 65c0326..66ea0d4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ android:theme="@style/Theme.AGVController" tools:targetApi="31" > <activity - android:name=".MainActivity" + android:name=".StartActivity" android:exported="true" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/java/com/example/agvcontroller/Item.java b/app/src/main/java/com/example/agvcontroller/Item.java index 96c9c73..c788dcb 100644 --- a/app/src/main/java/com/example/agvcontroller/Item.java +++ b/app/src/main/java/com/example/agvcontroller/Item.java @@ -1,13 +1,26 @@ package com.example.agvcontroller; public class Item { - private String text; - public Item(String text) { + private String text; + private String ip; + private String agvNo; + + public Item(String text,String ip,String agvNo) { this.text = text; + this.ip = ip; + this.agvNo = agvNo; } public String getText() { return text; } + + public String getIp() { + return ip; + } + + public String getAgvNo() { + return agvNo; + } } diff --git a/app/src/main/java/com/example/agvcontroller/ItemAdapter.java b/app/src/main/java/com/example/agvcontroller/ItemAdapter.java index 7326c19..4860d7c 100644 --- a/app/src/main/java/com/example/agvcontroller/ItemAdapter.java +++ b/app/src/main/java/com/example/agvcontroller/ItemAdapter.java @@ -28,7 +28,9 @@ @Override public void onBindViewHolder(@NonNull ViewHolder holder, int position) { Item item = itemList.get(position); - holder.textView.setText(item.getText()); + holder.ip.setText("璁惧IP锛� " + item.getIp()); + holder.title.setText("璁惧缂栧彿锛� " + item.getText()); + } @Override @@ -37,11 +39,13 @@ } public static class ViewHolder extends RecyclerView.ViewHolder { - TextView textView; + TextView title; + TextView ip; public ViewHolder(@NonNull View itemView) { super(itemView); - textView = itemView.findViewById(R.id.item_title); + title = itemView.findViewById(R.id.item_title); + ip = itemView.findViewById(R.id.item_ip); } } } diff --git a/app/src/main/java/com/example/agvcontroller/StartActivity.java b/app/src/main/java/com/example/agvcontroller/StartActivity.java index 5205f98..53e2600 100644 --- a/app/src/main/java/com/example/agvcontroller/StartActivity.java +++ b/app/src/main/java/com/example/agvcontroller/StartActivity.java @@ -13,20 +13,22 @@ private RecyclerView recyclerView; private List<Item> items; + private ItemAdapter adapter; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_start); - //recyclerView = findViewById(R.id.recyclerView); - //recyclerView.setLayoutManager(new LinearLayoutManager(this)); - // - //items = new ArrayList<>(); - //items.add(new Item("192.168", "Item 1", "Description of Item 1")); - //items.add(new Item("192.168", "Item 2", "Description of Item 2")); - //items.add(new Item("192.168", "Item 3", "Description of Item 3")); + recyclerView = findViewById(R.id.recyclerView); + recyclerView.setLayoutManager(new LinearLayoutManager(this)); + items = new ArrayList<>(); + items.add(new Item("192.168.4.188", "Item 1", "Description of Item 1")); + items.add(new Item("192.168.4.61", "Item 2", "Description of Item 2")); + items.add(new Item("192.168.4.233", "Item 3", "Description of Item 3")); + adapter = new ItemAdapter(items); + recyclerView.setAdapter(adapter); } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml index 2c4a62b..6111186 100644 --- a/app/src/main/res/layout/activity_start.xml +++ b/app/src/main/res/layout/activity_start.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".StartActivity"> - </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recyclerView" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/item_view_linear.xml b/app/src/main/res/layout/item_view_linear.xml index ee56a0c..94489f4 100644 --- a/app/src/main/res/layout/item_view_linear.xml +++ b/app/src/main/res/layout/item_view_linear.xml @@ -1,34 +1,42 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content" + android:padding="10dp" + android:layout_margin="10dp" + android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"> + <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="9" android:orientation="vertical"> + + <TextView + android:id="@+id/item_ip" + android:layout_width="match_parent" + android:layout_height="25dp" + android:text="matnr1" /> + <TextView android:id="@+id/item_title" android:layout_width="match_parent" android:layout_height="25dp" - android:text="matnr"/> - <TextView - android:id="@+id/item_message" - android:layout_width="match_parent" - android:layout_height="25dp" - android:text="matnr"/> + android:text="matnr" /> + + </LinearLayout> - <ImageView - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" /> + </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="#EEE" /> </LinearLayout> \ No newline at end of file -- Gitblit v1.9.1