From 0549b944b7b64efd8128259d4a3d892727d8d440 Mon Sep 17 00:00:00 2001 From: shuyu <359369982@qq.com> Date: Mon, 5 Feb 2018 20:41:45 +0800 Subject: [PATCH] fix demo --- .../gsyvideoplayer/DanmkuVideoActivity.java | 2 +- .../DetailMoreTypeActivity.java | 2 +- .../example/gsyvideoplayer/DetailPlayer.java | 2 +- .../InputUrlDetailActivity.java | 2 +- .../gsyvideoplayer/ScrollingActivity.java | 2 +- .../adapter/ListNormalAdapter.java | 2 +- .../GSYBaseADActivityDetail.java | 2 +- .../gsyvideoplayer/GSYBaseActivityDetail.java | 2 +- .../video/base/GSYBaseVideoPlayer.java | 26 +++++++++++-------- 9 files changed, 23 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/example/gsyvideoplayer/DanmkuVideoActivity.java b/app/src/main/java/com/example/gsyvideoplayer/DanmkuVideoActivity.java index 7a544b4..5922cbb 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DanmkuVideoActivity.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DanmkuVideoActivity.java @@ -175,7 +175,7 @@ public class DanmkuVideoActivity extends AppCompatActivity { super.onConfigurationChanged(newConfig); //如果旋转了就全屏 if (isPlay && !isPause) { - danmakuVideoPlayer.onConfigurationChanged(this, newConfig, orientationUtils); + danmakuVideoPlayer.onConfigurationChanged(this, newConfig, orientationUtils, true, true); } } diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailMoreTypeActivity.java b/app/src/main/java/com/example/gsyvideoplayer/DetailMoreTypeActivity.java index e6ab177..9f70813 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DetailMoreTypeActivity.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DetailMoreTypeActivity.java @@ -205,7 +205,7 @@ public class DetailMoreTypeActivity extends AppCompatActivity { super.onConfigurationChanged(newConfig); //如果旋转了就全屏 if (isPlay && !isPause) { - detailPlayer.onConfigurationChanged(this, newConfig, orientationUtils); + detailPlayer.onConfigurationChanged(this, newConfig, orientationUtils, true, true); } //竖屏全屏 orientationUtils.setEnable(false); diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java index 277d541..04372b1 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java +++ b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java @@ -226,7 +226,7 @@ public class DetailPlayer extends AppCompatActivity { super.onConfigurationChanged(newConfig); //如果旋转了就全屏 if (isPlay && !isPause) { - detailPlayer.onConfigurationChanged(this, newConfig, orientationUtils); + detailPlayer.onConfigurationChanged(this, newConfig, orientationUtils, true, true); } } diff --git a/app/src/main/java/com/example/gsyvideoplayer/InputUrlDetailActivity.java b/app/src/main/java/com/example/gsyvideoplayer/InputUrlDetailActivity.java index e69d72c..d23075c 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/InputUrlDetailActivity.java +++ b/app/src/main/java/com/example/gsyvideoplayer/InputUrlDetailActivity.java @@ -173,7 +173,7 @@ public class InputUrlDetailActivity extends AppCompatActivity { super.onConfigurationChanged(newConfig); //如果旋转了就全屏 if (isPlay && !isPause) { - detailPlayer.onConfigurationChanged(this, newConfig, orientationUtils); + detailPlayer.onConfigurationChanged(this, newConfig, orientationUtils, true, true); } } diff --git a/app/src/main/java/com/example/gsyvideoplayer/ScrollingActivity.java b/app/src/main/java/com/example/gsyvideoplayer/ScrollingActivity.java index 75fc0e8..4b7b888 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/ScrollingActivity.java +++ b/app/src/main/java/com/example/gsyvideoplayer/ScrollingActivity.java @@ -190,7 +190,7 @@ public class ScrollingActivity extends AppCompatActivity { super.onConfigurationChanged(newConfig); //如果旋转了就全屏 if (isPlay && !isPause) { - detailPlayer.onConfigurationChanged(this, newConfig, orientationUtils); + detailPlayer.onConfigurationChanged(this, newConfig, orientationUtils, true, true); } } diff --git a/app/src/main/java/com/example/gsyvideoplayer/adapter/ListNormalAdapter.java b/app/src/main/java/com/example/gsyvideoplayer/adapter/ListNormalAdapter.java index e03955b..e9a3197 100644 --- a/app/src/main/java/com/example/gsyvideoplayer/adapter/ListNormalAdapter.java +++ b/app/src/main/java/com/example/gsyvideoplayer/adapter/ListNormalAdapter.java @@ -283,7 +283,7 @@ public class ListNormalAdapter extends BaseAdapter { public void onConfigurationChanged(Activity activity, Configuration newConfig) { //如果旋转了就全屏 if (isPlay && curPlayer != null && orientationUtils != null) { - curPlayer.onConfigurationChanged(activity, newConfig, orientationUtils); + curPlayer.onConfigurationChanged(activity, newConfig, orientationUtils, false, true); } } diff --git a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java index d76a793..c67c44a 100644 --- a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java +++ b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/GSYBaseADActivityDetail.java @@ -142,7 +142,7 @@ public abstract class GSYBaseADActivityDetail extend super.onConfigurationChanged(newConfig); //如果旋转了就全屏 if (isPlay && !isPause) { - getGSYVideoPlayer().onConfigurationChanged(this, newConfig, orientationUtils); + getGSYVideoPlayer().onConfigurationChanged(this, newConfig, orientationUtils, hideActionBarWhenFull(), hideStatusBarWhenFull()); } } diff --git a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java index f7e97f9..0ed429f 100644 --- a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java +++ b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java @@ -455,11 +455,25 @@ public abstract class GSYBaseVideoPlayer extends GSYVideoControlView { * @param orientationUtils 旋转工具类 */ public void onConfigurationChanged(Activity activity, Configuration newConfig, OrientationUtils orientationUtils) { + onConfigurationChanged(activity, newConfig, orientationUtils, true, true); + + } + + /** + * 旋转处理 + * + * @param activity 页面 + * @param newConfig 配置 + * @param orientationUtils 旋转工具类 + * @param hideActionBar 是否隐藏actionbar + * @param hideStatusBar 是否隐藏statusbar + */ + public void onConfigurationChanged(Activity activity, Configuration newConfig, OrientationUtils orientationUtils, boolean hideActionBar, boolean hideStatusBar) { super.onConfigurationChanged(newConfig); //如果旋转了就全屏 if (newConfig.orientation == ActivityInfo.SCREEN_ORIENTATION_USER) { if (!isIfCurrentIsFullscreen()) { - startWindowFullscreen(activity, true, true); + startWindowFullscreen(activity, hideActionBar, hideStatusBar); } } else { //新版本isIfCurrentIsFullscreen的标志位内部提前设置了，所以不会和手动点击冲突 @@ -473,16 +487,6 @@ public abstract class GSYBaseVideoPlayer extends GSYVideoControlView { } - /** - * 利用window层播放全屏效果 - * - * @param context - */ - @SuppressWarnings("ResourceType, unchecked") - public GSYBaseVideoPlayer startWindowFullscreen(final Context context) { - return startWindowFullscreen(context, mActionBar, mStatusBar); - } - /** * 利用window层播放全屏效果 * -- GitLab