修复移动端 web全屏问题

langhuihui · Jun 12, 2024 · df38c3a · df38c3a
1 parent 0da1e0f
commit df38c3a
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 17 deletions.
diff --git a/demo/public/dist.zip b/demo/public/dist.zip
diff --git a/demo/public/pro.zip b/demo/public/pro.zip
diff --git a/demo/public/pro/js/decoder-pro-audio.js b/demo/public/pro/js/decoder-pro-audio.js
diff --git a/demo/public/pro/js/decoder-pro-hard-not-wasm.js b/demo/public/pro/js/decoder-pro-hard-not-wasm.js
diff --git a/demo/public/pro/js/decoder-pro-hard.js b/demo/public/pro/js/decoder-pro-hard.js
diff --git a/demo/public/pro/js/decoder-pro-mt.js b/demo/public/pro/js/decoder-pro-mt.js
diff --git a/demo/public/pro/js/decoder-pro-simd-mt.js b/demo/public/pro/js/decoder-pro-simd-mt.js
diff --git a/demo/public/pro/js/decoder-pro-simd.js b/demo/public/pro/js/decoder-pro-simd.js
diff --git a/demo/public/pro/js/decoder-pro.js b/demo/public/pro/js/decoder-pro.js
diff --git a/demo/public/pro/js/jessibuca-pro-demo.js b/demo/public/pro/js/jessibuca-pro-demo.js
diff --git a/demo/public/pro/js/jessibuca-pro-multi-demo.js b/demo/public/pro/js/jessibuca-pro-multi-demo.js
diff --git a/demo/public/qrcode.jpeg b/demo/public/qrcode.jpeg
diff --git a/dist/jessibuca.js b/dist/jessibuca.js
diff --git a/src/player/index.js b/src/player/index.js
@@ -6,7 +6,7 @@ import events from './events';
 import {
     fpsStatus,
     initPlayTimes,
-    isEmpty,
+    isEmpty, isFalse,
     isFullScreen, isMobile,
     isNotEmpty,
     now, supportMediaStreamTrack,
@@ -40,17 +40,24 @@ export default class Player extends Emitter {
         // disable offscreen
         this._opt.forceNoOffscreen = true;
 
-        if (isMobile()) {
+        if (isMobile() || isPad()) {
             this.debug.log('Player', 'isMobile and set _opt.controlAutoHide false');
             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 (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 (this._opt.useWCS) {
             this._opt.useWCS = supportWCS();

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -177,6 +177,10 @@ export function isMobile() {
     return (/iphone|ipod|android.*mobile|windows.*phone|blackberry.*mobile/i.test(window.navigator.userAgent.toLowerCase()));
 }
 
+export function isPad(){
+    return (/ipad|android(?!.*mobile)|tablet|kindle|silk/i.test(window.navigator.userAgent.toLowerCase()));
+}
+
 export function isAndroid() {
     const UA = window.navigator.userAgent.toLowerCase();
     return (/android/i.test(UA));
@@ -613,3 +617,12 @@ export function hevcEncoderNalePacketNotLength(oneNALBuffer, isIframe) {
     arrayBuffer.set(oneNALBuffer, tmp.length);
     return arrayBuffer;
 }
+
+
+export function isTrue(value) {
+    return value === true || value === 'true';
+}
+
+export function isFalse(value) {
+    return value !== true && value !== 'true';
+}