update from #1869

app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -33,189 +33,189 @@
         </activity>
         <activity
             android:name=".PlayActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Translucent" />
         <activity
             android:name=".ListVideoActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Translucent" />
         <activity
             android:name=".ListVideo2Activity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Translucent" />
         <activity
             android:name=".DetailPlayer"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".RecyclerView2Activity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DetailListPlayer"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".WebDetailActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".RecyclerViewActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DanmkuVideoActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".FragmentVideoActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DetailMoreTypeActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".InputUrlDetailActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".PlayEmptyControlActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DetailControlActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DetailFilterActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".PlayPickActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".AutoPlayRecyclerViewActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ScrollingActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:label="@string/title_activity_scrolling"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".WindowActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".EmptyActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".utils.floatUtil.FloatActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DetailADPlayer"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DetailADPlayer2"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ListMultiVideoActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Translucent" />
 
         <activity
             android:name=".ListADVideoActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Translucent" />
 
 
         <activity
             android:name=".ListADVideoActivity2"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Translucent" />
 
         <activity
             android:name=".exo.DetailExoListPlayer"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".simple.SimplePlayer"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/Theme.AppCompat.Full"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".simple.SimpleDetailActivityMode1"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
         <activity
             android:name=".simple.SimpleDetailActivityMode2"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".simple.SimpleListVideoActivityMode1"
             android:theme="@style/Theme.AppCompat.Translucent"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".simple.SimpleListVideoActivityMode2"
             android:theme="@style/Theme.AppCompat.Translucent"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".simple.SimpleActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".switchplay.SwitchListVideoActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/Theme.AppCompat.Transitions"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".switchplay.SwitchDetailActivity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/Theme.AppCompat.Transitions"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".RecyclerView3Activity"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/Theme.AppCompat.Transitions"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".DetailNormalActivityPlayer"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/Theme.AppCompat.Transitions"
             android:screenOrientation="portrait" />
         <activity
             android:name=".DetailDownloadPlayer"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/Theme.AppCompat.Transitions"
             android:screenOrientation="portrait" />
 
         <activity
             android:name=".AudioDetailPlayer"
-            android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:theme="@style/Theme.AppCompat.Transitions"
             android:screenOrientation="portrait" />
 

app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java

