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 fcee239e1..128b2c281 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Product.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Product.java @@ -20,4 +20,8 @@ public class Product { public static int getColumn() { return Math.abs(Prefers.getSize() - 7); } + + public static void bootLive() { + LiveActivity.start(App.activity()); + } } 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 8836060eb..f1e863247 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 @@ -1,6 +1,7 @@ package com.fongmi.android.tv.api; import com.fongmi.android.tv.App; +import com.fongmi.android.tv.Product; import com.fongmi.android.tv.R; import com.fongmi.android.tv.bean.Channel; import com.fongmi.android.tv.bean.Config; @@ -9,7 +10,6 @@ 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.net.Callback; -import com.fongmi.android.tv.ui.activity.LiveActivity; import com.fongmi.android.tv.utils.Json; import com.fongmi.android.tv.utils.Prefers; import com.google.gson.JsonElement; @@ -104,7 +104,7 @@ 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()) App.post(() -> LiveActivity.start(App.activity())); + if (home.isBoot()) App.post(Product::bootLive); } private void parse(Live live) { 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 72527af85..5757b597b 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Product.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Product.java @@ -14,4 +14,7 @@ public class Product { public static int getColumn(Activity activity) { return ResUtil.isPort(activity) ? 3 : 6; } + + public static void bootLive() { + } } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java deleted file mode 100644 index e63c422ad..000000000 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fongmi.android.tv.ui.activity; - -import android.app.Activity; -import android.content.Intent; - -import androidx.viewbinding.ViewBinding; - -import com.fongmi.android.tv.api.LiveConfig; - -public class LiveActivity extends BaseActivity { - - public static void start(Activity activity) { - if (!LiveConfig.isEmpty()) activity.startActivity(new Intent(activity, LiveActivity.class)); - } - - @Override - protected ViewBinding getBinding() { - return null; - } -}