From f08876bdbd7aac9363eb00980c8cf29047174708 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 27 Jan 2025 17:33:45 +0800 Subject: [PATCH] Clean code --- .../fongmi/android/tv/ui/activity/CastActivity.java | 3 +-- .../fongmi/android/tv/ui/activity/LiveActivity.java | 1 - .../fongmi/android/tv/ui/activity/VideoActivity.java | 11 +++++------ .../java/com/fongmi/android/tv/player/Players.java | 8 ++------ .../fongmi/android/tv/ui/activity/LiveActivity.java | 3 +-- .../fongmi/android/tv/ui/activity/VideoActivity.java | 6 ++---- .../fongmi/android/tv/ui/dialog/ControlDialog.java | 1 - 7 files changed, 11 insertions(+), 22 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java index 7f0e9bd2c..ef6239060 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java @@ -142,7 +142,6 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List findViewById(R.id.timeBar).setNextFocusUpId(R.id.reset); mBinding.control.speed.setText(mPlayers.getSpeedText()); mBinding.control.decode.setText(mPlayers.getDecodeText()); - mBinding.control.speed.setEnabled(mPlayers.canAdjustSpeed()); mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[0]); } @@ -456,7 +455,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List @Override public void onSpeedUp() { - if (!mPlayers.isPlaying() || !mPlayers.canAdjustSpeed()) return; + if (!mPlayers.isPlaying()) return; mBinding.control.speed.setText(mPlayers.setSpeed(Setting.getSpeed())); mBinding.widget.speed.startAnimation(ResUtil.getAnim(R.anim.forward)); mBinding.widget.speed.setVisibility(View.VISIBLE); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index a6cc8ef10..1ed7da583 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -188,7 +188,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mBinding.control.change.setActivated(Setting.isChange()); mBinding.control.speed.setText(mPlayers.getSpeedText()); mBinding.control.decode.setText(mPlayers.getDecodeText()); - mBinding.control.speed.setEnabled(mPlayers.canAdjustSpeed()); mBinding.control.home.setVisibility(LiveConfig.isOnly() ? View.GONE : View.VISIBLE); } 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 5529e9227..ebb10d348 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 @@ -368,7 +368,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mPlayers.init(mBinding.exo); ExoUtil.setSubtitleView(mBinding.exo); mBinding.control.decode.setText(mPlayers.getDecodeText()); - mBinding.control.speed.setEnabled(mPlayers.canAdjustSpeed()); mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Setting.getReset()]); } @@ -772,6 +771,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List long current = mPlayers.getPosition(); long duration = mPlayers.getDuration(); if (current < 0 || duration < 0) return; + if (mHistory.getOpening() < 0) mHistory.setOpening(0); setOpening(Math.min(mHistory.getOpening() + 1000, duration / 2)); } @@ -786,7 +786,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setOpening(long opening) { mHistory.setOpening(opening); - mBinding.control.opening.setText(opening == 0 ? getString(R.string.play_op) : mPlayers.stringToTime(mHistory.getOpening())); + mBinding.control.opening.setText(opening <= 0 ? getString(R.string.play_op) : mPlayers.stringToTime(mHistory.getOpening())); } private void onEnding() { @@ -814,7 +814,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setEnding(long ending) { mHistory.setEnding(ending); - mBinding.control.ending.setText(ending == 0 ? getString(R.string.play_ed) : mPlayers.stringToTime(mHistory.getEnding())); + mBinding.control.ending.setText(ending <= 0 ? getString(R.string.play_ed) : mPlayers.stringToTime(mHistory.getEnding())); } private void onChoose() { @@ -1057,8 +1057,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void setPosition() { - if (mHistory == null) return; - mPlayers.seekTo(Math.max(mHistory.getOpening(), mHistory.getPosition())); + if (mHistory != null) mPlayers.seekTo(Math.max(mHistory.getOpening(), mHistory.getPosition())); } private void checkEnded() { @@ -1327,7 +1326,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List @Override public void onSpeedUp() { - if (!mPlayers.isPlaying() || !mPlayers.canAdjustSpeed()) return; + if (!mPlayers.isPlaying()) return; mBinding.control.speed.setText(mPlayers.setSpeed(Setting.getSpeed())); mBinding.widget.speed.startAnimation(ResUtil.getAnim(R.anim.forward)); mBinding.widget.speed.setVisibility(View.VISIBLE); 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 52da10d16..4b1f541ba 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 @@ -194,10 +194,6 @@ public class Players implements Player.Listener, ParseCallback { return ++retry > 2; } - public boolean canAdjustSpeed() { - return !Setting.isTunnel(); - } - public boolean haveTrack(int type) { return exoPlayer != null && ExoUtil.haveTrack(exoPlayer.getCurrentTracks(), type); } @@ -219,11 +215,11 @@ public class Players implements Player.Listener, ParseCallback { } public boolean isLive() { - return getDuration() < 3 * 60 * 1000 || exoPlayer.isCurrentMediaItemLive(); + return getDuration() < 60 * 1000 || exoPlayer.isCurrentMediaItemLive(); } public boolean isVod() { - return getDuration() > 3 * 60 * 1000 && !exoPlayer.isCurrentMediaItemLive(); + return getDuration() > 60 * 1000 && !exoPlayer.isCurrentMediaItemLive(); } public boolean isHard() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 25d02a9ee..e2abf8d3e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -207,7 +207,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List mBinding.control.action.change.setActivated(Setting.isChange()); mBinding.control.action.speed.setText(mPlayers.getSpeedText()); mBinding.control.action.decode.setText(mPlayers.getDecodeText()); - mBinding.control.action.speed.setEnabled(mPlayers.canAdjustSpeed()); mBinding.control.action.home.setVisibility(LiveConfig.isOnly() ? View.GONE : View.VISIBLE); mBinding.video.addOnLayoutChangeListener((view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> mPiP.update(getActivity(), view)); } @@ -948,7 +947,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Override public void onSpeedUp() { - if (mPlayers.isLive() || !mPlayers.isPlaying() || !mPlayers.canAdjustSpeed()) return; + if (mPlayers.isLive() || !mPlayers.isPlaying()) return; mBinding.control.action.speed.setText(mPlayers.setSpeed(Setting.getSpeed())); mBinding.widget.speed.startAnimation(ResUtil.getAnim(R.anim.forward)); mBinding.widget.speed.setVisibility(View.VISIBLE); 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 3e4ef2295..95147e195 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 @@ -371,7 +371,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo ExoUtil.setSubtitleView(mBinding.exo); if (isPort() && ResUtil.isLand(this)) enterFullscreen(); mBinding.control.action.decode.setText(mPlayers.getDecodeText()); - mBinding.control.action.speed.setEnabled(mPlayers.canAdjustSpeed()); mBinding.control.action.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Setting.getReset()]); mBinding.video.addOnLayoutChangeListener((view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> mPiP.update(getActivity(), view)); } @@ -1104,8 +1103,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void setPosition() { - if (mHistory == null) return; - mPlayers.seekTo(Math.max(mHistory.getOpening(), mHistory.getPosition())); + if (mHistory != null) mPlayers.seekTo(Math.max(mHistory.getOpening(), mHistory.getPosition())); } private void checkPortrait() { @@ -1407,7 +1405,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Override public void onSpeedUp() { - if (!mPlayers.isPlaying() || !mPlayers.canAdjustSpeed()) return; + if (!mPlayers.isPlaying()) return; mBinding.control.action.speed.setText(mPlayers.setSpeed(Setting.getSpeed())); mBinding.widget.speed.startAnimation(ResUtil.getAnim(R.anim.forward)); mBinding.widget.speed.setVisibility(View.VISIBLE); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java index 9cde0cbbd..51ec9fb11 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java @@ -174,7 +174,6 @@ public class ControlDialog extends BaseDialog implements ParseAdapter.OnClickLis } public void setPlayer() { - binding.speed.setEnabled(player.canAdjustSpeed()); binding.speed.setValue(Math.max(player.getSpeed(), 0.5f)); binding.player.setText(parent.control.action.player.getText()); binding.decode.setVisibility(parent.control.action.decode.getVisibility());