From e8e70ef3df8269d336354ac3e4ff04eebfea65c8 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 18 Jan 2024 14:23:33 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 5 ++--- app/src/main/java/com/fongmi/android/tv/Setting.java | 2 +- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) 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 d529df03c..0af4f6a5f 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 @@ -415,11 +415,10 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setDanmuView() { int maxLine = Setting.getDanmuLine(3); - int danmuSpeed = Setting.getDanmuSpeed(); mPlayers.setDanmuView(mBinding.danmaku); + float[] range = {2.4f, 1.8f, 1.2f, 0.8f}; + float speed = range[Setting.getDanmuSpeed()]; float alpha = Setting.getDanmuAlpha() / 100.0f; - float[] speedRange = {2.4f, 1.8f, 1.2f, 0.8f }; - float speed = danmuSpeed < speedRange.length ? speedRange[danmuSpeed] : 1.2f; HashMap maxLines = new HashMap<>(); maxLines.put(BaseDanmaku.TYPE_FIX_TOP, maxLine); maxLines.put(BaseDanmaku.TYPE_SCROLL_RL, maxLine); diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java index 16ab21432..308e490c2 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -258,7 +258,7 @@ public class Setting { } public static int getDanmuSpeed() { - return Prefers.getInt("danmu_speed", 2); + return Math.min(Math.max(Prefers.getInt("danmu_speed", 2), 0), 3); } public static void putDanmuSpeed(int speed) { 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 059bc5253..fc55344be 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 @@ -413,11 +413,10 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void setDanmuView() { int maxLine = Setting.getDanmuLine(2); - int danmuSpeed = Setting.getDanmuSpeed(); mPlayers.setDanmuView(mBinding.danmaku); + float[] range = {2.4f, 1.8f, 1.2f, 0.8f}; + float speed = range[Setting.getDanmuSpeed()]; float alpha = Setting.getDanmuAlpha() / 100.0f; - float[] speedRange = {2.4f, 1.8f, 1.2f, 0.8f }; - float speed = danmuSpeed < speedRange.length ? speedRange[danmuSpeed] : 1.2f; HashMap maxLines = new HashMap<>(); maxLines.put(BaseDanmaku.TYPE_FIX_TOP, maxLine); maxLines.put(BaseDanmaku.TYPE_SCROLL_RL, maxLine);