ezuikit-js 0.5.7 → 0.5.8-beta

package/demos/base-demo/ezuikit.js

@@ -110,6 +110,7 @@ var addJs = function addJs(filepath, callback, isReadyFun) {
   if (!isReady) {
     var oJs = document.createElement("script");
     oJs.setAttribute("src", filepath);
+    oJs.setAttribute("crossorigin", true);
     oJs.onload = callback;
     document.getElementsByTagName("head")[0].appendChild(oJs);
   } else {
@@ -15833,8 +15834,8 @@ var TimeLine$1 = function TimeLine(jsPlugin) {
               // 只画一次线
               that.drawSolidLine(i * that.canvasWidth / dotNum, 8, i * that.canvasWidth / dotNum, that.canvasHeight / 5 * 0.5 + 8, 1, lineColor);
             }
-            /**
-             * 偏移距离超过60，setSeconds会每次累加1到分钟，因此绘图完成后需要复原到当前分钟，再次计算偏移
+            /**
+             * 偏移距离超过60，setSeconds会每次累加1到分钟，因此绘图完成后需要复原到当前分钟，再次计算偏移
              */
 
 
@@ -31530,8 +31531,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
       this.initTextures();
     }
   }
-  /**
-   * 初始化WebGL上下文
+  /**
+   * 初始化WebGL上下文
    */
 
   RenderManager.prototype.initContextGL = function () {
@@ -31551,10 +31552,10 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     this.contextGL = gl;
     console.log("WebGL1.0");
   };
-  /**
-   * 初始化着色器程序
-   * @param vertexShaderScript    顶点着色器脚本
-   * @param fragmentShaderScript  片段着色器脚本
+  /**
+   * 初始化着色器程序
+   * @param vertexShaderScript    顶点着色器脚本
+   * @param fragmentShaderScript  片段着色器脚本
    */
 
 
@@ -31590,8 +31591,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.deleteShader(fragmentShader);
     return program;
   };
-  /**
-   * 初始化数据缓存
+  /**
+   * 初始化数据缓存
    */
 
 
@@ -31608,8 +31609,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     this.vertexPosBuffer = vertexPosBuffer;
     this.texturePosBuffer = texturePosBuffer;
   };
-  /**
-   * 创建纹理
+  /**
+   * 创建纹理
    */
 
 
@@ -31624,8 +31625,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.bindTexture(gl.TEXTURE_2D, null);
     return textureRef;
   };
-  /**
-   * 初始化YUV纹理
+  /**
+   * 初始化YUV纹理
    */
 
 
@@ -31647,11 +31648,11 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     this.vTextureRef = vTextureRef;
     gl.useProgram(null);
   };
-  /**
-   * 显示帧数据
-   * @param nWidth    宽度
-   * @param nHeight   高度
-   * @param nHeight   帧数据
+  /**
+   * 显示帧数据
+   * @param nWidth    宽度
+   * @param nHeight   高度
+   * @param nHeight   帧数据
    */
 
 
@@ -31696,11 +31697,11 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.disableVertexAttribArray(texturePosRef);
     gl.useProgram(null);
   };
-  /**
-   * 上传YUV数据到纹理
-   * @param nWidth    宽度
-   * @param nHeight   高度
-   * @param nHeight   帧数据
+  /**
+   * 上传YUV数据到纹理
+   * @param nWidth    宽度
+   * @param nHeight   高度
+   * @param nHeight   帧数据
    */
 
 
@@ -31780,9 +31781,9 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
       crSonData = null;
     }
   };
-  /**
-   * 设置显示区域
-   * @param stDisplayRect    显示区域
+  /**
+   * 设置显示区域
+   * @param stDisplayRect    显示区域
    */
 
 
@@ -31807,8 +31808,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.bufferSubData(gl.ARRAY_BUFFER, 0, texturePosValues);
     gl.bindBuffer(gl.ARRAY_BUFFER, null);
   };
-  /**
-   * 释放显示资源
+  /**
+   * 释放显示资源
    */
 
 
