2.1.23新增非旋转横竖屏全屏播放

hty527 · hty527 · commit 04970d1266ed · 2023-05-26T17:34:08.000+08:00
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@
 #### 三、SDK集成
 * 建议集成前先[下载apk][2]体验，找到自己想要实现的功能模块，后续集成可参考demo源码。
 
-[2]:https://amuse-1259486925.cos.ap-hongkong.myqcloud.com/apk/iPlayer-2.1.22.apk?version=2.1.22 "下载apk"
+[2]:https://amuse-1259486925.cos.ap-hongkong.myqcloud.com/apk/iPlayer-2.1.23.apk?version=2.1.23 "下载apk"
 
 ##### 1、项目根build.gradle配置</br>
 ```
@@ -39,17 +39,17 @@
 ```
     dependencies {
         //播放器(无UI交互)
-        implementation 'com.github.hty527.iPlayer:iplayer:2.1.22'
+        implementation 'com.github.hty527.iPlayer:iplayer:2.1.23'
         //UI交互组件,可根据需要使用
-        implementation 'com.github.hty527.iPlayer:widget:2.1.22'
+        implementation 'com.github.hty527.iPlayer:widget:2.1.23'
 
         //音视频预缓存+边播边存,根据需要使用
-        //implementation 'com.github.hty527.iPlayer:cache:2.1.22'
+        //implementation 'com.github.hty527.iPlayer:cache:2.1.23'
 
         //ijk音视频解码器,根据需要使用
-        //implementation 'com.github.hty527.iPlayer:ijk:2.1.22'
+        //implementation 'com.github.hty527.iPlayer:ijk:2.1.23'
         //exo音视频解码器,根据需要使用
-        //implementation 'com.github.hty527.iPlayer:exo:2.1.22'
+        //implementation 'com.github.hty527.iPlayer:exo:2.1.23'
         //选择exo音视频解码器时需引用
         //以下为必须项，SDK内部已引用，集成时无需引用
         //implementation 'com.google.android.exoplayer:exoplayer:2.18.1'//（必需）
diff --git a/app/build.gradle b/app/build.gradle
@@ -78,26 +78,26 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
 
     //播放器SDK
-    implementation 'com.github.hty527.iPlayer:iplayer:2.1.22'
+//    implementation 'com.github.hty527.iPlayer:iplayer:2.1.23'
     //UI交互组件,可根据需要使用
-    implementation 'com.github.hty527.iPlayer:widget:2.1.22'
+//    implementation 'com.github.hty527.iPlayer:widget:2.1.23'
     //音视频预缓存+边播边存,根据需要使用
-    implementation 'com.github.hty527.iPlayer:cache:2.1.22'
+//    implementation 'com.github.hty527.iPlayer:cache:2.1.23'
     //ijk音视频解码器,根据自己需要实现
-    implementation 'com.github.hty527.iPlayer:ijk:2.1.22'
+//    implementation 'com.github.hty527.iPlayer:ijk:2.1.23'
     //exo音视频解码器,根据自己需要实现
-    implementation 'com.github.hty527.iPlayer:exo:2.1.22'
+//    implementation 'com.github.hty527.iPlayer:exo:2.1.23'
 
 //    //播放器SDK
-//    implementation project(':iplayer')
+    implementation project(':iplayer')
 //    //UI交互组件
-//    implementation project(':widget')
+    implementation project(':widget')
 //    //音视频缓存
-//    implementation project(':cache')
+    implementation project(':cache')
 //    //ijk音视频解码器
-//    implementation project(':ijk')
+    implementation project(':ijk')
 //    //exo音视频解码器
-//    implementation project(':exo')
+    implementation project(':exo')
 
     //以下为必须项，SDK内部已引用
     //implementation 'com.google.android.exoplayer:exoplayer:2.18.1'//（必需）
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -124,6 +124,12 @@
             android:screenOrientation="portrait"
             android:configChanges="orientation|screenSize">
         </activity>
+        <!--Pad和Tv-->
+        <activity android:name="com.android.videoplayer.ui.activity.PadActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
+            android:configChanges="keyboardHidden|orientation|screenSize|screenLayout">
+        </activity>
         <!--权限申请-悬浮窗-->
         <activity android:name="com.android.videoplayer.ui.activity.WindowPermissionActivity"
             android:launchMode="singleTask"
diff --git a/app/src/main/java/com/android/videoplayer/ui/activity/MainActivity.java b/app/src/main/java/com/android/videoplayer/ui/activity/MainActivity.java
@@ -95,48 +95,52 @@ public void onItemClick(View view, int position, long itemId) {
                             intent=new Intent(MainActivity.this, VideoListPlayerActivity.class);
                             intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_title_list,"连续播放一个列表示例"));
                             break;
