pull/594/head
jhengazuki 4 months ago
parent 3333db1e83
commit 16721cbdf6
  1. 4
      app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
  3. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
  4. 4
      catvod/src/main/java/com/github/catvod/utils/Json.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);
}

@ -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));

@ -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() {

@ -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();

Loading…
Cancel
Save