From 614a0d591d668c3bbb79b8a7ea982350c1e5d25e Mon Sep 17 00:00:00 2001
From: acite <1498045907@qq.com>
Date: Wed, 1 Oct 2025 02:07:19 +0800
Subject: [PATCH] [fix] Playlist load logic

---
 .../main/java/com/acitelight/aether/view/pages/HomeScreen.kt    | 2 +-
 .../acitelight/aether/viewModel/TransmissionScreenViewModel.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/acitelight/aether/view/pages/HomeScreen.kt b/app/src/main/java/com/acitelight/aether/view/pages/HomeScreen.kt
index f742b03..16261b4 100644
--- a/app/src/main/java/com/acitelight/aether/view/pages/HomeScreen.kt
+++ b/app/src/main/java/com/acitelight/aether/view/pages/HomeScreen.kt
@@ -88,7 +88,7 @@ fun HomeScreen(
                                 .flatten()
 
                             val group =
-                                fv.filter { it.klass == i.klass && it.video.group == i.video.group }
+                                fv.filter { it.klass == i.klass && it.video.group == i.video.group && it.video.group != "null" }
                             for (i in group) {
                                 playList.add("${i.klass}/${i.id}")
                             }
diff --git a/app/src/main/java/com/acitelight/aether/viewModel/TransmissionScreenViewModel.kt b/app/src/main/java/com/acitelight/aether/viewModel/TransmissionScreenViewModel.kt
index 0d0491c..c11e45a 100644
--- a/app/src/main/java/com/acitelight/aether/viewModel/TransmissionScreenViewModel.kt
+++ b/app/src/main/java/com/acitelight/aether/viewModel/TransmissionScreenViewModel.kt
@@ -261,7 +261,7 @@ class TransmissionScreenViewModel @Inject constructor(
         val video = fv.firstOrNull { it.klass == model.klass && it.id == model.vid }
 
         if (video != null) {
-            val group = fv.filter { it.klass == video.klass && it.video.group == video.video.group }
+            val group = fv.filter { it.klass == video.klass && it.video.group == video.video.group && it.video.group != "null" }
             for (i in group.sortedWith(compareBy(naturalOrder()) { it.video.name })) {
                 playList.add("${i.klass}/${i.id}")
             }