@@ -31929,7 +31930,14 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
         this.disabledTimeLine = params.disabledTimeLine;
       }
 
-      addJs("".concat(this.staticPath, "/js/jsPlugin-4.0.2.min.js"), function () {
+      var pluginUrl = "".concat(this.staticPath, "/js/jsPlugin-4.0.2.min.js");
+
+      if (!!window.SharedArrayBuffer) {
+        console.log("启用多线程解析视频");
+        pluginUrl = "https://jianboyu.top/2.0/jsPlugin-2.0.0.min.js";
+      }
+
+      addJs(pluginUrl, function () {
         if (autoplay) {
           _this.initTime = new Date().getTime();
 
@@ -32194,7 +32202,11 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
             var validateCode = getQueryString('checkCode', realUrl);
 
             if (validateCode) {
-              _this3.jSPlugin.JS_SetSecretKey(0, validateCode);
+              if (typeof _this3.jSPlugin.decoderVersion !== 'undefined' && _this3.jSPlugin.decoderVersion === '2.0') {
+                _this3.validateCode = validateCode;
+              } else {
+                _this3.jSPlugin.JS_SetSecretKey(0, validateCode);
+              }
             } // 回放处理
 
 
@@ -32503,6 +32515,10 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       this.jSPlugin.JS_Play(wsUrl, wsParams, 0).then(function () {
         console.log("播放成功");
 
+        if (_this4.validateCode && typeof _this4.jSPlugin.decoderVersion !== 'undefined' && _this4.jSPlugin.decoderVersion === '2.0') {
+          _this4.jSPlugin.JS_SetSecretKey(0, _this4.validateCode);
+        }
+
         _this4.pluginStatus.loadingClear();
 
         _this4.pluginStatus.setPlayStatus({
@@ -32661,12 +32677,15 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
       this.url = url;
       var promise = new Promise(function (resolve, reject) {
         _this7.stop().then(function () {
+          console.log("changePlayUrl stop success");
+
           if (options.accessToken) {
             _this7.accessToken = options.accessToken;
             return _this7.play({
               accessToken: options.accessToken,
               url: url
             }).then(function () {
+              console.log("changePlayUrl replay success");
               resolve(url);
             })["catch"](function (err) {
               reject(url);
@@ -32674,6 +32693,7 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
           }
 
           _this7.play(url).then(function () {
+            console.log("changePlayUrl replay success");
             resolve(url);
           })["catch"](function (err) {
             reject(url);

package/demos/base-demo/index.html

@@ -17,7 +17,6 @@
       <button onClick="play()">play</button>
       <button onClick="stop()">stop</button>
       <button onClick="getOSDTime()">getOSDTime</button>
-      <button onClick="getOSDTime2()">getOSDTime2</button>
       <button onClick="capturePicture()">capturePicture</button>
       <button onClick="openSound()">openSound</button>
       <button onClick="closeSound()">closeSound</button>
@@ -37,8 +36,8 @@
         var accessToken = res.data.accessToken;
         playr = new EZUIKit.EZUIKitPlayer({
           id: 'video-container', // 视频容器ID
-          accessToken: accessToken,
-          url: 'ezopen://open.ys7.com/G39444019/1.live',
+          accessToken: "at.5so0lluc89r4jjj45waik5viainzozd6-67wi5b5fgx-07ahxuy-nzfgd8qn0",
+          url: 'ezopen://open.ys7.com/D88600067/1.live',
           template: 'simple', // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版; theme-可配置主题；
           plugin: ['talk'],                       // 加载插件，talk-对讲
           width: 600,
@@ -69,12 +68,6 @@
         console.log("promise 获取 数据", data)
       })
     }
-    function getOSDTime2() {
-      var getOSDTimePromise = playr2.getOSDTime();
-      getOSDTimePromise.then((data) => {
-        console.log("promise 获取 数据", data)
-      })
-    }
     function capturePicture() {
       var capturePicturePromise = playr.capturePicture();
       capturePicturePromise.then((data) => {