diff --git a/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java index 8aae02c2c..53db7de4a 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java @@ -39,7 +39,7 @@ public class ImgUtil { public static void load(String url, int error, CustomTarget target) { if (TextUtils.isEmpty(url)) target.onLoadFailed(ResUtil.getDrawable(error)); - else Glide.with(App.get()).load(getUrl(url)).error(error).dontAnimate().into(target); + else Glide.with(App.get()).load(getUrl(url)).error(error).skipMemoryCache(true).dontAnimate().signature(new ObjectKey(url + "_" + Setting.getQuality())).into(target); } public static void load(String url, ImageView view, ImageView.ScaleType scaleType) { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bd76e1768..121b67a4e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -169,10 +169,4 @@ 手动 - - 关闭 - 开启 - 画中画 - - \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c494f3d2c..c04b8a631 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -169,10 +169,4 @@ 手動 - - 關閉 - 開啟 - 子母畫面 - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1fd8d9412..309627328 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -174,10 +174,4 @@ Manual - - Off - On - PiP - - \ No newline at end of file diff --git a/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java b/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java index fe3e3a954..e3392fe3e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java +++ b/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java @@ -27,8 +27,8 @@ public class PiP { private PictureInPictureParams.Builder builder; - private boolean noPiP() { - return Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !App.get().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) || !Setting.isBackgroundPiP(); + public static boolean noPiP() { + return Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !App.get().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE); } @TargetApi(Build.VERSION_CODES.O) @@ -73,7 +73,7 @@ public class PiP { public void enter(Activity activity, boolean four) { try { - if (noPiP() || activity.isInPictureInPictureMode()) return; + if (noPiP() || activity.isInPictureInPictureMode() || !Setting.isBackgroundPiP()) return; builder.setAspectRatio(new Rational(four ? 4 : 16, four ? 3 : 9)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) builder.setAutoEnterEnabled(true); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) builder.setSeamlessResizeEnabled(true); diff --git a/app/src/mobile/res/values-zh-rCN/strings.xml b/app/src/mobile/res/values-zh-rCN/strings.xml index 16c8e43cc..afe6421e0 100644 --- a/app/src/mobile/res/values-zh-rCN/strings.xml +++ b/app/src/mobile/res/values-zh-rCN/strings.xml @@ -35,4 +35,10 @@ 收藏纪录将会全部删除。 观看纪录将会全部删除。 + + 关闭 + 开启 + 画中画 + + \ No newline at end of file diff --git a/app/src/mobile/res/values-zh-rTW/strings.xml b/app/src/mobile/res/values-zh-rTW/strings.xml index 934c84d31..e3c2154bb 100644 --- a/app/src/mobile/res/values-zh-rTW/strings.xml +++ b/app/src/mobile/res/values-zh-rTW/strings.xml @@ -35,4 +35,10 @@ 收藏紀錄將會全部刪除。 觀看紀錄將會全部刪除。 + + 關閉 + 開啟 + 子母畫面 + + \ No newline at end of file diff --git a/app/src/mobile/res/values/strings.xml b/app/src/mobile/res/values/strings.xml index 3280a7030..2c29f39a5 100644 --- a/app/src/mobile/res/values/strings.xml +++ b/app/src/mobile/res/values/strings.xml @@ -35,4 +35,10 @@ All keep records will be removed. All history records will be removed. + + Off + On + PiP + + \ No newline at end of file