update from CarGuo#1869

hudawei996 · Jan 2, 2020 · 327545b · 327545b
1 parent d6707d9
commit 327545b
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 52 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/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" />
 

diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java
@@ -98,7 +98,7 @@ protected void onCreate(Bundle savedInstanceState) {
         orientationUtils.setEnable(false);
 
         /**仅仅横屏旋转，不变直*/
-        orientationUtils.setOnlyRotateLand(true);
+        //orientationUtils.setOnlyRotateLand(true);
 
         Map<String, String> header = new HashMap<>();
         header.put("ee", "33");
@@ -108,7 +108,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 .setIsTouchWiget(true)
                 .setRotateViewAuto(false)
                 //仅仅横屏旋转，不变直
-                .setOnlyRotateLand(true)
+                //.setOnlyRotateLand(true)
                 .setLockLand(false)
                 .setAutoFullWithSize(false)
                 .setShowFullAnimation(false)

diff --git a/app/src/main/java/com/example/gsyvideoplayer/simple/SimpleDetailActivityMode1.java b/app/src/main/java/com/example/gsyvideoplayer/simple/SimpleDetailActivityMode1.java
@@ -50,7 +50,7 @@ public GSYVideoOptionBuilder getGSYVideoOptionBuilder() {
                 .setCacheWithPlay(true)
                 .setVideoTitle("这里是一个竖直方向的视频")
                 .setIsTouchWiget(true)
-                .setAutoFullWithSize(true)
+                //.setAutoFullWithSize(true)
                 .setRotateViewAuto(false)
                 .setLockLand(false)
                 .setShowFullAnimation(false)//打开动画

diff --git a/app/src/main/java/com/example/gsyvideoplayer/simple/SimpleDetailActivityMode2.java b/app/src/main/java/com/example/gsyvideoplayer/simple/SimpleDetailActivityMode2.java
@@ -55,7 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 .setIsTouchWiget(true)
                 .setRotateViewAuto(false)
                 .setLockLand(false)
-                .setAutoFullWithSize(true)
+                .setAutoFullWithSize(false)
                 .setShowFullAnimation(false)
                 .setNeedLockFull(true)
                 .setUrl(url)

diff --git a/doc/QUESTION.md b/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" />
 ```
 

diff --git a/doc/USE.md b/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" />
 
 ```