@@ -98,7 +98,7 @@ public class DetailPlayer extends AppCompatActivity {
         orientationUtils.setEnable(false);
 
         /**仅仅横屏旋转，不变直*/
-        orientationUtils.setOnlyRotateLand(true);
+        //orientationUtils.setOnlyRotateLand(true);
 
         Map<String, String> header = new HashMap<>();
         header.put("ee", "33");
@@ -108,7 +108,7 @@ public class DetailPlayer extends AppCompatActivity {
                 .setIsTouchWiget(true)
                 .setRotateViewAuto(false)
                 //仅仅横屏旋转，不变直
-                .setOnlyRotateLand(true)
+                //.setOnlyRotateLand(true)
                 .setLockLand(false)
                 .setAutoFullWithSize(false)
                 .setShowFullAnimation(false)

app/src/main/java/com/example/gsyvideoplayer/simple/SimpleDetailActivityMode1.java

@@ -50,7 +50,7 @@ public class SimpleDetailActivityMode1 extends GSYBaseActivityDetail<StandardGSY
                 .setCacheWithPlay(true)
                 .setVideoTitle("这里是一个竖直方向的视频")
                 .setIsTouchWiget(true)
-                .setAutoFullWithSize(true)
+                //.setAutoFullWithSize(true)
                 .setRotateViewAuto(false)
                 .setLockLand(false)
                 .setShowFullAnimation(false)//打开动画

app/src/main/java/com/example/gsyvideoplayer/simple/SimpleDetailActivityMode2.java

@@ -55,7 +55,7 @@ public class SimpleDetailActivityMode2 extends AppCompatActivity {
                 .setIsTouchWiget(true)
                 .setRotateViewAuto(false)
                 .setLockLand(false)
-                .setAutoFullWithSize(true)
+                .setAutoFullWithSize(false)
                 .setShowFullAnimation(false)
                 .setNeedLockFull(true)
                 .setUrl(url)

doc/QUESTION.md

@@ -107,7 +107,7 @@ GSYVideoManager.instance().setOptionModelList(list);
 ```
 <activity
     android:name=".PlayActivity"
-    android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+    android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
     android:screenOrientation="portrait" />
 ```
 

doc/USE.md

@@ -5,7 +5,7 @@
 ```
 <activity
     android:name=".xxxxx"
-    android:configChanges="keyboard|orientation|keyboardHidden|screenSize|uiMode"
+    android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
     android:screenOrientation="portrait" />
 
 ```

gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/utils/OrientationUtils.java

@@ -2,8 +2,10 @@ package com.shuyu.gsyvideoplayer.utils;
 
 import android.app.Activity;
 import android.content.pm.ActivityInfo;
+import android.os.Build;
 import android.provider.Settings;
 import android.view.OrientationEventListener;
+import android.view.Surface;
 
 import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer;
 
@@ -43,6 +45,7 @@ public class OrientationUtils {
     public OrientationUtils(Activity activity, GSYBaseVideoPlayer gsyVideoPlayer) {
         this.mActivity = activity;
         this.mVideoPlayer = gsyVideoPlayer;
+        initGravity(activity);
         init();
     }
 
@@ -76,7 +79,7 @@ public class OrientationUtils {
                         if (mIsLand > LAND_TYPE_NULL) {
                             if (!mIsOnlyRotateLand) {
                                 mScreenType = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-                                mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                                 if (mVideoPlayer.getFullscreenButton() != null) {
                                     if (mVideoPlayer.isIfCurrentIsFullscreen()) {
                                         mVideoPlayer.getFullscreenButton().setImageResource(mVideoPlayer.getShrinkImageRes());
@@ -103,7 +106,7 @@ public class OrientationUtils {
                     } else {
                         if (!(mIsLand == LAND_TYPE_NORMAL)) {
                             mScreenType = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-                            mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
                             if (mVideoPlayer.getFullscreenButton() != null) {
                                 mVideoPlayer.getFullscreenButton().setImageResource(mVideoPlayer.getShrinkImageRes());
                             }
@@ -124,7 +127,7 @@ public class OrientationUtils {
                         }
                     } else if (!(mIsLand == LAND_TYPE_REVERSE)) {
                         mScreenType = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-                        mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
+                        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
                         if (mVideoPlayer.getFullscreenButton() != null) {
                             mVideoPlayer.getFullscreenButton().setImageResource(mVideoPlayer.getShrinkImageRes());
                         }
@@ -137,6 +140,38 @@ public class OrientationUtils {
         mOrientationEventListener.enable();
     }
 
+
+    private void initGravity(Activity activity) {
+        if (mIsLand == LAND_TYPE_NULL) {
+            int defaultRotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+            if (defaultRotation == Surface.ROTATION_0) {
+                // 竖向为正方向。 如：手机、小米平板
+                mIsLand = LAND_TYPE_NULL;
+                mScreenType = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+            } else if (defaultRotation == Surface.ROTATION_270) {
+                // 横向为正方向。 如：三星、sony平板
+                mIsLand = LAND_TYPE_REVERSE;
+                mScreenType = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
+            } else {
+                // 未知方向
+                mIsLand = LAND_TYPE_NORMAL;
+                mScreenType = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+            }
+        }
+    }
+
+    private void setRequestedOrientation(int requestedOrientation) {
+        try {
+            mActivity.setRequestedOrientation(requestedOrientation);
+        } catch (IllegalStateException exception) {
+            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O || Build.VERSION.SDK_INT == Build.VERSION_CODES.O_MR1) {
+                Debuger.printfError("OrientationUtils", exception);
+            } else {
+                exception.printStackTrace();
+            }
+        }
+    }
+
     /**
      * 点击切换的逻辑，比如竖屏的时候点击了就是切换到横屏不会受屏幕的影响
      */
@@ -152,7 +187,7 @@ public class OrientationUtils {
             } else {
                 mScreenType = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
             }
-            mActivity.setRequestedOrientation(mScreenType);
+            setRequestedOrientation(mScreenType);
             if (mVideoPlayer.getFullscreenButton() != null) {
                 mVideoPlayer.getFullscreenButton().setImageResource(mVideoPlayer.getShrinkImageRes());
             }
@@ -160,7 +195,7 @@ public class OrientationUtils {
             mClickLand = false;
         } else {
             mScreenType = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-            mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
             if (mVideoPlayer.getFullscreenButton() != null) {
                 if (mVideoPlayer.isIfCurrentIsFullscreen()) {
                     mVideoPlayer.getFullscreenButton().setImageResource(mVideoPlayer.getShrinkImageRes());
@@ -180,7 +215,7 @@ public class OrientationUtils {
     public int backToProtVideo() {
         if (mIsLand > LAND_TYPE_NULL) {
             mClick = true;
-            mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
             if (mVideoPlayer != null && mVideoPlayer.getFullscreenButton() != null)
                 mVideoPlayer.getFullscreenButton().setImageResource(mVideoPlayer.getEnlargeImageRes());
             mIsLand = LAND_TYPE_NULL;