ezuikit-js 0.6.1-beta.0 → 0.6.1-beta.3

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;
     });
   }
 
@@ -588,23 +590,27 @@ var Status = /*#__PURE__*/function () {
   }, {
     key: "loadingClearText",
     value: function loadingClearText() {
-      var elements = document.getElementById("".concat(this.id, "-loading-item-0")).childNodes;
+      if (document.getElementById("".concat(this.id, "-loading-item-0"))) {
+        var elements = document.getElementById("".concat(this.id, "-loading-item-0")).childNodes;
 
-      if (elements.length > 1) {
-        elements[1].parentNode.removeChild(elements[1]);
+        if (elements.length > 1) {
+          elements[1].parentNode.removeChild(elements[1]);
+        }
       }
     }
   }, {
     key: "loadingClear",
     value: function loadingClear() {
-      var elements = document.getElementById("".concat(this.id, "-loading-item-0")).childNodes;
+      if (document.getElementById("".concat(this.id, "-loading-item-0"))) {
+        var elements = document.getElementById("".concat(this.id, "-loading-item-0")).childNodes;
 
-      for (var i = elements.length - 1; i >= 0; i--) {
-        elements[i].parentNode.removeChild(elements[i]);
-      }
+        for (var i = elements.length - 1; i >= 0; i--) {
+          elements[i].parentNode.removeChild(elements[i]);
+        }
 
-      if (document.getElementById("".concat(this.id, "-loading-id-0"))) {
-        document.getElementById("".concat(this.id, "-loading-id-0")).style.background = 'none';
+        if (document.getElementById("".concat(this.id, "-loading-id-0"))) {
+          document.getElementById("".concat(this.id, "-loading-id-0")).style.background = 'none';
+        }
       }
     }
   }, {
@@ -16249,7 +16255,7 @@ var Rec = /*#__PURE__*/function () {
     this.datepickerVisible = false;
     var canvasItemWidth = parseInt(getComputedStyle(document.getElementById(jSPlugin.id)).width, 10) - 100;
     var canvasContainer = document.createElement('div');
-    canvasContainer.style = "display:inline-block;width:".concat(canvasItemWidth, "px;height:48px;");
+    canvasContainer.style = "display:inline-block;height:48px;";
     canvasContainer.id = this.jSPlugin.id + "-canvas-container";
     var canvasItem = document.createElement('canvas');
     canvasItem.id = this.jSPlugin.id + "-canvas";
@@ -17252,6 +17258,11 @@ var Ptz = /*#__PURE__*/function () {
     _classCallCheck$1(this, Ptz);
 
     this.jSPlugin = jSPlugin;
+
+    if (document.getElementById(this.jSPlugin.id + "-ez-ptz-item")) {
+      return false;
+    }
+
     var ptzWrap = document.createElement('div');
     ptzWrap.id = this.jSPlugin.id + "-ez-ptz-item";
     ptzWrap.className = "ez-ptz-wrap";
@@ -28553,6 +28564,10 @@ var Theme = /*#__PURE__*/function () {
   }, {
     key: "changeTheme",
     value: function changeTheme(options) {
+      if (this.Rec) {
+        this.Rec.unSyncTimeLine();
+      }
+
       if (typeof options === 'string') {
         this.jSPlugin.themeId = options;
 
@@ -31912,9 +31927,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 () {
@@ -31957,7 +32003,7 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       this.env = {
         domain: "https://open.ys7.com"
       };
-      this.staticPath = isVersion2Available() ? "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_static/v6/v2" : "https://open.ys7.com/assets/ezuikit_static/v6/v1";
 
       if (typeof params.staticPath === 'string') {
         if (params.staticPath.startsWith("http")) {
@@ -31965,6 +32011,12 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
         } else {
           this.staticPath = window.location.protocol + '//' + window.location.host + params.staticPath;
         }
+
+        if (isVersion2Available()) {
+          this.staticPath += '/v2';
+        } else {
+          this.staticPath += '/v1';
+        }
       }
 
       if (typeof params.audio !== 'undefined') {
@@ -31983,11 +32035,11 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
         this.enableSharedArrayBufferGuide = params.enableSharedArrayBufferGuide;
       }
 
-      var pluginUrl = "".concat(this.staticPath, "/js/jsPlugin-4.0.2.min.js");
+      var pluginUrl = "".concat(this.staticPath, "/js/jsPluginV1-1.0.0.min.js");
 
       if (isVersion2Available()) {
         console.log("启用多线程解析视频");
-        pluginUrl = "".concat(this.staticPath, "/jsPlugin-2.0.1.min.js");
+        pluginUrl = "".concat(this.staticPath, "/js/jsPluginV2-2.0.1.min.js");
       } else {
         // 是否引导用户开启谷歌实验室 Google Labs 特性
         //enableSharedArrayBufferGuide
@@ -32105,7 +32157,11 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
           });
         }
       }, function () {
-        return !!window.JSPlugin;
+        if (isVersion2Available()) {
+          return !!window.JSPluginV2;
+        }
+
+        return !!window.JSPluginV1;
       });
 
       if (params.plugin && params.plugin.indexOf("talk") !== -1) {
@@ -32158,7 +32214,7 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
         var jSPlugin;
 
         if (isVersion2Available()) {
-          jSPlugin = new window.JSPlugin({
+          jSPlugin = new window.JSPluginV2({
             szId: id,
             iType: 2,
             iWidth: width,
@@ -32224,7 +32280,7 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
             }
           }, 50);
         } else {
-          jSPlugin = new window.JSPlugin({
+          jSPlugin = new window.JSPluginV1({
             szId: id,
             iType: 2,
             iWidth: width,
@@ -32742,9 +32798,15 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
           text: 'startPlaySuccess'
         });
       }, function (err) {
-        var errorInfo = _this4.errorHander.matchErrorInfo(err.oError.errorCode);
+        var msg = '播放失败，请检查设备及客户端网络';
+        var retcode = -1;
 
-        var msg = errorInfo ? errorInfo.description : '播放失败，请检查设备及客户端网络';
+        if (err && err.oError && err.oError.errorCode) {
+          var errorInfo = _this4.errorHander.matchErrorInfo(err.oError.errorCode);
+
+          msg = errorInfo && errorInfo.description ? errorInfo.description : '播放失败，请检查设备及客户端网络';
+          retcode = err.oError.errorCode;
+        }
 
         _this4.pluginStatus.loadingSetText({
           text: msg,
@@ -32753,7 +32815,7 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
 
         if (typeof _this4.params.handleError === 'function') {
           _this4.params.handleError({
-            retcode: err.oError.errorCode,
+            retcode: retcode,
             msg: msg,
             id: _this4.params.id,
             type: "handleError"
@@ -32822,7 +32884,7 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
 
           if (typeof _this5.params.handleError === 'function') {
             _this5.params.handleError({
-              retcode: err.oError.errorCode,
+              retcode: err.oError ? err.oError.errorCode : -1,
               msg: msg,
               id: _this5.params.id,
               type: "handleError"
@@ -32839,6 +32901,17 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
     value: function stop() {
       var _this6 = this;
 
+      if (!this.jSPlugin.bPlay) {
+        console.log("当前非播放状态");
+        var promise = new Promise(function (resolve, reject) {
+          reject({
+            retcode: -1,
+            msg: "当前非播放状态"
+          });
+        });
+        return promise;
+      }
+
       this.pluginStatus.setPlayStatus({
         loading: true
       });
@@ -33221,6 +33294,8 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       this.width = width;
       this.height = height;
       document.getElementById("".concat(this.id, "-wrap")).style = "width:".concat(width, "px;position:relative;");
+      document.getElementById("".concat(this.id)).style.width = width + 'px';
+      document.getElementById("".concat(this.id)).style.height = height + 'px';
       this.jSPlugin.JS_Resize(width, height);
     }
   }, {
@@ -33488,6 +33563,16 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       };
       request(capacityUrl, 'POST', capacityParams, '', capacitySuccess);
     }
+  }, {
+    key: "pause",
+    value: function pause() {
+      this.jSPlugin.JS_Pause(0);
+    }
+  }, {
+    key: "resume",
+    value: function resume() {
+      this.jSPlugin.JS_Resume(0);
+    }
   }]);
 
   return EZUIKitPlayer;