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 9ed83bf65..aa0154854 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 @@ -448,7 +448,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List } @Override - public void onSeeking(int time) { + public void onSeeking(long time) { if (mPlayers.isEmpty()) return; mBinding.widget.center.setVisibility(View.VISIBLE); mBinding.widget.exoDuration.setText(mPlayers.getDurationTime()); @@ -458,10 +458,10 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List } @Override - public void onSeekTo(int time) { + public void onSeekTo(long time) { if (mPlayers.isEmpty()) return; mKeyDown.resetTime(); - mPlayers.seekTo(time); + mPlayers.seek(time); showProgress(); onPlay(); } 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 d2332b939..dd59823e3 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 @@ -112,7 +112,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick return LiveConfig.get().getHome(); } - private int getTimeout() { + private long getTimeout() { return getHome().isEmpty() ? Constant.TIMEOUT_PLAY : getHome().getTimeout(); } @@ -826,9 +826,9 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick fetch(); } - private void seekTo(int time) { - mPlayers.seekTo(time); + private void seek(long time) { mKeyDown.resetTime(); + mPlayers.seek(time); showProgress(); hideCenter(); } @@ -907,7 +907,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } @Override - public void onSeeking(int time) { + public void onSeeking(long time) { if (mPlayers.isLive()) return; mBinding.widget.center.setVisibility(View.VISIBLE); mBinding.widget.exoDuration.setText(mPlayers.getDurationTime()); @@ -927,15 +927,15 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } @Override - public void onKeyLeft(int time) { + public void onKeyLeft(long time) { if (mPlayers.isLive()) prevLine(); - else App.post(() -> seekTo(time), 250); + else App.post(() -> seek(time), 250); } @Override - public void onKeyRight(int time) { + public void onKeyRight(long time) { if (mPlayers.isLive()) nextLine(true); - else App.post(() -> seekTo(time), 250); + else App.post(() -> 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 c98ad797c..1ba236cd8 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 @@ -1306,7 +1306,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } @Override - public void onSeeking(int time) { + public void onSeeking(long time) { mBinding.widget.center.setVisibility(View.VISIBLE); mBinding.widget.exoDuration.setText(mPlayers.getDurationTime()); mBinding.widget.exoPosition.setText(mPlayers.getPositionTime(time)); @@ -1315,9 +1315,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } @Override - public void onSeekTo(int time) { - mPlayers.seekTo(time); + public void onSeekTo(long time) { mKeyDown.resetTime(); + mPlayers.seek(time); showProgress(); onPlay(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownCast.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownCast.java index 7f239685a..f4514298e 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownCast.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownCast.java @@ -16,7 +16,7 @@ public class CustomKeyDownCast extends GestureDetector.SimpleOnGestureListener { private final GestureDetector detector; private final Listener listener; private boolean changeSpeed; - private int holdTime; + private long holdTime; public static CustomKeyDownCast create(Activity activity) { return new CustomKeyDownCast(activity); @@ -78,11 +78,11 @@ public class CustomKeyDownCast extends GestureDetector.SimpleOnGestureListener { return true; } - private int addTime() { + private long addTime() { return holdTime = holdTime + Constant.INTERVAL_SEEK; } - private int subTime() { + private long subTime() { return holdTime = holdTime - Constant.INTERVAL_SEEK; } @@ -92,9 +92,9 @@ public class CustomKeyDownCast extends GestureDetector.SimpleOnGestureListener { public interface Listener { - void onSeeking(int time); + void onSeeking(long time); - void onSeekTo(int time); + void onSeekTo(long time); void onSpeedUp(); 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 9843c82ba..02095ac3d 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 @@ -18,7 +18,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { private final GestureDetector detector; private final StringBuilder text; private final Listener listener; - private int holdTime; + private long holdTime; private final Runnable runnable = new Runnable() { @Override @@ -100,11 +100,11 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { return keyCode >= 144 ? keyCode - 144 : keyCode - 7; } - private int addTime() { + private long addTime() { return holdTime = holdTime + Constant.INTERVAL_SEEK; } - private int subTime() { + private long subTime() { return holdTime = holdTime - Constant.INTERVAL_SEEK; } @@ -120,15 +120,15 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { void onFind(String number); - void onSeeking(int time); + void onSeeking(long time); void onKeyUp(); void onKeyDown(); - void onKeyLeft(int time); + void onKeyLeft(long time); - void onKeyRight(int time); + void onKeyRight(long time); void onKeyCenter(); 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 dda943289..fa53df34c 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 @@ -17,7 +17,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { private final Listener listener; private boolean changeSpeed; private boolean full; - private int holdTime; + private long holdTime; public static CustomKeyDownVod create(Activity activity) { return new CustomKeyDownVod(activity); @@ -79,11 +79,11 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { return true; } - private int addTime() { + private long addTime() { return holdTime = holdTime + Constant.INTERVAL_SEEK; } - private int subTime() { + private long subTime() { return holdTime = holdTime - Constant.INTERVAL_SEEK; } @@ -93,9 +93,9 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { public interface Listener { - void onSeeking(int time); + void onSeeking(long time); - void onSeekTo(int time); + void onSeekTo(long time); void onSpeedUp(); 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 93e135d21..67e470fd2 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 @@ -346,7 +346,7 @@ public class Players implements Player.Listener, ParseCallback { return stringToTime(time); } - public void seekTo(int time) { + public void seek(long time) { seekTo(getPosition() + time); }