diff --git a/app/src/leanback/java/com/fongmi/android/tv/Product.java b/app/src/leanback/java/com/fongmi/android/tv/Product.java index bc622e4ab..be6f5ecaf 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Product.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Product.java @@ -20,10 +20,6 @@ public class Product { return getColumn(); } - public static void bootLive() { - LiveActivity.start(App.activity()); - } - public static int[] getSpec(Vod.Style style) { int column = getColumn(style); int space = ResUtil.dp2px(48) + ResUtil.dp2px(16 * (column - 1)); diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java index eaa22651c..5098b05b4 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java @@ -3,7 +3,6 @@ package com.fongmi.android.tv.api; import android.text.TextUtils; import com.fongmi.android.tv.App; -import com.fongmi.android.tv.Product; import com.fongmi.android.tv.R; import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.bean.Channel; @@ -14,6 +13,7 @@ import com.fongmi.android.tv.bean.Keep; import com.fongmi.android.tv.bean.Live; import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.impl.Callback; +import com.fongmi.android.tv.ui.activity.LiveActivity; import com.fongmi.android.tv.utils.Notify; import com.github.catvod.utils.Json; import com.google.gson.JsonElement; @@ -141,10 +141,15 @@ public class LiveConfig { if (!object.has("lives")) return; for (JsonElement element : Json.safeListElement(object, "lives")) parse(Live.objectFrom(element).check()); if (home == null) setHome(lives.isEmpty() ? new Live() : lives.get(0)); - if (home.isBoot() || Setting.isBootLive()) App.post(Product::bootLive); + if (home.isBoot() || Setting.isBootLive()) App.post(this::bootLive); if (callback != null) App.post(callback::success); } + private void bootLive() { + LiveActivity.start(App.activity()); + Setting.putBootLive(false); + } + public void parse(JsonObject object) { parseConfig(object, null); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/Product.java b/app/src/mobile/java/com/fongmi/android/tv/Product.java index 5aaab5b9b..cbe207918 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Product.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Product.java @@ -3,7 +3,6 @@ package com.fongmi.android.tv; import android.content.Context; import com.fongmi.android.tv.bean.Vod; -import com.fongmi.android.tv.ui.activity.LiveActivity; import com.fongmi.android.tv.utils.ResUtil; public class Product { @@ -20,10 +19,6 @@ public class Product { return style.isLand() ? getColumn() - 1 : getColumn(); } - public static void bootLive() { - LiveActivity.start(App.activity()); - } - public static int[] getSpec(Context context) { return getSpec(context, Vod.Style.rect()); }