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 ef32391cd..512d9df2b 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 @@ -593,7 +593,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP @Override public void onItemClick(Channel item) { - if (item.getData().getList().size() > 0 && item.isSelected() && mChannel != null && mChannel.equals(item)) { + if (item.getData().getList().size() > 0 && item.isSelected() && item.equals(mChannel)) { showEpg(item); } else { mGroup.setPosition(mBinding.channel.getSelectedPosition()); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpgDataPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpgDataPresenter.java index c93d8e4f3..81ae9a8f7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpgDataPresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/EpgDataPresenter.java @@ -37,7 +37,9 @@ public class EpgDataPresenter extends Presenter { holder.binding.title.setText(item.getTitle()); holder.binding.getRoot().setSelected(item.isSelected()); holder.binding.getRoot().setLeftListener(mListener::showUI); - setOnClickListener(holder, view -> mListener.onItemClick(item)); + setOnClickListener(holder, view -> { + if (!item.isFuture()) mListener.onItemClick(item); + }); } @Override 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 defc55d0c..22282dbf4 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 @@ -641,7 +641,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom @Override public void onItemClick(Channel item) { - if (item.getData().getList().size() > 0 && item.isSelected() && mChannel != null && mChannel.equals(item)) { + if (item.getData().getList().size() > 0 && item.isSelected() && item.equals(mChannel)) { showEpg(item); } else { mGroup.setPosition(mChannelAdapter.setSelected(item.group(mGroup))); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpgDataAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpgDataAdapter.java index fef519595..2117e0088 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpgDataAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpgDataAdapter.java @@ -64,7 +64,9 @@ public class EpgDataAdapter extends RecyclerView.Adapter mListener.onItemClick(item)); + holder.binding.getRoot().setOnClickListener(view -> { + if (!item.isFuture()) mListener.onItemClick(item); + }); } static class ViewHolder extends RecyclerView.ViewHolder {