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" />
+
+
+
+
+
\ 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" />
+
+
+
+
+
+
+
+
+
+
+