-                        case 8://列表自动播放(无缝转场)
+                        case 8://Pad和TV
+                            intent=new Intent(MainActivity.this, PadActivity.class);
+                            intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_item_pad,"Pad和TV"));
+                            break;
+                        case 9://列表自动播放(无缝转场)
                             intent = new Intent(MainActivity.this, PagerListActivity.class);
                             intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_title_auto,"列表自动播放"));
                             intent.putExtra("auto_play","1");
                             break;
-                        case 9://列表点击播放(无缝转场)
+                        case 10://列表点击播放(无缝转场)
                             intent = new Intent(MainActivity.this, PagerListActivity.class);
                             intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_title_click,"列表点击播放"));
                             intent.putExtra("auto_play","0");
                             break;
-                        case 10://Activity小窗口
+                        case 11://Activity小窗口
                             intent = new Intent(MainActivity.this, WindowPlayerActivity.class);
                             intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_title_window,"Activity局部悬浮窗"));
                             break;
-                        case 11://全局悬浮窗
+                        case 12://全局悬浮窗
                             intent = new Intent(MainActivity.this, WindowGlobalPlayerActivity.class);
                             intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_title_goable_window,"全局悬浮窗"));
                             break;
-                        case 12://任意界面开启窗口播放器
+                        case 13://任意界面开启窗口播放器
                             startMiniWindowPlayer();
                             break;
-                        case 13://任意界面开启全局悬浮窗播放器
+                        case 14://任意界面开启全局悬浮窗播放器
                             checkedPermission();
                             break;
-                        case 14://画中画
+                        case 15://画中画
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                                 intent=new Intent(MainActivity.this, PiPPlayerActivity.class);
                                 intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_title_dip,"画中画"));
                             }
                             break;
-                        case 15://类抖音垂直滚动播放
+                        case 16://类抖音垂直滚动播放
                             intent=new Intent(MainActivity.this, PagerPlayerActivity.class);
                             break;
-                        case 16://自定义弹幕控制器功能示例
+                        case 17://自定义弹幕控制器功能示例
                             intent = new Intent(MainActivity.this, DanmuPlayerActivity.class);
                             intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_title_danmu,"自定义弹幕控制器"));
                             break;
-                        case 17://预缓存
+                        case 18://预缓存
                             intent = new Intent(MainActivity.this, VideoCacheActivity.class);
                             intent.putExtra("title",DataFactory.getInstance().getString(R.string.text_item_cache,"视频预缓存"));
                             break;
