From 3020f83f42852bc33f6ddb6e4a658ea0471ad3cd Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 26 Jan 2024 13:23:16 +0800 Subject: [PATCH] Fix bug --- app/build.gradle | 2 +- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9079f7e05..30cdbf36c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 224 - versionName "fongmi-0126" + versionName "fongmi-0126#2" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] 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 1b0acc8be..a075df7c0 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 @@ -275,7 +275,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void setWidth(Live live) { for (Group item : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(item.getName(), 16))); - mBinding.group.getLayoutParams().width = live.getWidth() == 0 ? 0 : Math.min(live.getWidth() + ResUtil.dp2px(50), ResUtil.dp2px(200)); + mBinding.group.getLayoutParams().width = live.getWidth() == 0 ? 0 : Math.min(live.getWidth() + ResUtil.dp2px(50), ResUtil.dp2px(180)); mBinding.channel.getLayoutParams().width = live.getLogo().isEmpty() ? ResUtil.dp2px(200) : ResUtil.dp2px(260); mBinding.divide.setVisibility(live.getWidth() == 0 ? View.GONE : View.VISIBLE); } 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 fa50d54d2..f5292c755 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 @@ -304,7 +304,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List private void setWidth(Live live) { for (Group item : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(item.getName(), 14))); mBinding.group.getLayoutParams().width = live.getWidth() == 0 ? 0 : Math.min(live.getWidth() + ResUtil.dp2px(44), ResUtil.dp2px(180)); - mBinding.channel.getLayoutParams().width = live.getLogo().isEmpty() ? ResUtil.dp2px(180) : ResUtil.dp2px(236); + mBinding.channel.getLayoutParams().width = live.getLogo().isEmpty() ? ResUtil.dp2px(200) : ResUtil.dp2px(260); mBinding.divide.setVisibility(live.getWidth() == 0 ? View.GONE : View.VISIBLE); }