From f5b51be49280e1ee4b5d29dd459c1784360fb74f Mon Sep 17 00:00:00 2001
From: wenfei <hwf452@163.com>
Date: Fri, 30 Jan 2026 17:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   3 +
 .../ui/activity/DeviceAlarmInfoActivity.kt    |   4 +-
 .../activity/DeviceOnlineStatusActivity.java  |   9 ++
 .../DeviceOnlineStatusListActivity.kt         |  28 +++++
 .../activity_device_online_status_list.xml    | 102 ++++++++++++++++++
 5 files changed, 144 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt
 create mode 100644 app/src/main/res/layout/activity_device_online_status_list.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a134ed..b7f158e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -452,6 +452,9 @@
         <activity
             android:name=".ui.activity.DeviceEntryActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activity.DeviceOnlineStatusListActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.DeviceOnlineStatusActivity"
             android:screenOrientation="portrait" />
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt
index d990028..aa909e2 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfoActivity.kt
@@ -27,8 +27,8 @@ import com.yolanda.nohttp.rest.Response
 
 /**
  * Create By HuangWenFei
- * 创建日期：2024-04-02 14:34
- * 描述：每日作业风险清单
+ * 创建日期：2026-01-20 14:34
+ * 描述：设备预警信息
  */
 class DeviceAlarmInfoActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceAlarmInfofoBinding>() {
 
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusActivity.java
index 427472d..67380e3 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusActivity.java
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusActivity.java
@@ -3,6 +3,7 @@ package com.rehome.zhdcoa.ui.activity;
 import static com.rehome.zhdcoa.utils.GsonUtils.GsonToBean;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -62,6 +63,14 @@ public class DeviceOnlineStatusActivity extends BaseActivityOaToolbarViewBinding
                 authenticationLoginDeviceAlarmInfoRsa();
             }
         });
+        binding.tvMore.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(DeviceOnlineStatusActivity.this, DeviceOnlineStatusListActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                startActivity(intent);
+            }
+        });
         //binding.basdLl.setBackgroundColor(Color.argb(178, 0, 45, 85));
         //binding.circularProgressBar.setCustomAngle(0);
         //0, 45, 85, 0.7
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt
new file mode 100644
index 0000000..adf060c
--- /dev/null
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceOnlineStatusListActivity.kt
@@ -0,0 +1,28 @@
+package com.rehome.zhdcoa.ui.activity
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.rehome.zhdcoa.R
+import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
+import com.rehome.zhdcoa.databinding.ActivityDeviceOnlineStatusListBinding
+import com.rehome.zhdcoa.weiget.OAToolbar
+
+class DeviceOnlineStatusListActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceOnlineStatusListBinding>() {
+    override fun getViewBinding() = ActivityDeviceOnlineStatusListBinding.inflate(layoutInflater)
+
+    override fun getToolbar() = binding.toolbarView.toolbar
+
+    override fun initView() {
+        initToolbar("监测设备在线情况", "",{
+
+        })
+
+    }
+
+    override fun initData() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_device_online_status_list.xml b/app/src/main/res/layout/activity_device_online_status_list.xml
new file mode 100644
index 0000000..a7b2d82
--- /dev/null
+++ b/app/src/main/res/layout/activity_device_online_status_list.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="#E7F1F7"
+    tools:context=".ui.activity.DeviceOnlineStatusListActivity">
+
+    <include
+        android:id="@+id/toolbarView"
+        layout="@layout/layout_base" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10px"
+        android:layout_marginLeft="10px"
+        android:layout_marginRight="10px"
+        android:layout_marginTop="10px">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/tv_sysit"
+                android:padding="3dp"
+                android:textColor="#333333"
+                android:layout_gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:text="专业：" />
+            <Spinner
+                android:id="@+id/sp_zy"
+                style="@style/editTextTheme"
+                android:layout_width="match_parent"
+                android:layout_height="70px"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:padding="0px"
+                android:textSize="@dimen/px_30" />
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1">
+
+            <EditText
+                android:id="@+id/et_key"
+                style="@style/editTextTheme"
+                android:textSize="14sp"
+                android:layout_width="match_parent"
+                android:layout_weight="1"
+                android:hint="请转入关键字" />
+        </RelativeLayout>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="10dp">
+
+        <Button
+            android:id="@+id/btn_query"
+            style="@style/button"
+            android:layout_marginEnd="10dp"
+            android:layout_weight="1"
+            android:textSize="18sp"
+            android:text="查询" />
+
+    </LinearLayout>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="5dp"
+        android:layout_weight="1">
+
+        <com.rehome.zhdcoa.weiget.LoadListView
+            android:id="@+id/lv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:divider="#00000000"
+            android:dividerHeight="5dp"/>
+
+        <TextView
+            android:id="@+id/tv_nodata"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:textColor="@color/viewfinder_mask"
+            android:gravity="center"
+            android:text="暂无数据"/>
+
+    </FrameLayout>
+</LinearLayout>
\ No newline at end of file