From ab0dd2fbf65f32833cc57f06258bc00bd9de445e Mon Sep 17 00:00:00 2001
From: maxinyu <maxinyu@chengkong.com>
Date: Tue, 14 Jul 2026 17:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../liveVideo/AlarmLogActivity.kt             | 28 ++++++++++------
 .../liveVideo/LiveVideoActivity.kt            | 21 ++++++++++++
 .../main/res/layout/alarm_log_activity.xml    | 18 +++++++++-
 .../main/res/layout/live_video_activity.xml   | 33 +++++++++++++++++++
 4 files changed, 89 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt
index 1f1dd6c..89dace3 100644
--- a/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt
@@ -184,6 +184,7 @@ class AlarmLogActivity : AppCompatActivity() {
 
             } catch (e: Exception) {
                 Log.e("AlarmLogActivity", "请求异常: ${e.message}", e)
+                showAlarmListNetworkError()
             } finally {
                 isLoading = false
                 Log.d("AlarmLogActivity", "请求结束")
@@ -191,14 +192,22 @@ class AlarmLogActivity : AppCompatActivity() {
         }
     }
 
-    private fun showEmptyView() {
-        binding.alarmListRecyclerView.visibility = View.GONE
-        binding.emptyLayout.visibility = View.VISIBLE
+    private fun updateAlarmListState() {
+        if (alarmList.isEmpty()) {
+            binding.alarmListRecyclerView.visibility = View.GONE
+            binding.layoutNoPermission.visibility = View.VISIBLE
+            binding.layoutNoNetwork.visibility = View.GONE
+        } else {
+            binding.alarmListRecyclerView.visibility = View.VISIBLE
+            binding.layoutNoPermission.visibility = View.GONE
+            binding.layoutNoNetwork.visibility = View.GONE
+        }
     }
 
-    private fun hideEmptyView() {
-        binding.alarmListRecyclerView.visibility = View.VISIBLE
-        binding.emptyLayout.visibility = View.GONE
+    private fun showAlarmListNetworkError() {
+        binding.alarmListRecyclerView.visibility = View.GONE
+        binding.layoutNoPermission.visibility = View.GONE
+        binding.layoutNoNetwork.visibility = View.VISIBLE
     }
 
     private fun filterAlarmListByDate(selectedDate: Calendar) {
@@ -214,14 +223,13 @@ class AlarmLogActivity : AppCompatActivity() {
         }
         adapter?.notifyDataSetChanged()
         Log.d("AlarmLogActivity", "日期筛选完成，筛选后条数: ${alarmList.size}")
-        
+
         if (alarmList.isEmpty()) {
-            showEmptyView()
             currentAlarmItem = null
         } else {
-            hideEmptyView()
             currentAlarmItem = alarmList.firstOrNull()
         }
+        updateAlarmListState()
     }
 
     private fun updateDateDisplay() {
@@ -407,7 +415,7 @@ class AlarmLogActivity : AppCompatActivity() {
                     adapter?.notifyDataSetChanged()
                     currentAlarmItem = alarmList.firstOrNull()
                     if (alarmList.isEmpty()) {
-                        showEmptyView()
+                        showAlarmListNetworkError()
                     }
                 } else {
                     Toast.makeText(this@AlarmLogActivity, response.msg, Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt
index 926c9fc..e3b195f 100644
--- a/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/LiveVideoActivity.kt
@@ -423,14 +423,35 @@ class LiveVideoActivity : BaseActivity() {
                 }
                 alarmList.addAll(newData)
                 alarmAdapter?.notifyDataSetChanged()
+                updateAlarmListState()
             } catch (e: Exception) {
+                Log.e("LiveVideoActivity", "请求告警列表失败", e)
                 hasMore = false
+                showAlarmListNetworkError()
             } finally {
                 isLoading = false
             }
         }
     }
 
+    private fun updateAlarmListState() {
+        if (alarmList.isEmpty()) {
+            binding.alarmLogRecyclerView.visibility = View.GONE
+            binding.layoutNoPermission.visibility = View.VISIBLE
+            binding.layoutNoNetwork.visibility = View.GONE
+        } else {
+            binding.alarmLogRecyclerView.visibility = View.VISIBLE
+            binding.layoutNoPermission.visibility = View.GONE
+            binding.layoutNoNetwork.visibility = View.GONE
+        }
+    }
+
+    private fun showAlarmListNetworkError() {
+        binding.alarmLogRecyclerView.visibility = View.GONE
+        binding.layoutNoPermission.visibility = View.GONE
+        binding.layoutNoNetwork.visibility = View.VISIBLE
+    }
+
     override fun onResume() {
         super.onResume()
         binding.exoPlayContextId.onVideoResume()
diff --git a/app/src/main/res/layout/alarm_log_activity.xml b/app/src/main/res/layout/alarm_log_activity.xml
index feb4fe3..a45f9e0 100644
--- a/app/src/main/res/layout/alarm_log_activity.xml
+++ b/app/src/main/res/layout/alarm_log_activity.xml
@@ -102,7 +102,7 @@
         android:background="#FFFFFF" />
 
     <LinearLayout
-        android:id="@+id/emptyLayout"
+        android:id="@+id/layoutNoPermission"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -116,6 +116,22 @@
             android:layout_height="wrap_content"
             android:src="@drawable/no_message" />
     </LinearLayout>
+    <LinearLayout
+        android:id="@+id/layoutNoNetwork"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:background="#FFFFFF"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/no_network_img_name" />
+
+    </LinearLayout>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/live_video_activity.xml b/app/src/main/res/layout/live_video_activity.xml
index 8f31c08..44f9075 100644
--- a/app/src/main/res/layout/live_video_activity.xml
+++ b/app/src/main/res/layout/live_video_activity.xml
@@ -252,6 +252,39 @@
                 android:background="#FFFFFF"
                 android:paddingTop="8dp" />
 
+            <LinearLayout
+                android:id="@+id/layoutNoPermission"
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:paddingHorizontal="32dp"
+                android:background="@color/white"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="244dp"
+                    android:layout_height="131dp"
+                    android:src="@mipmap/no_message" />
+
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/layoutNoNetwork"
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:paddingHorizontal="32dp"
+                android:background="@color/white"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="244dp"
+                    android:layout_height="131dp"
+                    android:src="@mipmap/no_network_img_name" />
+
+            </LinearLayout>
+
 
         </LinearLayout>