From 7df0eca7359e059190d55764930eb7c3330f74a0 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 17 Jan 2024 23:01:35 +0800 Subject: [PATCH 1/4] danmu load --- app/src/main/java/com/fongmi/android/tv/Setting.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 71fc4a88d..39e726dbc 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -250,7 +250,7 @@ public class Setting { } public static boolean getDanmuLoad() { - return Prefers.getBoolean("danmu_load"); + return Prefers.getBoolean("danmu_load", true); } public static void putDanmuLoad(boolean load) { From 424b5fa60747850103c95fa36751e894ee742948 Mon Sep 17 00:00:00 2001 From: okjack Date: Thu, 18 Jan 2024 09:40:58 +0800 Subject: [PATCH 2/4] danmu load --- app/src/main/java/com/fongmi/android/tv/Setting.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 39e726dbc..14bf69613 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -249,8 +249,8 @@ public class Setting { Prefers.put("danmu", danmu); } - public static boolean getDanmuLoad() { - return Prefers.getBoolean("danmu_load", true); + public static boolean isDanmuLoad() { + return Prefers.getBoolean("danmu_load"); } public static void putDanmuLoad(boolean load) { From a16804f6e3a43a079aa8deb98661fa72d5f21ace Mon Sep 17 00:00:00 2001 From: okjack Date: Thu, 18 Jan 2024 10:47:36 +0800 Subject: [PATCH 3/4] danmu speed --- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 4 +++- app/src/main/java/com/fongmi/android/tv/Setting.java | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 4 +++- 6 files changed, 7 insertions(+), 6 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 60f726d54..0a9710a93 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,9 +415,11 @@ 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 alpha = Setting.getDanmuAlpha() / 100.0f; - float speed = 1.6f - Setting.getDanmuSpeed() * 0.2f; + 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 14bf69613..16ab21432 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -250,7 +250,7 @@ public class Setting { } public static boolean isDanmuLoad() { - return Prefers.getBoolean("danmu_load"); + return Prefers.getBoolean("danmu_load", true); } public static void putDanmuLoad(boolean load) { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 80289adca..ce2af2e5f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -156,7 +156,6 @@ 慢 适中 快 - 超快 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3bfbb3cca..aabcdb497 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -156,7 +156,6 @@ 慢 適中 快 - 超快 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 85cc31098..723c717fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -156,7 +156,6 @@ Slow Moderate Fast - Super fast 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 eb51ebcfa..059bc5253 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,9 +413,11 @@ 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 alpha = Setting.getDanmuAlpha() / 100.0f; - float speed = 1.6f - Setting.getDanmuSpeed() * 0.2f; + 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); From 41c62cd2177e5a81f6f4a0ed020558f2298ac29b Mon Sep 17 00:00:00 2001 From: okjack Date: Thu, 18 Jan 2024 10:48:36 +0800 Subject: [PATCH 4/4] build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b36edb343..0f909b5c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 222 - versionName "0117" + versionName "0118" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]