ezuikit-js 0.6.1-beta.0 → 0.6.1

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;
     });
   }
 
@@ -31912,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 () {
@@ -31960,11 +31993,7 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       this.staticPath = isVersion2Available() ? "https://open.ys7.com/assets/ezuikit_v5.0" : "https://open.ys7.com/assets/ezuikit_v4.0";
 
       if (typeof params.staticPath === 'string') {
-        if (params.staticPath.startsWith("http")) {
-          this.staticPath = params.staticPath;
-        } else {
-          this.staticPath = window.location.protocol + '//' + window.location.host + params.staticPath;
-        }
+        this.staticPath = params.staticPath;
       }
 
       if (typeof params.audio !== 'undefined') {
@@ -31987,7 +32016,7 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
 
       if (isVersion2Available()) {
         console.log("启用多线程解析视频");
-        pluginUrl = "".concat(this.staticPath, "/jsPlugin-2.0.1.min.js");
+        pluginUrl = "".concat(this.staticPath, "/jsPlugin-2.0.0.min.js");
       } else {
         // 是否引导用户开启谷歌实验室 Google Labs 特性
         //enableSharedArrayBufferGuide
@@ -32130,18 +32159,6 @@ 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");
@@ -32166,63 +32183,12 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
             iMaxSplit: 1,
             iCurrentSplit: 1,
             szBasePath: "",
-            staticPath: _this2.staticPath,
+            staticPath: params.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);
-          }
-
-          if (typeof params.handleTalkSuccess !== 'undefined') {
-            _this2.handleTalkSuccess = params.handleTalkSuccess;
-          }
-
-          if (typeof params.handleTalkError !== 'undefined') {
-            _this2.handleTalkError = params.handleTalkError;
-          }
-
-          _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: "handleInitSuccess"
-                });
-              }
-
-              resolve({
-                meta: {
-                  retcode: 200,
-                  msg: "初始化成功"
-                }
-              });
-            }
-          }, 50);
         } else {
           jSPlugin = new window.JSPlugin({
             szId: id,
@@ -32232,102 +32198,95 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
             iMaxSplit: 1,
             iCurrentSplit: 1,
             szBasePath: "",
-            staticPath: _this2.staticPath,
+            staticPath: params.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 (iErrorCode === 1003) {
-                console.log("断流");
+        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);
 
-                _this2.pluginStatus.loadingSetText({
-                  text: "连接断开，请重试",
-                  color: 'red'
-                });
+            if (iErrorCode === 1003) {
+              console.log("断流");
 
-                if (typeof _this2.params.handleError === 'function') {
-                  _this2.params.handleError({
-                    msg: "连接断开，请重试",
-                    retcode: 1003,
-                    id: _this2.params.id,
-                    type: "handleError"
-                  });
-                }
+              _this2.pluginStatus.loadingSetText({
+                text: "连接断开，请重试",
+                color: 'red'
+              });
+
+              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"
-          };
+            }
+          },
+          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"
+        };
 
-          if (typeof params.env !== 'undefined') {
-            _this2.env = Object.assign(_this2.env, params.env);
-          }
+        if (typeof params.env !== 'undefined') {
+          _this2.env = Object.assign(_this2.env, params.env);
+        }
 
-          if (typeof params.handleTalkSuccess !== 'undefined') {
-            _this2.handleTalkSuccess = params.handleTalkSuccess;
-          }
+        if (typeof params.handleTalkSuccess !== 'undefined') {
+          _this2.handleTalkSuccess = params.handleTalkSuccess;
+        }
 
-          if (typeof params.handleTalkError !== 'undefined') {
-            _this2.handleTalkError = params.handleTalkError;
-          }
+        if (typeof params.handleTalkError !== 'undefined') {
+          _this2.handleTalkError = params.handleTalkError;
+        }
 
-          _this2.errorHander = new Code();
-          _this2.jSPlugin = jSPlugin;
+        _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;
-          }
+        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，异步判断；
+        _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: "初始化成功"
           }
-
-          resolve({
-            meta: {
-              retcode: 200,
-              msg: "初始化成功"
-            }
-          });
-        }
+        });
       };
 
       var initDecoderPromise = new Promise(initDecoder);
@@ -32775,10 +32734,6 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
     value: function play(options) {
       var _this5 = this;
 
-      if (this.jSPlugin.bPlay) {
-        return false;
-      }
-
       this.pluginStatus.setPlayStatus({
         play: false,
         loading: true

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/demos/base-demo/index.html

@@ -11,7 +11,7 @@
 <body>
   <div className="demo">
     <h2>视频模式使用示例：</h2>
-    <div id="video-container" style="width:600px;height: 400px;">
+    <div id="video-container" style="width:600px;">
     </div>
     <div>
       <button onClick="play()">play</button>
@@ -37,12 +37,9 @@
         playr = new EZUIKit.EZUIKitPlayer({
           id: 'video-container', // 视频容器ID
           accessToken: accessToken,
-          autoplay:false,
           url: 'ezopen://open.ys7.com/G39444019/1.live',
           template: 'simple', // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版; theme-可配置主题；
           plugin: ['talk'],                       // 加载插件，talk-对讲
-          staticPath: "/ezuikit_v5.0",
-          // staticPath:"http://127.0.0.1:8080/ezuikit_v5.0",
           width: 600,
           height: 400,
         });