diff --git a/app/build.gradle b/app/build.gradle index ccab43d5c..cb8bf919e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,12 +22,12 @@ android { leanback { dimension "mode" versionCode 73 - versionName "1.7.3" + versionName "20230421#1" } mobile { dimension "mode" versionCode 11 - versionName "20230420#2" + versionName "20230421#1" } java { dimension "api" diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 7ab5ee741..080beae61 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -27,6 +27,7 @@ import com.fongmi.android.tv.bean.Epg; import com.fongmi.android.tv.bean.Group; import com.fongmi.android.tv.bean.Keep; import com.fongmi.android.tv.bean.Live; +import com.fongmi.android.tv.bean.Track; import com.fongmi.android.tv.databinding.ActivityLiveBinding; import com.fongmi.android.tv.event.ErrorEvent; import com.fongmi.android.tv.event.PlayerEvent; diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java index a2752b5f3..9466c5ee5 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java @@ -20,8 +20,8 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment; public class PassDialog extends BaseDialog { - private final PassCallback callback; private DialogPassBinding binding; + private PassCallback callback; public static PassDialog create() { return new PassDialog(); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java index 333a4195e..6ea88173e 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java @@ -51,7 +51,7 @@ public class SiteDialog implements SitePresenter.OnClickListener { public SiteDialog all() { this.presenter.search(true); this.presenter.change(true); - this.width = 0.5f; + this.width = 0.45f; return this; } @@ -71,7 +71,7 @@ public class SiteDialog implements SitePresenter.OnClickListener { if (adapter.size() == 0) return; WindowManager.LayoutParams params = dialog.getWindow().getAttributes(); params.width = (int) (ResUtil.getScreenWidth() * width); - params.height = (int) (ResUtil.getScreenHeight() * 0.745f); + params.height = (int) (ResUtil.getScreenHeight() * 0.736f); dialog.getWindow().setAttributes(params); dialog.getWindow().setDimAmount(0); dialog.show(); diff --git a/app/src/leanback/res/layout/adapter_live.xml b/app/src/leanback/res/layout/adapter_live.xml index b9d4a90c6..8f27aa437 100644 --- a/app/src/leanback/res/layout/adapter_live.xml +++ b/app/src/leanback/res/layout/adapter_live.xml @@ -3,9 +3,9 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/text" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="40dp" android:background="@drawable/selector_text" - android:ellipsize="middle" + android:ellipsize="marquee" android:focusable="true" android:focusableInTouchMode="true" android:gravity="center" diff --git a/app/src/leanback/res/layout/adapter_site.xml b/app/src/leanback/res/layout/adapter_site.xml index 37bd85e6b..003fab19e 100644 --- a/app/src/leanback/res/layout/adapter_site.xml +++ b/app/src/leanback/res/layout/adapter_site.xml @@ -9,7 +9,7 @@