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 0c8a02d6f..e5a9e5d99 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 @@ -409,7 +409,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Override public void showEpg(Channel item) { - if (mChannel == null || mChannel.getData().getList().isEmpty() || mEpgDataAdapter.size() == 0 || !mChannel.equals(item)) return; + if (mChannel == null || mChannel.getData().getList().isEmpty() || mEpgDataAdapter.size() == 0 || !mChannel.equals(item) || !mChannel.getGroup().equals(mGroup)) return; mBinding.widget.epgData.setSelectedPosition(mChannel.getData().getSelected()); mBinding.widget.epg.setVisibility(View.VISIBLE); mBinding.widget.epg.requestFocus(); @@ -529,7 +529,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Override public void onItemClick(Channel item) { - if (item.getData().getList().size() > 0 && item.isSelected() && item.equals(mChannel)) { + if (item.getData().getList().size() > 0 && item.isSelected() && mChannel.equals(item) && mChannel.getGroup().equals(mGroup)) { showEpg(item); } else { mGroup.setPosition(mBinding.channel.getSelectedPosition()); 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 e6ad13e06..88fefba9b 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 @@ -447,7 +447,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void showEpg(Channel item) { - if (mChannel == null || mChannel.getData().getList().isEmpty() || mEpgDataAdapter.getItemCount() == 0 || !mChannel.equals(item)) return; + if (mChannel == null || mChannel.getData().getList().isEmpty() || mEpgDataAdapter.getItemCount() == 0 || !mChannel.equals(item) || !mChannel.getGroup().equals(mGroup)) return; mBinding.widget.epgData.scrollToPosition(item.getData().getSelected()); mBinding.widget.epg.setVisibility(View.VISIBLE); hideUI(); @@ -571,7 +571,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Override public void onItemClick(Channel item) { - if (item.getData().getList().size() > 0 && item.isSelected() && item.equals(mChannel)) { + if (item.getData().getList().size() > 0 && item.isSelected() && mChannel.equals(item) && mChannel.getGroup().equals(mGroup)) { showEpg(item); } else { mGroup.setPosition(mChannelAdapter.setSelected(item.group(mGroup)));