From 0785daed0781526d837b9cda2cf2d05c0de3bcd3 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 3 Jun 2025 20:38:30 +0800 Subject: [PATCH] Fix bug --- .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 6 +++--- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 7 +++---- .../fongmi/android/tv/ui/custom/CustomKeyDownLive.java | 8 ++++---- .../com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java | 8 ++++---- 4 files changed, 14 insertions(+), 15 deletions(-) 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 c6b0cccf3..20de00c7b 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 @@ -994,7 +994,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } @Override - public void onSeek(int time) { + public void onSeek(long time) { if (mPlayers.isLive()) return; mBinding.widget.action.setImageResource(time > 0 ? R.drawable.ic_widget_forward : R.drawable.ic_widget_rewind); mBinding.widget.time.setText(mPlayers.getPositionTime(time)); @@ -1003,10 +1003,10 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } @Override - public void onSeekEnd(int time) { + public void onSeekEnd(long time) { if (mPlayers.isLive()) return; mBinding.widget.seek.setVisibility(View.GONE); - mPlayers.seekTo(time); + mPlayers.seek(time); showProgress(); onPlay(); } 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 5986b6b84..f00b0b2ea 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 @@ -111,7 +111,6 @@ import java.util.Objects; import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; public class VideoActivity extends BaseActivity implements Clock.Callback, CustomKeyDownVod.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, QualityAdapter.OnClickListener, QuickAdapter.OnClickListener, ParseAdapter.OnClickListener, CastDialog.Listener, InfoDialog.Listener { @@ -1469,7 +1468,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } @Override - public void onSeek(int time) { + public void onSeek(long time) { mBinding.widget.action.setImageResource(time > 0 ? R.drawable.ic_widget_forward : R.drawable.ic_widget_rewind); mBinding.widget.time.setText(mPlayers.getPositionTime(time)); mBinding.widget.seek.setVisibility(View.VISIBLE); @@ -1477,9 +1476,9 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } @Override - public void onSeekEnd(int time) { + public void onSeekEnd(long time) { mBinding.widget.seek.setVisibility(View.GONE); - mPlayers.seekTo(time); + mPlayers.seek(time); showProgress(); onPlay(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java index 50d6895a5..bc8e8df38 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java @@ -33,7 +33,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { private boolean lock; private float bright; private float volume; - private int time; + private long time; public static CustomKeyDownLive create(Activity activity, View videoView) { return new CustomKeyDownLive(activity, videoView); @@ -90,7 +90,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { float deltaX = e2.getX() - e1.getX(); float deltaY = e1.getY() - e2.getY(); if (touch) checkFunc(distanceX, distanceY, e2); - if (changeTime) listener.onSeek(time = (int) deltaX * 50); + if (changeTime) listener.onSeek(time = (long) (deltaX * 50)); if (changeBright) setBright(deltaY); if (changeVolume) setVolume(deltaY); return true; @@ -196,9 +196,9 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { void onFlingRight(); - void onSeek(int time); + void onSeek(long time); - void onSeekEnd(int time); + void onSeekEnd(long time); void onSingleTap(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java index 8d66d90b6..55ac21373 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java @@ -28,7 +28,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { private boolean lock; private float bright; private float volume; - private int time; + private long time; public static CustomKeyDownVod create(Activity activity, View videoView) { return new CustomKeyDownVod(activity, videoView); @@ -84,7 +84,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { float deltaX = e2.getX() - e1.getX(); float deltaY = e1.getY() - e2.getY(); if (touch) checkFunc(distanceX, distanceY, e2); - if (changeTime) listener.onSeek(time = (int) deltaX * 50); + if (changeTime) listener.onSeek(time = (long) deltaX * 50); if (changeBright) setBright(deltaY); if (changeVolume) setVolume(deltaY); return true; @@ -156,9 +156,9 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { void onVolumeEnd(); - void onSeek(int time); + void onSeek(long time); - void onSeekEnd(int time); + void onSeekEnd(long time); void onSingleTap();