From 02fed4c40386a10c167da97eacb9e249bb94adae Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 15 Jun 2025 01:40:13 +0800 Subject: [PATCH] Fix bug --- .../android/tv/ui/activity/LiveActivity.java | 13 +++++-------- .../android/tv/ui/activity/VideoActivity.java | 14 ++++++-------- .../android/tv/ui/custom/CustomKeyDownLive.java | 5 +++-- .../android/tv/ui/custom/CustomKeyDownVod.java | 5 +++-- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 2ae99c075..cf20c3b3a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -213,13 +213,9 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void setScale(int scale) { - if (mKeyDown.getScale() != 1.0f) { - mKeyDown.resetScale(); - } else { - Setting.putLiveScale(scale); - mBinding.exo.setResizeMode(scale); - mBinding.control.action.scale.setText(ResUtil.getStringArray(R.array.select_scale)[scale]); - } + Setting.putLiveScale(scale); + mBinding.exo.setResizeMode(scale); + mBinding.control.action.scale.setText(ResUtil.getStringArray(R.array.select_scale)[scale]); } private void setViewModel() { @@ -363,7 +359,8 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List private void onScale() { int index = Setting.getLiveScale(); String[] array = ResUtil.getStringArray(R.array.select_scale); - setScale(index == array.length - 1 ? 0 : ++index); + if (mKeyDown.getScale() != 1.0f) mKeyDown.resetScale(); + else setScale(index == array.length - 1 ? 0 : ++index); setR1Callback(); } 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 5ddf6535c..2e2765ec6 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 @@ -398,13 +398,9 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void setScale(int scale) { - if (mKeyDown.getScale() != 1.0f) { - mKeyDown.resetScale(); - } else { - mHistory.setScale(scale); - mBinding.exo.setResizeMode(scale); - mBinding.control.action.scale.setText(ResUtil.getStringArray(R.array.select_scale)[scale]); - } + mHistory.setScale(scale); + mBinding.exo.setResizeMode(scale); + mBinding.control.action.scale.setText(ResUtil.getStringArray(R.array.select_scale)[scale]); } private void setViewModel() { @@ -757,7 +753,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void onScale() { int index = getScale(); String[] array = ResUtil.getStringArray(R.array.select_scale); - setScale(index == array.length - 1 ? 0 : ++index); + if (mKeyDown.getScale() != 1.0f) mKeyDown.resetScale(); + else setScale(index == array.length - 1 ? 0 : ++index); setR1Callback(); } @@ -1421,6 +1418,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Override public void onScale(int tag) { + mKeyDown.resetScale(); setScale(tag); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java index e6fcf2242..ea9e9606b 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java @@ -63,10 +63,11 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener i } public void resetScale() { - scale = 1.0f; + if (scale == 1.0f) return; videoView.animate().scaleX(1.0f).scaleY(1.0f).translationX(0f).translationY(0f).setDuration(250).withEndAction(() -> { - videoView.setPivotX(videoView.getWidth() / 2f); videoView.setPivotY(videoView.getHeight() / 2f); + videoView.setPivotX(videoView.getWidth() / 2f); + scale = 1.0f; }).start(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java index e5c194958..ce371d730 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java @@ -63,10 +63,11 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener im } public void resetScale() { - scale = 1.0f; + if (scale == 1.0f) return; videoView.animate().scaleX(1.0f).scaleY(1.0f).translationX(0f).translationY(0f).setDuration(250).withEndAction(() -> { - videoView.setPivotX(videoView.getWidth() / 2f); videoView.setPivotY(videoView.getHeight() / 2f); + videoView.setPivotX(videoView.getWidth() / 2f); + scale = 1.0f; }).start(); }