From 76a6dfc058265458aab50f26fb2de34ecfebfafe Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 15 Nov 2023 22:04:36 +0800 Subject: [PATCH] Add limit --- app/build.gradle | 4 ++-- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c9ad9f9ad..a41836908 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,12 +21,12 @@ android { leanback { dimension "mode" versionCode 207 - versionName "20231115#2" + versionName "20231115#3" } mobile { dimension "mode" versionCode 207 - versionName "20231115#2" + versionName "20231115#3" } 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 1cd708f12..1655ad202 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 @@ -254,7 +254,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void setWidth(Live live) { for (Group group : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(group.getName(), 16))); - mBinding.group.getLayoutParams().width = live.getWidth() + ResUtil.dp2px(live.hasLogo() ? 98 : 50); + mBinding.group.getLayoutParams().width = Math.min(live.getWidth() + ResUtil.dp2px(live.hasLogo() ? 98 : 50), ResUtil.dp2px(260)); } private void setPosition(int[] position) { 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 index a5dd51c2e..3e455353e 100644 --- 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 @@ -273,7 +273,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List private void setWidth(Live live) { for (Group group : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(group.getName(), 14))); - mBinding.group.getLayoutParams().width = live.getWidth() + ResUtil.dp2px(live.hasLogo() ? 90 : 45); + mBinding.group.getLayoutParams().width = Math.min(live.getWidth() + ResUtil.dp2px(live.hasLogo() ? 90 : 45), ResUtil.dp2px(260)); } private void setPosition(int[] position) {