新增 autoUseSystemFullScreen 参数

langhuihui · Sep 3, 2024 · e4bf85e · e4bf85e
1 parent 9767179
commit e4bf85e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/demo/api.md b/demo/api.md
@@ -64,7 +64,7 @@ new Jessibuca({
 
 - **类型**：`number`
 - **默认值**：`1`
-- **用法**： 设置最大缓冲时长，单位秒，播放器会自动消除延迟。
+- **用法**： 设置缓冲时长，`单位秒`。
 
 ### decoder
 
@@ -379,6 +379,15 @@ worker地址
 
 > ios上面不支持系统级别的全屏方法，推荐使用这个参数。
 
+### autoUseSystemFullScreen
+
+- **类型**：`boolean`
+- **默认值**：`true`
+- **用法**：是否自动使用系统全屏
+
+如果设置了true，播放器会检查是否支持系统提供的全屏API，如果支持，就会优先使用系统全屏API，否则使用web全屏API`（useWebFullScreen）`。
+
+
 ## 方法
 
 ### setDebug(flag)

diff --git a/demo/pro-module.md b/demo/pro-module.md
@@ -54,7 +54,7 @@ jessibuca pro 扩展模块
 视频支持的编码格式：`h264`、`h265`、
 音频支持的编码格式：`aac`、`mp3`、`pcmu(g711u)`、`pcma(g711a)`
 
-支持录制格式 `flv`,`mp4`，`webm`。
+支持录制格式 `flv`,`mp4`。
 
 ### demo（十分钟）
 

diff --git a/demo/public/dist.zip b/demo/public/dist.zip
diff --git a/dist/jessibuca.js b/dist/jessibuca.js
diff --git a/src/constant/index.js b/src/constant/index.js
@@ -73,7 +73,8 @@ export const DEFAULT_PLAYER_OPTIONS = {
     wasmDecodeAudioSyncVideo: false,// wasm 解码之后音视频同步
     recordType: FILE_SUFFIX.webm,
     useWebFullScreen: false, // use web full screen
-    loadingDecoderWorkerTimeout: 10 //
+    loadingDecoderWorkerTimeout: 10, //
+    autoUseSystemFullScreen: true, // auto system full screen
 }
 
 

diff --git a/src/player/index.js b/src/player/index.js
@@ -45,19 +45,19 @@ export default class Player extends Emitter {
             this._opt.controlAutoHide = false;
         }
 
-        if (screenfull.isEnabled &&
-            this._opt.useWebFullScreen) {
-            this.debug.log('Player', 'screenfull.isEnabled is true and _opt.useWebFullScreen is true , set _opt.useWebFullScreen false');
-            this._opt.useWebFullScreen = false;
-        }
+        if (this._opt.autoUseSystemFullScreen) {
+            if (screenfull.isEnabled &&
+                this._opt.useWebFullScreen) {
+                this.debug.log('Player', 'screenfull.isEnabled is true and _opt.useWebFullScreen is true , set _opt.useWebFullScreen false');
+                this._opt.useWebFullScreen = false;
+            }
 
-        if (isFalse(screenfull.isEnabled) &&
-            isFalse(this._opt.useWebFullScreen)) {
-            this.debug.log('Player', 'screenfull.isEnabled is false and _opt.useWebFullScreen is false , set _opt.useWebFullScreen true');
-            this._opt.useWebFullScreen = true;
+            if (isFalse(screenfull.isEnabled) &&
+                isFalse(this._opt.useWebFullScreen)) {
+                this.debug.log('Player', 'screenfull.isEnabled is false and _opt.useWebFullScreen is false , set _opt.useWebFullScreen true');
+                this._opt.useWebFullScreen = true;
+            }
         }
-
-
         //
         if (this._opt.useWCS) {
             this._opt.useWCS = supportWCS();