From 2cdd706ff0547f9feed99a7447ecf26d9bd9d573 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 17 Dec 2025 00:51:35 +0800 Subject: [PATCH] Clean code --- .../fongmi/android/tv/ui/activity/CastActivity.java | 13 +++++-------- .../fongmi/android/tv/ui/activity/LiveActivity.java | 11 ++--------- .../android/tv/ui/activity/VideoActivity.java | 13 +++++-------- .../android/tv/ui/custom/CustomKeyDownLive.java | 5 +---- .../android/tv/ui/custom/CustomKeyDownVod.java | 10 ++++------ 5 files changed, 17 insertions(+), 35 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 7e2e7ceb2..dd85a1dcc 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 @@ -457,27 +457,24 @@ public class CastActivity extends BaseActivity implements CustomKeyDownVod.Liste } @Override - public void onSeekTo(long time) { + public void onSeekEnd(long time) { if (mPlayers.isEmpty()) return; - mKeyDown.resetTime(); mPlayers.seek(time); - showProgress(); - onPlay(); } @Override public void onSpeedUp() { 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); + mBinding.widget.speed.startAnimation(ResUtil.getAnim(R.anim.forward)); + mBinding.control.speed.setText(mPlayers.setSpeed(Setting.getSpeed())); } @Override public void onSpeedEnd() { - mBinding.control.speed.setText(mPlayers.setSpeed(1.0f)); - mBinding.widget.speed.setVisibility(View.GONE); mBinding.widget.speed.clearAnimation(); + mBinding.widget.speed.setVisibility(View.GONE); + mBinding.control.speed.setText(mPlayers.setSpeed(1.0f)); } @Override 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 31cd11b35..3add8b9fa 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 @@ -906,13 +906,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick fetch(); } - private void seek(long time) { - mKeyDown.resetTime(); - mPlayers.seek(time); - showProgress(); - hideCenter(); - } - private void onPaused() { mPlayers.pause(); } @@ -988,13 +981,13 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Override public void onKeyLeft(long time) { if (mPlayers.isLive()) prevLine(); - else App.post(() -> seek(time), 250); + else App.post(() -> mPlayers.seek(time), 250); } @Override public void onKeyRight(long time) { if (mPlayers.isLive()) nextLine(true); - else App.post(() -> seek(time), 250); + else App.post(() -> mPlayers.seek(time), 250); } @Override 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 eef457442..e7ab263cc 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 @@ -1309,26 +1309,23 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } @Override - public void onSeekTo(long time) { - mKeyDown.resetTime(); + public void onSeekEnd(long time) { mPlayers.seek(time); - showProgress(); - onPlay(); } @Override public void onSpeedUp() { 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); + mBinding.widget.speed.startAnimation(ResUtil.getAnim(R.anim.forward)); + mBinding.control.speed.setText(mPlayers.setSpeed(Setting.getSpeed())); } @Override public void onSpeedEnd() { - mBinding.control.speed.setText(mPlayers.setSpeed(mHistory.getSpeed())); - mBinding.widget.speed.setVisibility(View.GONE); mBinding.widget.speed.clearAnimation(); + mBinding.widget.speed.setVisibility(View.GONE); + mBinding.control.speed.setText(mPlayers.setSpeed(mHistory.getSpeed())); } @Override diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java index 824535aaa..1326bc4b7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java @@ -45,6 +45,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { } public void onKeyDown(KeyEvent event) { + holdTime = 0; if (listener.dispatch(true)) check(event); } @@ -101,10 +102,6 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { return holdTime = holdTime - Constant.INTERVAL_SEEK; } - public void resetTime() { - holdTime = 0; - } - public interface Listener { boolean dispatch(boolean check); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java index 7f68d66eb..4f0c8b4c0 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java @@ -42,6 +42,8 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { } public boolean onKeyDown(KeyEvent event) { + changeSpeed = false; + holdTime = 0; check(event); return true; } @@ -52,7 +54,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { } else if (KeyUtil.isActionDown(event) && KeyUtil.isRightKey(event)) { listener.onSeeking(addTime()); } else if (KeyUtil.isActionUp(event) && (KeyUtil.isLeftKey(event) || KeyUtil.isRightKey(event))) { - App.post(() -> listener.onSeekTo(holdTime), 250); + App.post(() -> listener.onSeekEnd(holdTime), 250); } else if (KeyUtil.isActionUp(event) && KeyUtil.isUpKey(event)) { if (changeSpeed) listener.onSpeedEnd(); else listener.onKeyUp(); @@ -87,15 +89,11 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { return holdTime = holdTime - Constant.INTERVAL_SEEK; } - public void resetTime() { - holdTime = 0; - } - public interface Listener { void onSeeking(long time); - void onSeekTo(long time); + void onSeekEnd(long time); void onSpeedUp();