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 332c1ed83..85ea3901d 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 @@ -433,6 +433,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void showControl(View view) { mBinding.control.getRoot().setVisibility(View.VISIBLE); + mBinding.widget.top.setVisibility(View.VISIBLE); view.requestFocus(); setR2Callback(); hideInfo(); @@ -440,6 +441,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void hideControl() { mBinding.control.getRoot().setVisibility(View.GONE); + mBinding.widget.top.setVisibility(View.GONE); App.removeCallbacks(mR1); } @@ -449,13 +451,13 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void showInfo() { - mBinding.widget.info.setVisibility(View.VISIBLE); + mBinding.widget.bottom.setVisibility(View.VISIBLE); setR1Callback(); setInfo(); } private void hideInfo() { - mBinding.widget.info.setVisibility(View.GONE); + mBinding.widget.bottom.setVisibility(View.GONE); App.removeCallbacks(mR3); } @@ -572,6 +574,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mViewModel.getEpg(mChannel); mChannel.loadLogo(mBinding.widget.logo); mBinding.widget.name.setText(mChannel.getName()); + mBinding.widget.title.setText(mChannel.getName()); mBinding.widget.line.setText(mChannel.getLineText()); mBinding.widget.number.setText(mChannel.getNumber()); mBinding.control.line.setText(mChannel.getLineText()); @@ -666,6 +669,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mPlayers.reset(); setSpeedVisible(); setTrackVisible(true); + mBinding.widget.size.setText(mPlayers.getSizeText()); break; case Player.STATE_ENDED: nextChannel(); @@ -923,7 +927,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick public void onBackPressed() { if (isVisible(mBinding.control.getRoot())) { hideControl(); - } else if (isVisible(mBinding.widget.info)) { + } else if (isVisible(mBinding.widget.bottom)) { hideInfo(); } else if (isVisible(mBinding.recycler)) { hideUI(); diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml index ac25eff01..c032ced21 100644 --- a/app/src/leanback/res/layout/view_widget_live.xml +++ b/app/src/leanback/res/layout/view_widget_live.xml @@ -4,6 +4,47 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + +