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 d3323f7ef..9abd1dc90 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 @@ -95,6 +95,7 @@ public class Players implements Player.Listener, ParseCallback, DrawHandler.Call private VideoSize size; private List subs; private String format; + private String key; private String url; private Drm drm; private Sub sub; @@ -185,6 +186,14 @@ public class Players implements Player.Listener, ParseCallback, DrawHandler.Call setMediaItem(); } + public String getKey() { + return key != null ? key : url; + } + + public void setKey(String key) { + this.key = key; + } + public void reset() { removeTimeoutCheck(); retry = 0; @@ -641,7 +650,7 @@ public class Players implements Player.Listener, ParseCallback, DrawHandler.Call @Override public void onTracksChanged(@NonNull Tracks tracks) { if (tracks.isEmpty()) return; - setTrack(Track.find(url)); + setTrack(Track.find(getKey())); PlayerEvent.track(); } diff --git a/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java b/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java index 01993150b..402441ce1 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java @@ -124,7 +124,7 @@ public final class TrackDialog extends BaseDialog implements TrackAdapter.OnClic @Override public void onItemClick(Track item) { - player.setTrack(Arrays.asList(item.key(player.getUrl()).save())); + player.setTrack(Arrays.asList(item.key(player.getKey()).save())); if (item.isAdaptive()) return; dismiss(); } 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 e86420578..788d4d439 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 @@ -540,6 +540,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo mPlayers.start(result, isUseParse(), getSite().isChangeable() ? getSite().getTimeout() : -1); setQualityVisible(result.getUrl().isMulti()); mBinding.swipeLayout.setRefreshing(false); + mPlayers.setKey(getHistoryKey()); mQualityAdapter.addAll(result); }