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 4fb00e132..2db678761 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 @@ -426,7 +426,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void showUI() { - if (isVisible(mBinding.recycler)) return; + if (isVisible(mBinding.recycler) || mGroupAdapter.size() == 0) return; mBinding.recycler.setVisibility(View.VISIBLE); setPosition(); setUITimer(); @@ -668,9 +668,11 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void resetAdapter() { + mBinding.control.line.setVisibility(View.GONE); mBinding.channel.getLayoutParams().width = 0; mBinding.epgData.getLayoutParams().width = 0; mBinding.group.getLayoutParams().width = 0; + mBinding.widget.title.setText(""); mEpgDataAdapter.clear(); mChannelAdapter.clear(); mGroupAdapter.clear(); @@ -718,6 +720,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick if (item.isActivated()) item.getGroups().clear(); LiveConfig.get().setHome(item); mPlayers.reset(); + mPlayers.clear(); mPlayers.stop(); resetAdapter(); hideControl(); 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 9e7c0f303..2e59e7e5b 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 @@ -453,7 +453,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener } private void showUI() { - if (isVisible(mBinding.recycler)) return; + if (isVisible(mBinding.recycler) || mGroupAdapter.getItemCount() == 0) return; mBinding.recycler.setVisibility(View.VISIBLE); mBinding.channel.requestFocus(); setPosition(); @@ -702,9 +702,11 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener } private void resetAdapter() { + mBinding.control.action.line.setVisibility(View.GONE); mBinding.channel.getLayoutParams().width = 0; mBinding.epgData.getLayoutParams().width = 0; mBinding.group.getLayoutParams().width = 0; + mBinding.control.title.setText(""); mEpgDataAdapter.clear(); mChannelAdapter.clear(); mGroupAdapter.clear(); @@ -752,6 +754,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener if (item.isActivated()) item.getGroups().clear(); LiveConfig.get().setHome(item); mPlayers.reset(); + mPlayers.clear(); mPlayers.stop(); resetAdapter(); hideControl();