diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java index 9b7dd56be..3cdd5c9cc 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java @@ -60,6 +60,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.tunnelText.setText(getSwitch(Setting.isTunnel())); mBinding.bufferText.setText(String.valueOf(Setting.getBuffer())); mBinding.subtitleText.setText(String.valueOf(Setting.getSubtitle())); + mBinding.danmuLoadText.setText(getSwitch(Setting.getDanmuLoad())); mBinding.danmuSizeText.setText(String.valueOf(Setting.getDanmuSize())); mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(3))); mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha())); @@ -91,6 +92,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.danmuLine.setOnClickListener(this::onDanmuLine); mBinding.danmuAlpha.setOnClickListener(this::onDanmuAlpha); mBinding.danmuSpeed.setOnClickListener(this::setDanmuSpeed); + mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad); } private void setVisible() { @@ -217,4 +219,10 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B Setting.putDanmuSpeed(index = index == danmuSpeed.length - 1 ? 0 : ++index); mBinding.danmuSpeedText.setText(danmuSpeed[index]); } + + public void setDanmuLoad(View view) { + boolean load = Setting.getDanmuLoad(); + Setting.putDanmuLoad(!load); + mBinding.danmuLoadText.setText(getSwitch(!load)); + } } 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 e85bc5897..fa3a2d6c6 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 @@ -504,6 +504,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void checkDanmu(String danmu) { + if (!Setting.getDanmuLoad()) return; mBinding.danmaku.release(); mBinding.danmaku.setVisibility(danmu.isEmpty() ? View.GONE : View.VISIBLE); if (danmu.length() > 0) App.execute(() -> mBinding.danmaku.prepare(new Parser(danmu), mDanmakuContext)); diff --git a/app/src/leanback/res/layout/activity_setting_player.xml b/app/src/leanback/res/layout/activity_setting_player.xml index c88f12b12..d58d2444d 100644 --- a/app/src/leanback/res/layout/activity_setting_player.xml +++ b/app/src/leanback/res/layout/activity_setting_player.xml @@ -157,6 +157,35 @@ + + + + + + + + 缩放比例 字幕样式 字幕大小 + 弹幕加载 弹幕速度 弹幕大小 弹幕行数 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cd3433274..0092a216d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -84,6 +84,7 @@ 縮放比例 字幕樣式 字幕大小 + 彈幕加載 彈幕速度 彈幕大小 彈幕行數 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9567b70b2..85cc31098 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,6 +84,7 @@ Scale Caption style Subtitle size + Danmu load Danmu speed Danmu size Danmu line 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 39b775587..f03246171 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 @@ -585,6 +585,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void checkDanmu(String danmu) { + if (!Setting.getDanmuLoad()) return; mBinding.danmaku.release(); mBinding.danmaku.setVisibility(danmu.isEmpty() ? View.GONE : View.VISIBLE); if (danmu.length() > 0) App.execute(() -> mBinding.danmaku.prepare(new Parser(danmu), mDanmakuContext)); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java index f94a78103..888e2d742 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java @@ -64,6 +64,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.captionText.setText(getSwitch(Setting.isCaption())); mBinding.bufferText.setText(String.valueOf(Setting.getBuffer())); mBinding.subtitleText.setText(String.valueOf(Setting.getSubtitle())); + mBinding.danmuLoadText.setText(getSwitch(Setting.getDanmuLoad())); mBinding.danmuSizeText.setText(String.valueOf(Setting.getDanmuSize())); mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(2))); mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha())); @@ -90,6 +91,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.caption.setOnClickListener(this::setCaption); mBinding.subtitle.setOnClickListener(this::onSubtitle); mBinding.caption.setOnLongClickListener(this::onCaption); + mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad); mBinding.danmuSize.setOnClickListener(this::onDanmuSize); mBinding.danmuLine.setOnClickListener(this::onDanmuLine); mBinding.danmuAlpha.setOnClickListener(this::onDanmuAlpha); @@ -182,6 +184,12 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.subtitleText.setText(String.valueOf(size)); } + public void setDanmuLoad(View view) { + boolean load = Setting.getDanmuLoad(); + Setting.putDanmuLoad(!load); + mBinding.danmuLoadText.setText(getSwitch(!load)); + } + public void onDanmuSize(View view) { DanmuSizeDialog.create(this).show(); } diff --git a/app/src/mobile/res/layout/fragment_setting_player.xml b/app/src/mobile/res/layout/fragment_setting_player.xml index ccd3802e7..fe6b4333c 100644 --- a/app/src/mobile/res/layout/fragment_setting_player.xml +++ b/app/src/mobile/res/layout/fragment_setting_player.xml @@ -183,6 +183,33 @@ + + + + + + + +