ezuikit-js 0.5.8 → 0.6.1-beta.0

package/CHANGELOG.md

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

package/demos/base-demo/ezuikit.js

@@ -23755,7 +23755,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 +30795,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 +31244,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({
@@ -31878,6 +31911,12 @@ var matchTemplate = function matchTemplate(templateName, params) {
   }
 };
 
+var isVersion2Available = function isVersion2Available() {
+  var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+  var isSharedArrayBuffer = window.SharedArrayBuffer;
+  return isSharedArrayBuffer && !isMobile;
+};
+
 var EZUIKitPlayer = /*#__PURE__*/function () {
   function EZUIKitPlayer(params) {
     var _this = this;
@@ -31912,14 +31951,20 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       this.poster = params.poster;
       this.speed = 1;
       this.disabledTimeLine = false;
+      this.disabledPTZ = false;
+      this.enableSharedArrayBufferGuide = false;
       this.capacity = {};
       this.env = {
         domain: "https://open.ys7.com"
       };
-      this.staticPath = !!window.SharedArrayBuffer ? "https://open.ys7.com/assets/ezuikit_v5.0" : "https://open.ys7.com/assets/ezuikit_v4.0";
+      this.staticPath = isVersion2Available() ? "https://open.ys7.com/assets/ezuikit_v5.0" : "https://open.ys7.com/assets/ezuikit_v4.0";
 
       if (typeof params.staticPath === 'string') {
-        this.staticPath = params.staticPath;
+        if (params.staticPath.startsWith("http")) {
+          this.staticPath = params.staticPath;
+        } else {
+          this.staticPath = window.location.protocol + '//' + window.location.host + params.staticPath;
+        }
       }
 
       if (typeof params.audio !== 'undefined') {
@@ -31930,11 +31975,63 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
         this.disabledTimeLine = params.disabledTimeLine;
       }
 
+      if (typeof params.disabledPTZ !== 'undefined') {
+        this.disabledPTZ = params.disabledPTZ;
+      }
+
+      if (typeof params.enableSharedArrayBufferGuide !== 'undefined') {
+        this.enableSharedArrayBufferGuide = params.enableSharedArrayBufferGuide;
+      }
+
       var pluginUrl = "".concat(this.staticPath, "/js/jsPlugin-4.0.2.min.js");
 
-      if (!!window.SharedArrayBuffer) {
+      if (isVersion2Available()) {
         console.log("启用多线程解析视频");
-        pluginUrl = "".concat(this.staticPath, "/jsPlugin-2.0.0.min.js");
+        pluginUrl = "".concat(this.staticPath, "/jsPlugin-2.0.1.min.js");
+      } else {
+        // 是否引导用户开启谷歌实验室 Google Labs 特性
+        //enableSharedArrayBufferGuide
+        var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+
+        var getChromeVersion = function getChromeVersion() {
+          var arr = 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]);
+          }
+
+          return false;
+        }; // pc端 谷歌浏览器 版本92 ~ 105
+
+
+        if (!isMobile && 91 < getChromeVersion < 106 && this.enableSharedArrayBufferGuide) {
+          console.log("提示用户开启谷歌实验室特性");
+          var wapDomId = "".concat(this.id, "-wrap");
+          var guideDom = document.createElement("div");
+          var guideSpan = document.createElement("span");
+          guideSpan.innerHTML = "您当前浏览器可以开启谷歌实验室多线程特性，获取更好播放体验，避免浏览器卡顿及崩溃,详见";
+          guideDom.appendChild(guideSpan);
+          var guideLink = document.createElement("a");
+          guideLink.href = "https://open.ys7.com/help/384";
+          guideLink.setAttribute("target", "_blank");
+          guideDom.appendChild(guideLink);
+          guideLink.innerHTML = "开启说明"; //guideDom.innerHTML = "您的浏览器当前使用单进程播放视频，可能因内存占用过高导致浏览器卡顿,您可参考·谷歌浏览器开启多线程（链接）·开启谷歌实验室多线程特性，获取更好播放体验";
+
+          guideDom.id = "".concat(this.id, "-guide");
+          guideDom.style = "font-size:12px;color:red;";
+          setTimeout(function () {
+            if (document.getElementById(wapDomId)) {
+              document.getElementById(wapDomId).insertBefore(guideDom, document.getElementById(_this.id));
+            }
+          }, 5000);
+        }
       }
 
       addJs(pluginUrl, function () {
@@ -32033,6 +32130,18 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
           _params$height = params.height,
           height = _params$height === void 0 ? 400 : _params$height;
 
+      if (!params.width || !params.height) {
+        var videoDOMBounding = document.getElementById(id).getBoundingClientRect();
+
+        if (!params.width && videoDOMBounding.width > 0) {
+          width = videoDOMBounding.width;
+        }
+
+        if (!params.height && videoDOMBounding.height > 0) {
+          height = videoDOMBounding.height;
+        }
+      }
+
       if (!document.getElementById("".concat(id, "-wrap"))) {
         var wapDom = document.createElement("div");
         wapDom.id = "".concat(id, "-wrap");
@@ -32046,101 +32155,179 @@ 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: _this2.staticPath,
+            oStyle: {
+              border: "none",
+              background: "#000000"
+            }
+          }); // 增加视频容器
+
+          var pluginStatus = new Status(_this2, id);
+          pluginStatus.loadingStart(id);
+          pluginStatus.loadingSetText({
+            text: '初始化播放器完成'
+          });
+          _this2.env = {
+            domain: "https://open.ys7.com"
+          };
+
+          if (typeof params.env !== 'undefined') {
+            _this2.env = Object.assign(_this2.env, params.env);
           }
-        });
-        jSPlugin.EventCallback = {
-          loadEventHandler: function loadEventHandler() {},
-          zoomEventResponse: function
-            /*iMode, aPoint*/
-          zoomEventResponse() {//电子放大回调
-          },
-          windowEventSelect: function windowEventSelect(iWndIndex) {//插件选中窗口回调
-          },
-          pluginErrorHandler: function pluginErrorHandler(iWndIndex, iErrorCode, oError) {
-            //插件错误回调
-            console.log(iWndIndex, iErrorCode, oError);
 
-            if (iErrorCode === 1003) {
-              console.log("断流");
+          if (typeof params.handleTalkSuccess !== 'undefined') {
+            _this2.handleTalkSuccess = params.handleTalkSuccess;
+          }
 
-              _this2.pluginStatus.loadingSetText({
-                text: "连接断开，请重试",
-                color: 'red'
-              });
+          if (typeof params.handleTalkError !== 'undefined') {
+            _this2.handleTalkError = params.handleTalkError;
+          }
 
-              if (typeof _this2.params.handleError === 'function') {
-                _this2.params.handleError({
-                  msg: "连接断开，请重试",
-                  retcode: 1003,
+          _this2.errorHander = new Code();
+          _this2.jSPlugin = jSPlugin;
+
+          if (_this2.themeId && !window.EZUIKit[params.id].state.EZUIKitPlayer.themeInit) {
+            _this2.Theme = new Theme(_this2, id);
+            window.EZUIKit[params.id].state.EZUIKitPlayer.themeInit = true;
+          }
+
+          _this2.pluginStatus = pluginStatus;
+          var checkTimer = setInterval(function () {
+            if (_this2.jSPlugin.Module && _this2.jSPlugin.Module._JSPlayM4_GetSDKVersion && _this2.jSPlugin.Module._JSPlayM4_GetSDKVersion()) {
+              clearInterval(checkTimer);
+
+              if (typeof _this2.params.handleInitSuccess === 'function') {
+                _this2.params.handleInitSuccess({
+                  retcode: 0,
                   id: _this2.params.id,
-                  type: "handleError"
+                  type: "handleInitSuccess"
                 });
               }
+
+              resolve({
+                meta: {
+                  retcode: 200,
+                  msg: "初始化成功"
+                }
+              });
             }
-          },
-          windowEventOver: function windowEventOver(iWndIndex) {},
-          windowEventOut: function windowEventOut(iWndIndex) {},
-          windowEventUp: function windowEventUp(iWndIndex) {},
-          windowFullCcreenChange: function windowFullCcreenChange(bFull) {},
-          firstFrameDisplay: function firstFrameDisplay(iWndIndex, iWidth, iHeight) {
-            console.log(iWidth, iHeight);
-            jSPlugin.JS_SetCanFullScreen(false);
-
-            _this2.pluginStatus.loadingClear();
-          },
-          performanceLack: function performanceLack() {},
-          mouseEvent: function mouseEvent(iMouseEventType, iMouseX, iMouseY) {}
-        }; // 增加视频容器
-
-        var pluginStatus = new Status(_this2, id);
-        pluginStatus.loadingStart(id);
-        pluginStatus.loadingSetText({
-          text: '初始化播放器完成'
-        });
-        _this2.env = {
-          domain: "https://open.ys7.com"
-        };
+          }, 50);
+        } else {
+          jSPlugin = new window.JSPlugin({
+            szId: id,
+            iType: 2,
+            iWidth: width,
+            iHeight: height,
+            iMaxSplit: 1,
+            iCurrentSplit: 1,
+            szBasePath: "",
+            staticPath: _this2.staticPath,
+            oStyle: {
+              border: "none",
+              background: "#000000"
+            }
+          });
+          jSPlugin.EventCallback = {
+            loadEventHandler: function loadEventHandler() {},
+            zoomEventResponse: function
+              /*iMode, aPoint*/
+            zoomEventResponse() {//电子放大回调
+            },
+            windowEventSelect: function windowEventSelect(iWndIndex) {//插件选中窗口回调
+            },
+            pluginErrorHandler: function pluginErrorHandler(iWndIndex, iErrorCode, oError) {
+              //插件错误回调
+              console.log(iWndIndex, iErrorCode, oError);
 
-        if (typeof params.env !== 'undefined') {
-          _this2.env = Object.assign(_this2.env, params.env);
-        }
+              if (iErrorCode === 1003) {
+                console.log("断流");
 
-        if (typeof params.handleTalkSuccess !== 'undefined') {
-          _this2.handleTalkSuccess = params.handleTalkSuccess;
-        }
+                _this2.pluginStatus.loadingSetText({
+                  text: "连接断开，请重试",
+                  color: 'red'
+                });
 
-        if (typeof params.handleTalkError !== 'undefined') {
-          _this2.handleTalkError = params.handleTalkError;
-        }
+                if (typeof _this2.params.handleError === 'function') {
+                  _this2.params.handleError({
+                    msg: "连接断开，请重试",
+                    retcode: 1003,
+                    id: _this2.params.id,
+                    type: "handleError"
+                  });
+                }
+              }
+            },
+            windowEventOver: function windowEventOver(iWndIndex) {},
+            windowEventOut: function windowEventOut(iWndIndex) {},
+            windowEventUp: function windowEventUp(iWndIndex) {},
+            windowFullCcreenChange: function windowFullCcreenChange(bFull) {},
+            firstFrameDisplay: function firstFrameDisplay(iWndIndex, iWidth, iHeight) {
+              console.log(iWidth, iHeight);
+              jSPlugin.JS_SetCanFullScreen(false);
+
+              _this2.pluginStatus.loadingClear();
+            },
+            performanceLack: function performanceLack() {},
+            mouseEvent: function mouseEvent(iMouseEventType, iMouseX, iMouseY) {}
+          }; // 增加视频容器
+
+          var pluginStatus = new Status(_this2, id);
+          pluginStatus.loadingStart(id);
+          pluginStatus.loadingSetText({
+            text: '初始化播放器完成'
+          });
+          _this2.env = {
+            domain: "https://open.ys7.com"
+          };
 
-        _this2.errorHander = new Code();
-        _this2.jSPlugin = jSPlugin;
+          if (typeof params.env !== 'undefined') {
+            _this2.env = Object.assign(_this2.env, params.env);
+          }
 
-        if (_this2.themeId && !window.EZUIKit[params.id].state.EZUIKitPlayer.themeInit) {
-          _this2.Theme = new Theme(_this2, id);
-          window.EZUIKit[params.id].state.EZUIKitPlayer.themeInit = true;
-        }
+          if (typeof params.handleTalkSuccess !== 'undefined') {
+            _this2.handleTalkSuccess = params.handleTalkSuccess;
+          }
 
-        _this2.pluginStatus = pluginStatus; // 待需要改造plugin，异步判断；
+          if (typeof params.handleTalkError !== 'undefined') {
+            _this2.handleTalkError = params.handleTalkError;
+          }
 
-        resolve({
-          meta: {
-            retcode: 200,
-            msg: "初始化成功"
+          _this2.errorHander = new Code();
+          _this2.jSPlugin = jSPlugin;
+
+          if (_this2.themeId && !window.EZUIKit[params.id].state.EZUIKitPlayer.themeInit) {
+            _this2.Theme = new Theme(_this2, id);
+            window.EZUIKit[params.id].state.EZUIKitPlayer.themeInit = true;
           }
-        });
+
+          _this2.pluginStatus = pluginStatus; // 待需要改造plugin，异步判断；
+
+          if (typeof _this2.params.handleInitSuccess === 'function') {
+            _this2.params.handleInitSuccess({
+              retcode: 0,
+              id: _this2.params.id,
+              type: "handleInitSuccess"
+            });
+          }
+
+          resolve({
+            meta: {
+              retcode: 200,
+              msg: "初始化成功"
+            }
+          });
+        }
       };
 
       var initDecoderPromise = new Promise(initDecoder);
@@ -32588,6 +32775,10 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
     value: function play(options) {
       var _this5 = this;
 
+      if (this.jSPlugin.bPlay) {
+        return false;
+      }
+
       this.pluginStatus.setPlayStatus({
         play: false,
         loading: true
@@ -33172,9 +33363,9 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
           var end = defaultTime.length;
           var standardTime = time + defaultTime.substring(start, end);
           return standardTime.slice(0, 8) + 'T' + standardTime.slice(8) + 'Z';
-        } else {
-          throw new Error('回放时间格式有误，请确认');
         }
+
+        throw new Error('回放时间格式有误，请确认');
       }
 
       var seekRT = this.jSPlugin.JS_Seek(0, startTime, endTime);