From 67b18f963dcca046a23bb17c9f9d12a25891462c Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 31 Jan 2024 08:57:29 +0800 Subject: [PATCH 1/2] danmuSetting --- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 7735884e9..cdb54e79e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -938,8 +938,10 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void showDisplayInfo() { + boolean pictureMode = false; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode()) pictureMode = true; boolean controlVisible = isVisible(mBinding.control.getRoot()); - boolean visible = (!controlVisible || isLock()); + boolean visible = (!controlVisible || isLock()) && !pictureMode; mBinding.display.time.setVisibility(Setting.isDisplayTime() && visible ? View.VISIBLE : View.GONE); mBinding.display.netspeed.setVisibility(Setting.isDisplaySpeed() && visible ? View.VISIBLE : View.GONE); mBinding.display.duration.setVisibility(Setting.isDisplayDuration() && visible ? View.VISIBLE : View.GONE); @@ -1029,7 +1031,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void showControl() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode()) return; mBinding.control.danmu.setVisibility(isLock() || !mBinding.danmaku.isPrepared() ? View.GONE : View.VISIBLE); - mBinding.control.danmuSetting.setVisibility(isLock() || !Setting.isDanmuLoad() ? View.GONE : View.VISIBLE); + mBinding.control.danmuSetting.setVisibility(isLock() || !Setting.isDanmuLoad() || !isVisible(mBinding.danmaku) ? View.GONE : View.VISIBLE); mBinding.control.setting.setVisibility(mHistory == null || isFullscreen() ? View.GONE : View.VISIBLE); mBinding.control.right.rotate.setVisibility(isFullscreen() && !isLock() ? View.VISIBLE : View.GONE); mBinding.control.keep.setVisibility(mHistory == null || isFullscreen() ? View.GONE : View.VISIBLE); From 5c75ebf8fbff8a31129c2e05f03da14c5ba2cc13 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 31 Jan 2024 08:58:17 +0800 Subject: [PATCH 2/2] build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index e16bb5c7f..4b39240a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 224 - versionName "0130" + versionName "0131" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]