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 95ad21da3..1e068cf9d 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 @@ -489,7 +489,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP private void hideControl() { mBinding.control.getRoot().setVisibility(View.GONE); - mBinding.widget.top.setVisibility(View.GONE); + mBinding.widget.top.setVisibility(Setting.isDisplayVideoInformation() ? View.VISIBLE : View.GONE); App.removeCallbacks(mR1); } @@ -499,6 +499,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP mBinding.display.clock.setVisibility(Setting.isDisplayTime() && visible ? View.VISIBLE : View.GONE); mBinding.display.netspeed.setVisibility(Setting.isDisplaySpeed() && visible ? View.VISIBLE : View.GONE); mBinding.display.duration.setVisibility(View.GONE); + mBinding.widget.top.setVisibility(Setting.isDisplayVideoInformation() && visible ? View.VISIBLE : View.GONE); } private void onTimeChangeDisplaySpeed() { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index d8a217dba..0cfef7b98 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -794,6 +794,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mBinding.display.netspeed.setVisibility(Setting.isDisplaySpeed() && !isVisible(mBinding.control.getRoot()) ? View.VISIBLE : View.GONE); mBinding.display.duration.setVisibility(Setting.isDisplayDuration() && !isVisible(mBinding.control.getRoot()) ? View.VISIBLE : View.GONE); mBinding.display.progress.setVisibility(Setting.isDisplayMiniProgress() && !isVisible(mBinding.control.getRoot()) && (mPlayers.getDuration() > 60000) ? View.VISIBLE : View.GONE); + mBinding.widget.info.setVisibility(Setting.isDisplayVideoInformation() || isVisible(mBinding.widget.info) ? View.VISIBLE : View.GONE); } private void onTimeChangeDisplaySpeed() { @@ -1113,7 +1114,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void hideInfo() { - mBinding.widget.info.setVisibility(View.GONE); + mBinding.widget.info.setVisibility(Setting.isDisplayVideoInformation() ? View.VISIBLE : View.GONE); showDisplayInfo(); } @@ -1556,7 +1557,8 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mBinding.widget.exoDuration.setText(mPlayers.getDurationTime()); mBinding.widget.exoPosition.setText(mPlayers.getPositionTime(0)); if (visible) showInfoAndCenter(); - else hideInfoAndCenter(); + else if (Setting.isDisplayVideoInformation() == false) + hideInfoAndCenter(); mPlayers.pause(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/DisplayAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/DisplayAdapter.java index 865b65dfb..09bf9d68d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/DisplayAdapter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/DisplayAdapter.java @@ -26,6 +26,7 @@ public class DisplayAdapter extends RecyclerView.Adapter网速 进度 迷你进度 + 影片/频道 资料 弹幕 屏显 倍速 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e6ff78d0a..3ffd8f077 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -40,6 +40,7 @@ 網速 進度 迷你進度 + 影片/頻道 資料 彈幕 屏顯 倍速 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5ada77697..5100bf57f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -40,6 +40,7 @@ Net Speed Duration Mini Progress + Video/Channel Info Danmu Display Speed diff --git a/app/src/mobile/res/layout/dialog_control.xml b/app/src/mobile/res/layout/dialog_control.xml index bacd6d694..262dc69aa 100644 --- a/app/src/mobile/res/layout/dialog_control.xml +++ b/app/src/mobile/res/layout/dialog_control.xml @@ -300,6 +300,16 @@ android:textColor="@color/control" android:textSize="14sp" /> + +