From 59521f6e4e76bec77d9a6c87f374f8feadb8de53 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sun, 19 Apr 2026 12:25:15 +0800
Subject: [PATCH] Clean code

---
 .../com/fongmi/android/tv/ui/activity/CastActivity.java    | 3 +--
 .../com/fongmi/android/tv/ui/activity/LiveActivity.java    | 3 +--
 .../com/fongmi/android/tv/ui/activity/VideoActivity.java   | 3 +--
 .../com/fongmi/android/tv/ui/base/PlaybackActivity.java    | 7 ++++++-
 .../com/fongmi/android/tv/ui/activity/LiveActivity.java    | 3 +--
 .../com/fongmi/android/tv/ui/activity/VideoActivity.java   | 3 +--
 6 files changed, 11 insertions(+), 11 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 10675fcc9..a2e6397f4 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
@@ -434,10 +434,9 @@ public class CastActivity extends PlaybackActivity implements CustomKeyDownVod.L
     @Override
     public void onSeekEnd(long time) {
         if (player().isEmpty()) return;
-        controller().seekTo(player().getPosition() + time);
-        controller().play();
         mKeyDown.reset();
         hideCenter();
+        seekTo(time);
     }
 
     @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 05ac77d69..6d0ea740d 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
@@ -925,10 +925,9 @@ public class LiveActivity extends PlaybackActivity implements GroupAdapter.OnCli
     }
 
     private void seek(long time) {
-        controller().seekTo(player().getPosition() + time);
-        controller().play();
         mKeyDown.reset();
         hideCenter();
+        seekTo(time);
     }
 
     private void onPaused() {
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 624cf5ebc..5cbcbef5b 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
@@ -1355,10 +1355,9 @@ public class VideoActivity extends PlaybackActivity implements CustomKeyDownVod.
 
     @Override
     public void onSeekEnd(long time) {
-        controller().seekTo(player().getPosition() + time);
-        controller().play();
         mKeyDown.reset();
         hideCenter();
+        seekTo(time);
     }
 
     @Override
diff --git a/app/src/main/java/com/fongmi/android/tv/ui/base/PlaybackActivity.java b/app/src/main/java/com/fongmi/android/tv/ui/base/PlaybackActivity.java
index 661f41bb5..4b2fc911b 100644
--- a/app/src/main/java/com/fongmi/android/tv/ui/base/PlaybackActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/base/PlaybackActivity.java
@@ -143,6 +143,11 @@ public abstract class PlaybackActivity extends BaseActivity implements MediaCont
     protected void onReclaim() {
     }
 
+    protected void seekTo(long time) {
+        controller().seekTo(player().getPosition() + time);
+        controller().play();
+    }
+
     protected void startPlayer(String key, Result result, boolean useParse, long timeout, MediaMetadata metadata) {
         if (result.getDrm() != null && !FrameworkMediaDrm.isCryptoSchemeSupported(result.getDrm().getUUID())) {
             onError(ResUtil.getString(R.string.error_play_drm));
@@ -159,9 +164,9 @@ public abstract class PlaybackActivity extends BaseActivity implements MediaCont
 
     private void bindPlaybackService() {
         startService(new Intent(this, PlaybackService.class));
+        bound = true;
         bindService(new Intent(this, PlaybackService.class).setAction(PlaybackService.LOCAL_BIND_ACTION), this, BIND_AUTO_CREATE);
         buildControllerAsync();
-        bound = true;
     }
 
     private void buildControllerAsync() {
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 c0360f405..818769d01 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
@@ -1041,8 +1041,7 @@ public class LiveActivity extends PlaybackActivity implements CustomKeyDown.List
     @Override
     public void onSeekEnd(long time) {
         if (player().isLive()) return;
-        controller().seekTo(player().getPosition() + time);
-        controller().play();
+        seekTo(time);
     }
 
     @Override
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 e50ffffe2..c2c0de85e 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
@@ -1558,8 +1558,7 @@ public class VideoActivity extends PlaybackActivity implements Clock.Callback, C
 
     @Override
     public void onSeekEnd(long time) {
-        controller().seekTo(player().getPosition() + time);
-        controller().play();
+        seekTo(time);
     }
 
     @Override