ezuikit-js 0.5.9 → 0.6.1

package/CHANGELOG.md

@@ -1,4 +1,11 @@
-v 0.5.8  
+v 0.6.0  
+
+[fix]兼容低版本火狐浏览器播放视频   
+
+[fix]修复网站全屏模式下，再次执行视频全屏冲突问题  
+
+
+v 0.5.9  
 
 [feta]支持用户通过开启谷歌实验室特性启动多线程解码   
 

package/demos/base-demo/ezuikit.js

@@ -319,13 +319,15 @@ var HLS = /*#__PURE__*/function () {
 
     _classCallCheck$1(this, HLS);
 
-    addJs("https://open.ys7.com/sdk/js/2.0/js/hls.min.js", function () {
+    addJs("https://open.ys7.com/assets/ezuikit_v3.4/js/hls.js", function () {
       console.log("加载hls.min.js成功", window.Hls);
       console.log("isSupportHls", window.Hls.isSupported());
 
       if (window.Hls.isSupported()) {
         _this.initHLS(videoId, url);
       }
+    }, function () {
+      return !!window.Hls;
     });
   }
 
@@ -23755,7 +23757,7 @@ Janus$1.init = function (options) {
     } else if (Janus$1.webRTCAdapter.browserDetails.browser === 'chrome' && Janus$1.webRTCAdapter.browserDetails.version < 72) {
       // Chrome does, but it's only usable from version 72 on
       Janus$1.unifiedPlan = false;
-    } else if (!('currentDirection' in RTCRtpTransceiver.prototype)) {
+    } else if (typeof RTCRtpTransceiver !== 'undefined' && !('currentDirection' in RTCRtpTransceiver.prototype)) {
       // Safari supports addTransceiver() but not Unified Plan when
       // currentDirection is not defined (see codepen above)
       Janus$1.unifiedPlan = false;
@@ -30795,6 +30797,27 @@ var Monitor = /*#__PURE__*/function () {
               params.clickEventHandle(event.data);
             }
 
+            break;
+
+          case 'iframeFullScreen':
+            if (id == event.data.id) {
+              var requestFullScreen = function requestFullScreen(element) {
+                var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullScreen;
+
+                if (requestMethod) {
+                  requestMethod.call(element);
+                } else if (typeof window.ActiveXObject !== "undefined") {
+                  var wscript = new ActiveXObject("WScript.Shell");
+
+                  if (wscript !== null) {
+                    wscript.SendKeys("{F11}");
+                  }
+                }
+              };
+
+              requestFullScreen(document.getElementById("EZUIKitPlayer-" + event.data.id));
+            }
+
             break;
         }
       }
@@ -31223,6 +31246,18 @@ var Monitor = /*#__PURE__*/function () {
   };
 
   EZUIKitPlayer.prototype.changePlayUrl = function (data) {
+    if (data.deviceSerial) {
+      this.opt.deviceSerial = data.deviceSerial;
+    }
+
+    if (data.channelNo) {
+      this.opt.channelNo = data.channelNo;
+    }
+
+    if (data.accessToken) {
+      this.opt.accessToken = data.accessToken;
+    }
+
     var id = 'EZUIKitPlayer-' + this.opt.id;
     var player = document.getElementById(id).contentWindow;
     player.postMessage({
@@ -31879,9 +31914,40 @@ var matchTemplate = function matchTemplate(templateName, params) {
 };
 
 var isVersion2Available = function isVersion2Available() {
+  var ua = window.navigator.userAgent.toLowerCase(); //获取用户端信息
+
+  var info = {
+    sa: /version.*safari/.test(ua),
+    //匹配Safari浏览器
+    ch: /chrome/.test(ua),
+    //匹配Chrome浏览器
+    ff: /gecko/.test(ua) && !/webkit/.test(ua) //匹配Firefox浏览器
+
+  };
   var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
-  var isSharedArrayBuffer = window.SharedArrayBuffer;
-  return isSharedArrayBuffer && !isMobile;
+
+  if (isMobile) {
+    return false;
+  } else if (info.ch) {
+    var getChromeVersion = function getChromeVersion() {
+      var arr = window.navigator.userAgent.split(' ');
+      var chromeVersion = '';
+
+      for (var i = 0; i < arr.length; i++) {
+        if (/chrome/i.test(arr[i])) chromeVersion = arr[i];
+      }
+
+      if (chromeVersion) {
+        return Number(chromeVersion.split('/')[1].split('.')[0]);
+      } else {
+        return false;
+      }
+    };
+
+    return getChromeVersion() > 91 && !!window.SharedArrayBuffer;
+  }
+
+  return false;
 };
 
 var EZUIKitPlayer = /*#__PURE__*/function () {
@@ -32106,20 +32172,40 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       }
 
       var initDecoder = function initDecoder(resolve, reject) {
-        var jSPlugin = new window.JSPlugin({
-          szId: id,
-          iType: 2,
-          iWidth: width,
-          iHeight: height,
-          iMaxSplit: 1,
-          iCurrentSplit: 1,
-          szBasePath: "",
-          staticPath: params.staticPath,
-          oStyle: {
-            border: "none",
-            background: "#000000"
-          }
-        });
+        var jSPlugin;
+
+        if (isVersion2Available()) {
+          jSPlugin = new window.JSPlugin({
+            szId: id,
+            iType: 2,
+            iWidth: width,
+            iHeight: height,
+            iMaxSplit: 1,
+            iCurrentSplit: 1,
+            szBasePath: "",
+            staticPath: params.staticPath,
+            oStyle: {
+              border: "none",
+              background: "#000000"
+            }
+          });
+        } else {
+          jSPlugin = new window.JSPlugin({
+            szId: id,
+            iType: 2,
+            iWidth: width,
+            iHeight: height,
+            iMaxSplit: 1,
+            iCurrentSplit: 1,
+            szBasePath: "",
+            staticPath: params.staticPath,
+            oStyle: {
+              border: "none",
+              background: "#000000"
+            }
+          });
+        }
+
         jSPlugin.EventCallback = {
           loadEventHandler: function loadEventHandler() {},
           zoomEventResponse: function

package/demos/base-demo/hls.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+  <title>Document</title>
+  <script src="./ezuikit.js"></script>
+</head>
+
+<body>
+  <div className="demo">
+    <h2>视频模式使用示例：</h2>
+    <video id="hlsId" autoplay controls style="width: 600px;height:400px"></video>
+    <video id="hlsId2" autoplay controls style="width: 600px;height:400px"></video>
+  </div>
+  <script>
+    var hlsDemo = new EZUIKit.HLS("hlsId","https://open.ys7.com/v3/openlive/C78957921_1_2.m3u8?expire=1687488306&id=461844489422516224&t=96ea4ce49d2ea4f2f65d045edbe8fa1a51ef9fac6f38e150052bc64a91c27db7&ev=100");
+
+    var hlsDemo2 = new EZUIKit.HLS("hlsId2","https://open.ys7.com/v3/openlive/G39444019_1_2.m3u8?expire=1687487466&id=461840962679742464&t=c076d5a5ad56090e919a6a2500b96169c20a77874cce866a87a7d65e493e6f2f&ev=100");
+  </script>
+</body>
+
+</html>

package/ezuikit.js

@@ -319,13 +319,15 @@ var HLS = /*#__PURE__*/function () {
 
     _classCallCheck$1(this, HLS);
 
-    addJs("https://open.ys7.com/sdk/js/2.0/js/hls.min.js", function () {
+    addJs("https://open.ys7.com/assets/ezuikit_v3.4/js/hls.js", function () {
       console.log("加载hls.min.js成功", window.Hls);
       console.log("isSupportHls", window.Hls.isSupported());
 
       if (window.Hls.isSupported()) {
         _this.initHLS(videoId, url);
       }
+    }, function () {
+      return !!window.Hls;
     });
   }
 
@@ -23755,7 +23757,7 @@ Janus$1.init = function (options) {
     } else if (Janus$1.webRTCAdapter.browserDetails.browser === 'chrome' && Janus$1.webRTCAdapter.browserDetails.version < 72) {
       // Chrome does, but it's only usable from version 72 on
       Janus$1.unifiedPlan = false;
-    } else if (!('currentDirection' in RTCRtpTransceiver.prototype)) {
+    } else if (typeof RTCRtpTransceiver !== 'undefined' && !('currentDirection' in RTCRtpTransceiver.prototype)) {
       // Safari supports addTransceiver() but not Unified Plan when
       // currentDirection is not defined (see codepen above)
       Janus$1.unifiedPlan = false;
@@ -30795,6 +30797,27 @@ var Monitor = /*#__PURE__*/function () {
               params.clickEventHandle(event.data);
             }
 
+            break;
+
+          case 'iframeFullScreen':
+            if (id == event.data.id) {
+              var requestFullScreen = function requestFullScreen(element) {
+                var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullScreen;
+
+                if (requestMethod) {
+                  requestMethod.call(element);
+                } else if (typeof window.ActiveXObject !== "undefined") {
+                  var wscript = new ActiveXObject("WScript.Shell");
+
+                  if (wscript !== null) {
+                    wscript.SendKeys("{F11}");
+                  }
+                }
+              };
+
+              requestFullScreen(document.getElementById("EZUIKitPlayer-" + event.data.id));
+            }
+
             break;
         }
       }
@@ -31223,6 +31246,18 @@ var Monitor = /*#__PURE__*/function () {
   };
 
   EZUIKitPlayer.prototype.changePlayUrl = function (data) {
+    if (data.deviceSerial) {
+      this.opt.deviceSerial = data.deviceSerial;
+    }
+
+    if (data.channelNo) {
+      this.opt.channelNo = data.channelNo;
+    }
+
+    if (data.accessToken) {
+      this.opt.accessToken = data.accessToken;
+    }
+
     var id = 'EZUIKitPlayer-' + this.opt.id;
     var player = document.getElementById(id).contentWindow;
     player.postMessage({
@@ -31879,9 +31914,40 @@ var matchTemplate = function matchTemplate(templateName, params) {
 };
 
 var isVersion2Available = function isVersion2Available() {
+  var ua = window.navigator.userAgent.toLowerCase(); //获取用户端信息
+
+  var info = {
+    sa: /version.*safari/.test(ua),
+    //匹配Safari浏览器
+    ch: /chrome/.test(ua),
+    //匹配Chrome浏览器
+    ff: /gecko/.test(ua) && !/webkit/.test(ua) //匹配Firefox浏览器
+
+  };
   var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
-  var isSharedArrayBuffer = window.SharedArrayBuffer;
-  return isSharedArrayBuffer && !isMobile;
+
+  if (isMobile) {
+    return false;
+  } else if (info.ch) {
+    var getChromeVersion = function getChromeVersion() {
+      var arr = window.navigator.userAgent.split(' ');
+      var chromeVersion = '';
+
+      for (var i = 0; i < arr.length; i++) {
+        if (/chrome/i.test(arr[i])) chromeVersion = arr[i];
+      }
+
+      if (chromeVersion) {
+        return Number(chromeVersion.split('/')[1].split('.')[0]);
+      } else {
+        return false;
+      }
+    };
+
+    return getChromeVersion() > 91 && !!window.SharedArrayBuffer;
+  }
+
+  return false;
 };
 
 var EZUIKitPlayer = /*#__PURE__*/function () {
@@ -32106,20 +32172,40 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       }
 
       var initDecoder = function initDecoder(resolve, reject) {
-        var jSPlugin = new window.JSPlugin({
-          szId: id,
-          iType: 2,
-          iWidth: width,
-          iHeight: height,
-          iMaxSplit: 1,
-          iCurrentSplit: 1,
-          szBasePath: "",
-          staticPath: params.staticPath,
-          oStyle: {
-            border: "none",
-            background: "#000000"
-          }
-        });
+        var jSPlugin;
+
+        if (isVersion2Available()) {
+          jSPlugin = new window.JSPlugin({
+            szId: id,
+            iType: 2,
+            iWidth: width,
+            iHeight: height,
+            iMaxSplit: 1,
+            iCurrentSplit: 1,
+            szBasePath: "",
+            staticPath: params.staticPath,
+            oStyle: {
+              border: "none",
+              background: "#000000"
+            }
+          });
+        } else {
+          jSPlugin = new window.JSPlugin({
+            szId: id,
+            iType: 2,
+            iWidth: width,
+            iHeight: height,
+            iMaxSplit: 1,
+            iCurrentSplit: 1,
+            szBasePath: "",
+            staticPath: params.staticPath,
+            oStyle: {
+              border: "none",
+              background: "#000000"
+            }
+          });
+        }
+
         jSPlugin.EventCallback = {
           loadEventHandler: function loadEventHandler() {},
           zoomEventResponse: function

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezuikit-js",
-  "version": "0.5.9",
+  "version": "0.6.1",
   "description": "ezuikit javascript for npm",
   "main": "ezuikit.js",
   "scripts": {