From f5e32836b97d6f1f6a186066aee4f82a5d567ffc Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 18 Jan 2024 00:54:09 +0800 Subject: [PATCH] Clean code --- .../tv/ui/activity/SettingPlayerActivity.java | 23 +++++++++---------- .../android/tv/ui/activity/VideoActivity.java | 2 +- .../java/com/fongmi/android/tv/Setting.java | 2 +- .../com/fongmi/android/tv/player/Players.java | 5 ++-- app/src/main/res/values-zh-rTW/strings.xml | 2 +- .../android/tv/ui/activity/VideoActivity.java | 2 +- .../tv/ui/fragment/SettingPlayerFragment.java | 23 +++++++++---------- 7 files changed, 28 insertions(+), 31 deletions(-) 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 3cdd5c9cc..a8884e547 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 @@ -58,9 +58,9 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.player.requestFocus(); mBinding.uaText.setText(Setting.getUa()); mBinding.tunnelText.setText(getSwitch(Setting.isTunnel())); + mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad())); 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())); @@ -90,9 +90,9 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.caption.setOnLongClickListener(this::onCaption); mBinding.danmuSize.setOnClickListener(this::onDanmuSize); mBinding.danmuLine.setOnClickListener(this::onDanmuLine); + mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad); mBinding.danmuAlpha.setOnClickListener(this::onDanmuAlpha); mBinding.danmuSpeed.setOnClickListener(this::setDanmuSpeed); - mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad); } private void setVisible() { @@ -184,7 +184,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.subtitleText.setText(String.valueOf(size)); } - public void onDanmuSize(View view) { + private void onDanmuSize(View view) { DanmuSizeDialog.create(this).show(); } @@ -194,17 +194,22 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B Setting.putDanmuSize(size); } - public void onDanmuLine(View view) { + private void onDanmuLine(View view) { DanmuLineDialog.create(this).show(); } + private void setDanmuLoad(View view) { + Setting.putDanmuLoad(!Setting.isDanmuLoad()); + mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad())); + } + @Override public void setDanmuLine(int line) { mBinding.danmuLineText.setText(String.valueOf(line)); Setting.putDanmuLine(line); } - public void onDanmuAlpha(View view) { + private void onDanmuAlpha(View view) { DanmuAlphaDialog.create(this).show(); } @@ -214,15 +219,9 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B Setting.putDanmuAlpha(alpha); } - public void setDanmuSpeed(View view) { + private void setDanmuSpeed(View view) { int index = Setting.getDanmuSpeed(); 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 fa3a2d6c6..c4e8133e2 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,8 +504,8 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void checkDanmu(String danmu) { - if (!Setting.getDanmuLoad()) return; mBinding.danmaku.release(); + if (!Setting.isDanmuLoad()) return; 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/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java index 71fc4a88d..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,7 +249,7 @@ public class Setting { Prefers.put("danmu", danmu); } - public static boolean getDanmuLoad() { + public static boolean isDanmuLoad() { return Prefers.getBoolean("danmu_load"); } 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 061996f87..df5dc276f 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 @@ -355,11 +355,10 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic public void play() { if (isEnd()) return; session.setActive(true); - boolean danmuResume = true; - if (isPlaying()) danmuResume = false; + boolean resume = !isPlaying(); if (isExo()) playExo(); if (isIjk()) playIjk(); - if (hasDanmu() && danmuResume) danmuView.resume(); + if (hasDanmu() && resume) danmuView.resume(); setPlaybackState(PlaybackStateCompat.STATE_PLAYING); } diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0092a216d..3bfbb3cca 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -84,7 +84,7 @@ 縮放比例 字幕樣式 字幕大小 - 彈幕加載 + 彈幕載入 彈幕速度 彈幕大小 彈幕行數 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 f03246171..d25c619ac 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,8 +585,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void checkDanmu(String danmu) { - if (!Setting.getDanmuLoad()) return; mBinding.danmaku.release(); + if (!Setting.isDanmuLoad()) return; 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 888e2d742..0b4d82f3c 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 @@ -63,8 +63,8 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B mBinding.tunnelText.setText(getSwitch(Setting.isTunnel())); mBinding.captionText.setText(getSwitch(Setting.isCaption())); mBinding.bufferText.setText(String.valueOf(Setting.getBuffer())); + mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad())); 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())); @@ -91,9 +91,9 @@ 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.danmuLoad.setOnClickListener(this::setDanmuLoad); mBinding.danmuAlpha.setOnClickListener(this::onDanmuAlpha); mBinding.danmuSpeed.setOnClickListener(this::onDanmuSpeed); mBinding.background.setOnClickListener(this::onBackground); @@ -184,13 +184,7 @@ 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) { + private void onDanmuSize(View view) { DanmuSizeDialog.create(this).show(); } @@ -200,7 +194,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B Setting.putDanmuSize(size); } - public void onDanmuLine(View view) { + private void onDanmuLine(View view) { DanmuLineDialog.create(this).show(); } @@ -210,7 +204,12 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B Setting.putDanmuLine(line); } - public void onDanmuAlpha(View view) { + private void setDanmuLoad(View view) { + Setting.putDanmuLoad(!Setting.isDanmuLoad()); + mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad())); + } + + private void onDanmuAlpha(View view) { DanmuAlphaDialog.create(this).show(); } @@ -220,7 +219,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B Setting.putDanmuAlpha(alpha); } - public void onDanmuSpeed(View view) { + private void onDanmuSpeed(View view) { new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_danmu_speed).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(danmuSpeed, Setting.getDanmuSpeed(), (dialog, which) -> { mBinding.danmuSpeedText.setText(danmuSpeed[which]); Setting.putDanmuSpeed(which);