From a870aa041a1791c4989db3ebd35e62ef953e4653 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 2 Dec 2024 23:22:55 +0800 Subject: [PATCH] Fix bug --- .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 7 ++----- app/src/leanback/res/layout/view_widget_live.xml | 1 + .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 5 ++--- app/src/mobile/res/layout/view_widget_live.xml | 1 + 4 files changed, 6 insertions(+), 8 deletions(-) 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 d2d637918..cccebd85f 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 @@ -581,7 +581,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mBinding.widget.line.setText(mChannel.getLineText()); mBinding.widget.number.setText(mChannel.getNumber()); mBinding.control.line.setText(mChannel.getLineText()); - mBinding.widget.name.setMaxEms(mChannel.getName().length()); mBinding.widget.line.setVisibility(mChannel.getLineVisible()); mBinding.control.line.setVisibility(mChannel.getLineVisible()); } @@ -878,14 +877,12 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Override public void onKeyUp() { - if (mPlayers.isLive()) prevChannel(); - else showControl(mBinding.control.player); + prevChannel(); } @Override public void onKeyDown() { - if (mPlayers.isLive()) nextChannel(); - else showControl(mBinding.control.player); + nextChannel(); } @Override diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml index aefe3f8dc..d5084db81 100644 --- a/app/src/leanback/res/layout/view_widget_live.xml +++ b/app/src/leanback/res/layout/view_widget_live.xml @@ -203,6 +203,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" + android:maxEms="24" android:singleLine="true" android:textColor="@color/white" android:textSize="18sp" 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 1cfb47b48..65146b38f 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 @@ -613,7 +613,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List mBinding.widget.line.setText(mChannel.getLineText()); mBinding.widget.number.setText(mChannel.getNumber()); mBinding.widget.numberPip.setText(mChannel.getNumber()); - mBinding.widget.name.setMaxEms(mChannel.getName().length()); mBinding.widget.line.setVisibility(mChannel.getLineVisible()); mBinding.control.action.line.setText(mBinding.widget.line.getText()); mBinding.control.action.line.setVisibility(mBinding.widget.line.getVisibility()); @@ -993,12 +992,12 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Override public void onFlingUp() { - if (mPlayers.isLive()) prevChannel(); + prevChannel(); } @Override public void onFlingDown() { - if (mPlayers.isLive()) nextChannel(); + nextChannel(); } @Override diff --git a/app/src/mobile/res/layout/view_widget_live.xml b/app/src/mobile/res/layout/view_widget_live.xml index a783f4ec5..36d8a3abe 100644 --- a/app/src/mobile/res/layout/view_widget_live.xml +++ b/app/src/mobile/res/layout/view_widget_live.xml @@ -186,6 +186,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" + android:maxEms="24" android:singleLine="true" android:textColor="@color/white" android:textSize="14sp"