-                        case 18://项目主页 https://gitee.com/hy_Yuye/iPlayer
+                        case 19://项目主页 https://gitee.com/hy_Yuye/iPlayer
                             ProjectDialog dialog=new ProjectDialog(MainActivity.this);
                             dialog.setOnMenuActionListener(new ProjectDialog.OnMenuActionListener() {
                                 @Override
diff --git a/app/src/main/java/com/android/videoplayer/ui/activity/PadActivity.java b/app/src/main/java/com/android/videoplayer/ui/activity/PadActivity.java
@@ -0,0 +1,74 @@
+package com.android.videoplayer.ui.activity;
+
+import android.os.Bundle;
+import android.view.View;
+import com.android.iplayer.controller.VideoController;
+import com.android.iplayer.listener.OnPlayerEventListener;
+import com.android.iplayer.media.IMediaPlayer;
+import com.android.iplayer.model.PlayerState;
+import com.android.iplayer.widget.VideoPlayer;
+import com.android.iplayer.widget.WidgetFactory;
+import com.android.videoplayer.R;
+import com.android.videoplayer.base.BaseActivity;
+import com.android.videoplayer.base.BasePresenter;
+import com.android.videoplayer.ui.widget.TitleView;
+import com.android.videoplayer.utils.ScreenUtils;
+
+/**
+ * created by hty
+ * 2023/5/26
+ * Desc:Pad和Tv
+ */
+public class PadActivity extends BaseActivity {
+
+    @Override
+    protected BasePresenter createPresenter() {
+        return null;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pad);
+        TitleView titleView = (TitleView) findViewById(R.id.title_view);
+        titleView.setTitle(getIntent().getStringExtra("title"));
+        titleView.setOnTitleActionListener(new TitleView.OnTitleActionListener() {
+            @Override
+            public void onBack() {
+                onBackPressed();
+            }
+        });
+        findViewById(R.id.fullscreen).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                /**！！！重点！！！：必须在启动全屏前调用下列方法禁止旋转Activity方向**/
+                //mVideoPlayer.shutFullScreenOrientation();
+                mVideoPlayer.toggleFullScreen();
+            }
+        });
+        initPlayer();
+    }
+
+    private void initPlayer() {
+        findViewById(R.id.player_container).getLayoutParams().height= ScreenUtils.getInstance().dpToPxInt(300f) * 10 /16;//给播放器固定一个高度
+        mVideoPlayer = (VideoPlayer) findViewById(R.id.video_player);
+        VideoController controller = mVideoPlayer.createController();//绑定默认的控制器
+        WidgetFactory.bindDefaultControls(controller);
+        controller.setTitle("测试播放地址");//视频标题(默认视图控制器横屏可见)
+        mVideoPlayer.setOnPlayerActionListener(new OnPlayerEventListener() {
+            @Override
+            public void onPlayerState(PlayerState state, String message) {
+                if(PlayerState.STATE_START==state){
+                    findViewById(R.id.fullscreen).setVisibility(View.VISIBLE);
+                }
+            }
+        });
+        mVideoPlayer.setZoomModel(IMediaPlayer.MODE_ZOOM_TO_FIT);
+        mVideoPlayer.setLoop(true);
+        mVideoPlayer.setProgressCallBackSpaceMilliss(300);
+        /**！！！重点！！！：关闭、退出全屏时禁止旋转Activity方向，默认开启**/
+        mVideoPlayer.shutFullScreenOrientation();
+        mVideoPlayer.setDataSource(MP4_URL3);//播放地址设置
+        mVideoPlayer.prepareAsync();//开始异步准备播放
+    }
+}
diff --git a/app/src/main/java/com/android/videoplayer/utils/DataFactory.java b/app/src/main/java/com/android/videoplayer/utils/DataFactory.java
@@ -65,18 +65,19 @@ public List<Menu> getMenus() {
         menus.add(new Menu(getString(R.string.text_item_full,"直接全屏播放(全屏沉浸)"),4,null,2));
         menus.add(new Menu(getString(R.string.text_item_perview,"收费试看模式"),5,null,2));
         menus.add(new Menu(getString(R.string.text_item_resouce,"Assets/Raw本地资源播放"),6,null,2));
-        menus.add(new Menu(getString(R.string.text_item_continuity,"连续播放一个视频列表"),7,null,1));
-        menus.add(new Menu(getString(R.string.text_item_auto,"列表自动播放(无缝转场)"),8,getString(R.string.text_item_sub_list,"列表"),0));
-        menus.add(new Menu(getString(R.string.text_item_click,"列表点击播放(无缝转场)"),9,null,1));
-        menus.add(new Menu(getString(R.string.text_item_window,"Activity悬浮窗"),10,getString(R.string.text_item_sub_window,"窗口"),0));
-        menus.add(new Menu(getString(R.string.text_item_goable_window,"全局悬浮窗"),11,null,2));
-        menus.add(new Menu(getString(R.string.text_item_window_open,"任意界面开启窗口播放器"),12,null,2));
-        menus.add(new Menu(getString(R.string.text_item_window_goable_open,"任意界面开启全局悬浮窗播放器"),13,null,2));
-        menus.add(new Menu(getString(R.string.text_item_dip,"画中画(Android8.0+)"),14,null,1));
-        menus.add(new Menu(getString(R.string.text_item_dy,"仿抖音(扩展示例，支持缓存)"),15,getString(R.string.text_item_sub_expand,"扩展"),0));
-        menus.add(new Menu(getString(R.string.text_item_danmu,"自定义弹幕控制器(扩展示例)"),16,null,2));
-        menus.add(new Menu(getString(R.string.text_item_cache,"视频预缓存"),17,null,1));
-        menus.add(new Menu(getString(R.string.text_item_home,"项目主页"),18,getString(R.string.text_item_sub_other,"其它"),3));
+        menus.add(new Menu(getString(R.string.text_item_continuity,"连续播放一个视频列表"),7,null,2));
+        menus.add(new Menu(getString(R.string.text_item_pad,"Pad和TV"),8,null,1));
+        menus.add(new Menu(getString(R.string.text_item_auto,"列表自动播放(无缝转场)"),9,getString(R.string.text_item_sub_list,"列表"),0));
+        menus.add(new Menu(getString(R.string.text_item_click,"列表点击播放(无缝转场)"),10,null,1));
+        menus.add(new Menu(getString(R.string.text_item_window,"Activity悬浮窗"),11,getString(R.string.text_item_sub_window,"窗口"),0));
+        menus.add(new Menu(getString(R.string.text_item_goable_window,"全局悬浮窗"),12,null,2));
+        menus.add(new Menu(getString(R.string.text_item_window_open,"任意界面开启窗口播放器"),13,null,2));
+        menus.add(new Menu(getString(R.string.text_item_window_goable_open,"任意界面开启全局悬浮窗播放器"),14,null,2));
+        menus.add(new Menu(getString(R.string.text_item_dip,"画中画(Android8.0+)"),15,null,1));
+        menus.add(new Menu(getString(R.string.text_item_dy,"仿抖音(扩展示例，支持缓存)"),16,getString(R.string.text_item_sub_expand,"扩展"),0));
+        menus.add(new Menu(getString(R.string.text_item_danmu,"自定义弹幕控制器(扩展示例)"),17,null,2));
+        menus.add(new Menu(getString(R.string.text_item_cache,"视频预缓存"),18,null,1));
+        menus.add(new Menu(getString(R.string.text_item_home,"项目主页"),19,getString(R.string.text_item_sub_other,"其它"),3));
         Menu menu = new Menu("", 101, getString(R.string.text_item_version,"版本预告"), 3, 1);
         Version version=new Version();
         version.setCode("2.1.xx");
diff --git a/app/src/main/res/layout/activity_pad.xml b/app/src/main/res/layout/activity_pad.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/bg_color">
+    <com.android.videoplayer.ui.widget.TitleView
+        android:id="@+id/title_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+    <!--需要一个父容器包裹，并且必须固定高度-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <FrameLayout
+            android:id="@+id/player_container"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginLeft="16dp">
+            <com.android.iplayer.widget.VideoPlayer
+                android:id="@+id/video_player"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="#000000"/>
+        </FrameLayout>
+        <ImageView
+            android:id="@+id/fullscreen"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:src="@mipmap/ic_live_fullscreen"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:visibility="invisible"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -23,6 +23,7 @@
     <string name="text_item_perview">收费试看模式</string>
     <string name="text_item_resouce">Assets或Raw本地资源播放</string>
     <string name="text_item_continuity">连续播放一个视频列表</string>
+    <string name="text_item_pad">Pad和TV</string>
     <string name="text_item_auto">列表自动播放(转场衔接播放)</string>
     <string name="text_item_click">列表点击播放(转场衔接播放)</string>
     <string name="text_item_window">Activity悬浮窗</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
     <string name="text_item_perview">Fee trial mode</string>
     <string name="text_item_resouce">Assets or Raw local resource play</string>
     <string name="text_item_continuity">Play a video list in a row</string>
+    <string name="text_item_pad">Pad and TV</string>
     <string name="text_item_auto">List auto to play(Transfer connection play)</string>
     <string name="text_item_click">List click to play(Transfer connection play)</string>
     <string name="text_item_window">Activity local suspension window</string>
diff --git a/config.gradle b/config.gradle
@@ -1,6 +1,6 @@
 ext {
     sdk=[
-         versionCode    : 20122,
-         versionName    : "2.1.22"//SDK版本号
+         versionCode    : 20123,
+         versionName    : "2.1.23"//SDK版本号
     ]
 }
diff --git a/doc/apk/iPlayer-2.1.23.apk b/doc/apk/iPlayer-2.1.23.apk
diff --git a/doc/update/updateLog.md b/doc/update/updateLog.md
@@ -1,11 +1,12 @@
 历史版本
 
-###  2.1.22
+###  2.1.23
 **更新日期：** 2023-5-26<br/>
 **更新内容：**<br/>
->1. IJK解码器直播模式参数开关修复;<br/>
->2. 部分失效资源替换<br/>
->3. 直播示例新增解码器和源切换交互<br/>
+>1. SDK新增横竖屏切换时禁用Activity方向切换;<br/>
+>2. IJK解码器直播模式参数开关修复;<br/>
+>3. 直播示例新增解码器和源切换交互;<br/>
+>4. 部分失效资源替换<br/>
 ___
 ###  2.1.21
 **更新日期：** 2023-4-10<br/>
diff --git a/doc/update/wiki.md b/doc/update/wiki.md
diff --git a/iplayer/src/main/java/com/android/iplayer/base/BasePlayer.java b/iplayer/src/main/java/com/android/iplayer/base/BasePlayer.java
diff --git a/iplayer/src/main/java/com/android/iplayer/interfaces/IPlayerControl.java b/iplayer/src/main/java/com/android/iplayer/interfaces/IPlayerControl.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`ext {`
`2`	`2`	`sdk=[`
`3`		`- versionCode : 20122,`
`4`		`- versionName : "2.1.22"//SDK版本号`
	`3`	`+ versionCode : 20123,`
	`4`	`+ versionName : "2.1.23"//SDK版本号`
`5`	`5`	`]`
`6`	`6`	`}`