From 516223bb6beba543fdd1f5c9d10738374221edb4 Mon Sep 17 00:00:00 2001 From: jiajunhui <309812983@qq.com> Date: Wed, 17 Oct 2018 18:07:42 +0800 Subject: [PATCH] fixed demo --- .../kk/taurus/avplayer/ui/BaseVideoViewActivity.java | 7 +++++++ .../kk/taurus/avplayer/ui/DetailPlayActivity.java | 10 +++++++++- .../avplayer/ui/listplay/ListPlayActivity.java | 4 ++++ .../avplayer/ui/listplay/MultiListActivity.java | 4 ++++ .../avplayer/ui/window/FloatWindowActivity.java | 7 +++++++ .../avplayer/ui/window/WindowVideoViewActivity.java | 12 +++++++++++- 6 files changed, 42 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kk/taurus/avplayer/ui/BaseVideoViewActivity.java b/app/src/main/java/com/kk/taurus/avplayer/ui/BaseVideoViewActivity.java index 5495f4d7..62f8db3d 100644 --- a/app/src/main/java/com/kk/taurus/avplayer/ui/BaseVideoViewActivity.java +++ b/app/src/main/java/com/kk/taurus/avplayer/ui/BaseVideoViewActivity.java @@ -25,6 +25,7 @@ import com.kk.taurus.playerbase.config.PlayerConfig; import com.kk.taurus.playerbase.entity.DataSource; import com.kk.taurus.playerbase.event.OnPlayerEventListener; +import com.kk.taurus.playerbase.player.IPlayer; import com.kk.taurus.playerbase.receiver.IReceiver; import com.kk.taurus.playerbase.receiver.ReceiverGroup; import com.kk.taurus.playerbase.render.AspectRatio; @@ -250,6 +251,9 @@ public void onConfigurationChanged(Configuration newConfig) { @Override protected void onPause() { super.onPause(); + int state = mVideoView.getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; if(mVideoView.isInPlaybackState()){ mVideoView.pause(); }else{ @@ -260,6 +264,9 @@ protected void onPause() { @Override protected void onResume() { super.onResume(); + int state = mVideoView.getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; if(mVideoView.isInPlaybackState()){ if(!userPause) mVideoView.resume(); diff --git a/app/src/main/java/com/kk/taurus/avplayer/ui/DetailPlayActivity.java b/app/src/main/java/com/kk/taurus/avplayer/ui/DetailPlayActivity.java index 04edf955..1eac51fd 100644 --- a/app/src/main/java/com/kk/taurus/avplayer/ui/DetailPlayActivity.java +++ b/app/src/main/java/com/kk/taurus/avplayer/ui/DetailPlayActivity.java @@ -19,6 +19,7 @@ import com.kk.taurus.playerbase.entity.DataSource; import com.kk.taurus.avplayer.base.ISPayer; +import com.kk.taurus.playerbase.player.IPlayer; public class DetailPlayActivity extends AppCompatActivity implements OnHandleListener { @@ -108,6 +109,9 @@ public void onBackPressed() { @Override protected void onResume() { super.onResume(); + int state = ListPlayer.get().getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; if(ListPlayer.get().isInPlaybackState()){ ListPlayer.get().resume(); } @@ -116,7 +120,11 @@ protected void onResume() { @Override protected void onPause() { super.onPause(); - ListPlayer.get().pause(); + int state = ListPlayer.get().getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; + if(ListPlayer.get().isInPlaybackState()) + ListPlayer.get().pause(); } @Override diff --git a/app/src/main/java/com/kk/taurus/avplayer/ui/listplay/ListPlayActivity.java b/app/src/main/java/com/kk/taurus/avplayer/ui/listplay/ListPlayActivity.java index be0379b8..b85099a7 100644 --- a/app/src/main/java/com/kk/taurus/avplayer/ui/listplay/ListPlayActivity.java +++ b/app/src/main/java/com/kk/taurus/avplayer/ui/listplay/ListPlayActivity.java @@ -23,6 +23,7 @@ import com.kk.taurus.avplayer.adapter.ListAdapter; import com.kk.taurus.avplayer.base.ISPayer; +import com.kk.taurus.playerbase.player.IPlayer; public class ListPlayActivity extends AppCompatActivity implements ListAdapter.OnListListener { @@ -129,6 +130,9 @@ public void onToggleScreen() { @Override protected void onPause() { super.onPause(); + int state = ListPlayer.get().getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; if(!toDetail){ ListPlayer.get().pause(); } diff --git a/app/src/main/java/com/kk/taurus/avplayer/ui/listplay/MultiListActivity.java b/app/src/main/java/com/kk/taurus/avplayer/ui/listplay/MultiListActivity.java index 60f2a19e..1f2166cd 100644 --- a/app/src/main/java/com/kk/taurus/avplayer/ui/listplay/MultiListActivity.java +++ b/app/src/main/java/com/kk/taurus/avplayer/ui/listplay/MultiListActivity.java @@ -23,6 +23,7 @@ import com.kk.taurus.avplayer.base.ISPayer; import com.kk.taurus.avplayer.utils.OrientationSensor; +import com.kk.taurus.playerbase.player.IPlayer; public class MultiListActivity extends AppCompatActivity { @@ -121,6 +122,9 @@ public void onToggleScreen() { @Override protected void onPause() { super.onPause(); + int state = ListPlayer.get().getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; if(!toDetail){ ListPlayer.get().pause(); } diff --git a/app/src/main/java/com/kk/taurus/avplayer/ui/window/FloatWindowActivity.java b/app/src/main/java/com/kk/taurus/avplayer/ui/window/FloatWindowActivity.java index 63b31111..f5b6c471 100644 --- a/app/src/main/java/com/kk/taurus/avplayer/ui/window/FloatWindowActivity.java +++ b/app/src/main/java/com/kk/taurus/avplayer/ui/window/FloatWindowActivity.java @@ -24,6 +24,7 @@ import com.kk.taurus.playerbase.assist.OnAssistPlayEventHandler; import com.kk.taurus.playerbase.assist.RelationAssist; import com.kk.taurus.playerbase.entity.DataSource; +import com.kk.taurus.playerbase.player.IPlayer; import com.kk.taurus.playerbase.receiver.ReceiverGroup; import com.kk.taurus.playerbase.window.FloatWindow; import com.kk.taurus.playerbase.window.FloatWindowParams; @@ -227,6 +228,9 @@ public void onBackPressed() { @Override protected void onPause() { super.onPause(); + int state = mAssist.getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; if(mAssist.isInPlaybackState()){ mAssist.pause(); }else{ @@ -237,6 +241,9 @@ protected void onPause() { @Override protected void onResume() { super.onResume(); + int state = mAssist.getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; if(mAssist.isInPlaybackState()){ mAssist.resume(); }else{ diff --git a/app/src/main/java/com/kk/taurus/avplayer/ui/window/WindowVideoViewActivity.java b/app/src/main/java/com/kk/taurus/avplayer/ui/window/WindowVideoViewActivity.java index 8140f81a..73f6dfa0 100644 --- a/app/src/main/java/com/kk/taurus/avplayer/ui/window/WindowVideoViewActivity.java +++ b/app/src/main/java/com/kk/taurus/avplayer/ui/window/WindowVideoViewActivity.java @@ -17,6 +17,7 @@ import com.kk.taurus.avplayer.utils.WindowPermissionCheck; import com.kk.taurus.playerbase.assist.OnVideoViewEventHandler; import com.kk.taurus.playerbase.entity.DataSource; +import com.kk.taurus.playerbase.player.IPlayer; import com.kk.taurus.playerbase.receiver.ReceiverGroup; import com.kk.taurus.playerbase.widget.BaseVideoView; import com.kk.taurus.playerbase.window.FloatWindowParams; @@ -115,13 +116,22 @@ public void activeWindowVideoView(View view){ @Override protected void onPause() { super.onPause(); + int state = mWindowVideoView.getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; mWindowVideoView.pause(); } @Override protected void onResume() { super.onResume(); - mWindowVideoView.resume(); + int state = mWindowVideoView.getState(); + if(state == IPlayer.STATE_PLAYBACK_COMPLETE) + return; + if(mWindowVideoView.isInPlaybackState()) + mWindowVideoView.resume(); + else + mWindowVideoView.rePlay(0); } @Override