From 16721cbdf61bc03db7ffd3b18ab5ef6b225765fe Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Tue, 2 Sep 2025 19:12:57 +0800
Subject: [PATCH] Fix bug

---
 .../java/com/fongmi/android/tv/api/config/LiveConfig.java     | 4 ++++
 .../main/java/com/fongmi/android/tv/api/config/VodConfig.java | 2 +-
 .../java/com/fongmi/android/tv/ui/activity/HomeActivity.java  | 2 +-
 catvod/src/main/java/com/github/catvod/utils/Json.java        | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java
index c0d4f4a4d..8f19a7462 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java
@@ -78,6 +78,10 @@ public class LiveConfig {
         return get().getHome().isEmpty();
     }
 
+    public static boolean hasUrl() {
+        return getUrl() != null && !getUrl().isEmpty();
+    }
+
     public static void load(Config config, Callback callback) {
         get().clear().config(config).load(callback);
     }
diff --git a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
index 5310c4e65..76e96aeac 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
@@ -156,7 +156,7 @@ public class VodConfig {
             initSite(object);
             initParse(object);
             initOther(object);
-            if (loadLive && object.has("lives")) initLive(object);
+            if (loadLive && !Json.isEmpty(object, "lives")) initLive(object);
             String notice = Json.safeString(object, "notice");
             config.logo(Json.safeString(object, "logo"));
             App.post(() -> callback.success(notice));
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
index 942fb4745..1517a9b0d 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
@@ -142,7 +142,7 @@ public class HomeActivity extends BaseActivity implements NavigationBarView.OnIt
     private void setNavigation() {
         mBinding.navigation.getMenu().findItem(R.id.vod).setVisible(true);
         mBinding.navigation.getMenu().findItem(R.id.setting).setVisible(true);
-        mBinding.navigation.getMenu().findItem(R.id.live).setVisible(!LiveConfig.isEmpty());
+        mBinding.navigation.getMenu().findItem(R.id.live).setVisible(LiveConfig.hasUrl());
     }
 
     private boolean openLive() {
diff --git a/catvod/src/main/java/com/github/catvod/utils/Json.java b/catvod/src/main/java/com/github/catvod/utils/Json.java
index d2728fc40..961a51955 100644
--- a/catvod/src/main/java/com/github/catvod/utils/Json.java
+++ b/catvod/src/main/java/com/github/catvod/utils/Json.java
@@ -44,6 +44,10 @@ public class Json {
         }
     }
 
+    public static boolean isEmpty(JsonObject obj, String key) {
+        return !obj.has(key) || !obj.get(key).isJsonArray() || obj.get(key).getAsJsonArray().isEmpty();
+    }
+
     public static String safeString(JsonObject obj, String key) {
         try {
             return obj.getAsJsonPrimitive(key).getAsString().trim();