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 5309bf345..f2772e18e 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 @@ -438,8 +438,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } @Override - public void showEpg() { - if (mChannel == null || mChannel.getData().getList().isEmpty() || mEpgDataAdapter.size() == 0) return; + public void showEpg(Channel item) { + if (mChannel == null || mChannel.getData().getList().isEmpty() || mEpgDataAdapter.size() == 0 || !mChannel.equals(item)) return; mBinding.widget.epgData.setSelectedPosition(mChannel.getData().getIndex()); mBinding.widget.epg.setVisibility(View.VISIBLE); mBinding.widget.epg.requestFocus(); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/ChannelPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/ChannelPresenter.java index a36310a0a..63e25a245 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/ChannelPresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/ChannelPresenter.java @@ -19,7 +19,7 @@ public class ChannelPresenter extends Presenter { public interface OnClickListener { - void showEpg(); + void showEpg(Channel item); void onItemClick(Channel item); @@ -39,9 +39,9 @@ public class ChannelPresenter extends Presenter { holder.binding.name.setText(item.getName()); holder.binding.number.setText(item.getNumber()); holder.binding.getRoot().setSelected(item.isSelected()); - holder.binding.getRoot().setRightListener(mListener::showEpg); setOnClickListener(holder, view -> mListener.onItemClick(item)); holder.view.setOnLongClickListener(view -> mListener.onLongClick(item)); + holder.binding.getRoot().setRightListener(() -> mListener.showEpg(item)); } @Override