From c8f8f9d94fa68526f1a6c1e64f8f994ae14622c1 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 21 Feb 2024 14:30:20 +0800 Subject: [PATCH 1/2] speed --- .../tv/ui/activity/SettingCustomActivity.java | 14 ++++++++++---- .../android/tv/ui/activity/VideoActivity.java | 4 ++-- .../java/com/fongmi/android/tv/player/Players.java | 6 +++--- .../tv/ui/fragment/SettingCustomFragment.java | 12 ++++++++---- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java index 5964e3314..6570e982c 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java @@ -13,6 +13,8 @@ import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.ui.base.BaseActivity; import com.fongmi.android.tv.utils.ResUtil; +import java.util.Locale; + public class SettingCustomActivity extends BaseActivity { private ActivitySettingCustomBinding mBinding; @@ -45,7 +47,7 @@ public class SettingCustomActivity extends BaseActivity { mBinding.displayNetspeedText.setText(getSwitch(Setting.isDisplaySpeed())); mBinding.displayDurationText.setText(getSwitch(Setting.isDisplayDuration())); mBinding.displayMiniProgressText.setText(getSwitch(Setting.isDisplayMiniProgress())); - mBinding.speedText.setText(Setting.getPlaySpeed() + "x"); + mBinding.speedText.setText(getSpeedText()); mBinding.fullscreenMenuKeyText.setText((fullscreenMenuKey = ResUtil.getStringArray(R.array.select_fullscreen_menu_key))[Setting.getFullscreenMenuKey()]); mBinding.homeSiteLockText.setText(getSwitch(Setting.isHomeSiteLock())); mBinding.incognitoText.setText(getSwitch(Setting.isIncognito())); @@ -109,17 +111,21 @@ public class SettingCustomActivity extends BaseActivity { mBinding.displayMiniProgressText.setText(getSwitch(Setting.isDisplayMiniProgress())); } + private String getSpeedText() { + return String.format(Locale.getDefault(), "%.2f", Setting.getPlaySpeed()); + } + private void setSpeed(View view) { float speed = Setting.getPlaySpeed(); - float addon = speed >= 2 ? 1f : 0.1f; + float addon = speed >= 2 ? 1.0f : 0.1f; speed = speed >= 5 ? 0.2f : Math.min(speed + addon, 5.0f); Setting.putPlaySpeed(speed); - mBinding.speedText.setText(Setting.getPlaySpeed() + "x"); + mBinding.speedText.setText(getSpeedText()); } private boolean resetSpeed(View view) { Setting.putPlaySpeed(1.0f); - mBinding.speedText.setText(Setting.getPlaySpeed() + "x"); + mBinding.speedText.setText(getSpeedText()); return true; } 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 c59dcdc72..a64f747b6 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 @@ -897,12 +897,12 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void onSpeedAdd() { - mBinding.control.speed.setText(mPlayers.addSpeed(0.25f)); + mBinding.control.speed.setText(mPlayers.addSpeed(0.1f)); mHistory.setSpeed(mPlayers.getSpeed()); } private void onSpeedSub() { - mBinding.control.speed.setText(mPlayers.subSpeed(0.25f)); + mBinding.control.speed.setText(mPlayers.subSpeed(0.1f)); mHistory.setSpeed(mPlayers.getSpeed()); } diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index 280b7cabc..24e82a10b 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -306,8 +306,8 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic public String addSpeed() { float speed = getSpeed(); - float addon = speed >= 2 ? 1f : 0.25f; - speed = speed >= 5 ? 0.25f : Math.min(speed + addon, 5.0f); + float addon = speed >= 2 ? 1f : 0.1f; + speed = speed >= 5 ? 0.2f : Math.min(speed + addon, 5.0f); return setSpeed(speed); } @@ -319,7 +319,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic public String subSpeed(float value) { float speed = getSpeed(); - speed = Math.max(speed - value, 0.25f); + speed = Math.max(speed - value, 0.2f); return setSpeed(speed); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java index a02ae13e1..c8d5237ae 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java @@ -38,7 +38,7 @@ public class SettingCustomFragment extends BaseFragment { protected void initView() { mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]); mBinding.danmuSyncText.setText(getSwitch(Setting.isDanmuSync())); - mBinding.speedText.setText(Setting.getPlaySpeed() + "x"); + mBinding.speedText.setText(getSpeedText()); mBinding.incognitoText.setText(getSwitch(Setting.isIncognito())); } @@ -71,17 +71,21 @@ public class SettingCustomFragment extends BaseFragment { mBinding.danmuSyncText.setText(getSwitch(Setting.isDanmuSync())); } + private String getSpeedText() { + return String.format(Locale.getDefault(), "%.2f", Setting.getPlaySpeed()); + } + private void setSpeed(View view) { float speed = Setting.getPlaySpeed(); - float addon = speed >= 2 ? 1f : 0.1f; + float addon = speed >= 2 ? 1.0f : 0.1f; speed = speed >= 5 ? 0.2f : Math.min(speed + addon, 5.0f); Setting.putPlaySpeed(speed); - mBinding.speedText.setText(Setting.getPlaySpeed() + "x"); + mBinding.speedText.setText(getSpeedText()); } private boolean resetSpeed(View view) { Setting.putPlaySpeed(1.0f); - mBinding.speedText.setText(Setting.getPlaySpeed() + "x"); + mBinding.speedText.setText(getSpeedText()); return true; } From 7f002767c59e5c54a4fef787bb42a0f6d2a581a5 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 21 Feb 2024 14:31:57 +0800 Subject: [PATCH 2/2] speed --- .../fongmi/android/tv/ui/fragment/SettingCustomFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java index c8d5237ae..446c8d4da 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java @@ -16,6 +16,8 @@ import com.fongmi.android.tv.ui.base.BaseFragment; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import java.util.Locale; + public class SettingCustomFragment extends BaseFragment { private FragmentSettingCustomBinding mBinding;