From 442c12fdc548d38e9d247e44b9a1a017b8df632b Mon Sep 17 00:00:00 2001
From: shuyu <359369982@qq.com>
Date: Tue, 20 Dec 2016 12:29:42 +0800
Subject: [PATCH] =?UTF-8?q?1.4.8=20=E9=94=81=E5=AE=9A=E5=B1=8F=E5=B9=95?=
 =?UTF-8?q?=E6=8C=89=E9=94=AE=E5=A2=9E=E5=8A=A0=E9=94=81=E5=AE=9A=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=95=E6=97=8B=E8=BD=AC=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gsyvideoplayer/video/GSYBaseVideoPlayer.java    | 13 +++++++++----
 .../video/StandardGSYVideoPlayer.java               |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java
index 140b19d..8ed4ad0 100644
--- a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java
+++ b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java
@@ -124,7 +124,7 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia
 
     protected Bitmap mFullPauseBitmap = null;//暂停时的全屏图片；
 
-    private OrientationUtils mOrientationUtils; //旋转工具类
+    protected OrientationUtils mOrientationUtils; //旋转工具类
 
     private Handler mHandler = new Handler();
 
@@ -188,14 +188,14 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia
         gsyVideoPlayer.setLayoutParams(lp);
         gsyVideoPlayer.setIfCurrentIsFullscreen(true);
         mOrientationUtils = new OrientationUtils((Activity) context, gsyVideoPlayer);
-
         mOrientationUtils.setEnable(mRotateViewAuto);
+        gsyVideoPlayer.mOrientationUtils = mOrientationUtils;
 
         if (isShowFullAnimation()) {
             mHandler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    if (mLockLand) {
+                    if (mLockLand && mOrientationUtils.getIsLand() != 1) {
                         mOrientationUtils.resolveByClick();
                     }
                     gsyVideoPlayer.setVisibility(VISIBLE);
@@ -359,8 +359,10 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia
         mIfCurrentIsFullscreen = false;
         int delay = mOrientationUtils.backToProtVideo();
         mOrientationUtils.setEnable(false);
-        if (mOrientationUtils != null)
+        if (mOrientationUtils != null) {
             mOrientationUtils.releaseListener();
+            mOrientationUtils = null;
+        }
         mHandler.postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -640,6 +642,9 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia
      */
     public void setRotateViewAuto(boolean rotateViewAuto) {
         this.mRotateViewAuto = rotateViewAuto;
+        if (mOrientationUtils != null) {
+            mOrientationUtils.setEnable(rotateViewAuto);
+        }
     }
 
     public boolean isLockLand() {
diff --git a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java
index 2b43e53..8a1e838 100644
--- a/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java
+++ b/gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/StandardGSYVideoPlayer.java
@@ -146,9 +146,13 @@ public class StandardGSYVideoPlayer extends GSYVideoPlayer {
                 if (mLockCurScreen) {
                     mLockScreen.setImageResource(R.drawable.unlock);
                     mLockCurScreen = false;
+                    if (mOrientationUtils != null)
+                        mOrientationUtils.setEnable(mRotateViewAuto);
                 } else {
                     mLockScreen.setImageResource(R.drawable.lock);
                     mLockCurScreen = true;
+                    if (mOrientationUtils != null)
+                        mOrientationUtils.setEnable(false);
                     hideAllWidget();
                 }
             }
-- 
GitLab