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 a3365fb04..52582d587 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 @@ -33,6 +33,7 @@ import com.fongmi.android.tv.utils.Prefers; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; import com.google.android.exoplayer2.ui.StyledPlayerView; +import com.google.android.exoplayer2.util.Log; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -152,7 +153,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void setGroupActivated() { for (int i = 0; i < mGroupAdapter.size(); i++) ((Group) mGroupAdapter.get(i)).setSelected(mGroup); mChannelAdapter.setItems(mGroup.getChannel(), null); - mBinding.channel.setSelectedPosition(mGroup.getPosition()); notifyItemChanged(mBinding.group, mGroupAdapter); } @@ -201,6 +201,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick if (item.isSelected()) return; mHandler.removeCallbacks(mR2); mHandler.postDelayed(mR2, 100); + mBinding.channel.setSelectedPosition(mGroup.getPosition()); } @Override @@ -337,6 +338,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick super.onDestroy(); mPlayers.release(); Force.get().destroy(); + mGroup.setSelected(false); + mChannel.setSelected(false); EventBus.getDefault().unregister(this); } } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java index a63b6fdec..0c341c6da 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java @@ -125,6 +125,10 @@ public class Channel { return selected; } + public void setSelected(boolean selected) { + this.selected = selected; + } + public void setSelected(Channel item) { this.selected = item.equals(this); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Group.java b/app/src/main/java/com/fongmi/android/tv/bean/Group.java index a55015a63..aee1be4ca 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Group.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Group.java @@ -66,6 +66,10 @@ public class Group { return selected; } + public void setSelected(boolean selected) { + this.selected = selected; + } + public void setSelected(Group item) { this.selected = item.equals(this); }