Merge branch 'FongMi:dev' into dev

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -1231,7 +1231,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
                 hideProgress();
                 mPlayers.reset();
                 setDefaultTrack();
-                mPlayers.prepared();
                 setTrackVisible(true);
                 mHistory.setPlayer(mPlayers.getPlayer());
                 mBinding.widget.size.setText(mPlayers.getSizeText());
@@ -1263,6 +1262,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     private void setDefaultTrack() {
         if (isInitTrack()) {
             setInitTrack(false);
+            mPlayers.prepared();
             mPlayers.setTrack(Track.find(getHistoryKey()));
         }
     }

app/src/main/java/com/fongmi/android/tv/player/Players.java

@@ -14,6 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.media3.common.AudioAttributes;
 import androidx.media3.common.PlaybackException;
 import androidx.media3.common.Player;
+import androidx.media3.common.util.Log;
 import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.exoplayer.analytics.AnalyticsListener;
 import androidx.media3.exoplayer.util.EventLogger;
@@ -353,12 +354,11 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
     }
 
     public void play() {
-        if (isEnd()) return;
+        if (isPlaying() || isEnd()) return;
         session.setActive(true);
-        boolean resume = !isPlaying();
         if (isExo()) playExo();
         if (isIjk()) playIjk();
-        if (hasDanmu() && resume) danmuView.resume();
+        if (hasDanmu()) danmuView.resume();
         setPlaybackState(PlaybackStateCompat.STATE_PLAYING);
     }
 
@@ -489,6 +489,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
 
     private void stopParse() {
         if (parseJob != null) parseJob.stop();
+        parseJob = null;
     }
 
     public void setMediaSource(String url) {

app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -1212,7 +1212,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
                 hideProgress();
                 mPlayers.reset();
                 setDefaultTrack();
-                mPlayers.prepared();
                 setTrackVisible(true);
                 checkPlayImg(mPlayers.isPlaying());
                 mHistory.setPlayer(mPlayers.getPlayer());
@@ -1255,6 +1254,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
     private void setDefaultTrack() {
         if (isInitTrack()) {
             setInitTrack(false);
+            mPlayers.prepared();
             mPlayers.setTrack(Track.find(getHistoryKey()));
         }
     }