ezuikit-js 0.5.7 → 0.5.8-beta.2

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) => {

package/demos/nginx-demo/conf/fastcgi.conf

@@ -0,0 +1,26 @@
+
+fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  REQUEST_SCHEME     $scheme;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

package/demos/nginx-demo/conf/fastcgi_params

@@ -0,0 +1,25 @@
+
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  REQUEST_SCHEME     $scheme;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

package/demos/nginx-demo/conf/koi-utf

@@ -0,0 +1,109 @@
+
+# This map is not a full koi8-r <> utf8 map: it does not contain
+# box-drawing and some other characters.  Besides this map contains
+# several koi8-u and Byelorussian letters which are not in koi8-r.
+# If you need a full and standard map, use contrib/unicode2nginx/koi-utf
+# map instead.
+
+charset_map  koi8-r  utf-8 {
+
+    80  E282AC ; # euro
+
+    95  E280A2 ; # bullet
+
+    9A  C2A0 ;   # &nbsp;
+
+    9E  C2B7 ;   # &middot;
+
+    A3  D191 ;   # small yo
+    A4  D194 ;   # small Ukrainian ye
+
+    A6  D196 ;   # small Ukrainian i
+    A7  D197 ;   # small Ukrainian yi
+
+    AD  D291 ;   # small Ukrainian soft g
+    AE  D19E ;   # small Byelorussian short u
+
+    B0  C2B0 ;   # &deg;
+
+    B3  D081 ;   # capital YO
+    B4  D084 ;   # capital Ukrainian YE
+
+    B6  D086 ;   # capital Ukrainian I
+    B7  D087 ;   # capital Ukrainian YI
+
+    B9  E28496 ; # numero sign
+
+    BD  D290 ;   # capital Ukrainian soft G
+    BE  D18E ;   # capital Byelorussian short U
+
+    BF  C2A9 ;   # (C)
+
+    C0  D18E ;   # small yu
+    C1  D0B0 ;   # small a
+    C2  D0B1 ;   # small b
+    C3  D186 ;   # small ts
+    C4  D0B4 ;   # small d
+    C5  D0B5 ;   # small ye
+    C6  D184 ;   # small f
+    C7  D0B3 ;   # small g
+    C8  D185 ;   # small kh
+    C9  D0B8 ;   # small i
+    CA  D0B9 ;   # small j
+    CB  D0BA ;   # small k
+    CC  D0BB ;   # small l
+    CD  D0BC ;   # small m
+    CE  D0BD ;   # small n
+    CF  D0BE ;   # small o
+
+    D0  D0BF ;   # small p
+    D1  D18F ;   # small ya
+    D2  D180 ;   # small r
+    D3  D181 ;   # small s
+    D4  D182 ;   # small t
+    D5  D183 ;   # small u
+    D6  D0B6 ;   # small zh
+    D7  D0B2 ;   # small v
+    D8  D18C ;   # small soft sign
+    D9  D18B ;   # small y
+    DA  D0B7 ;   # small z
+    DB  D188 ;   # small sh
+    DC  D18D ;   # small e
+    DD  D189 ;   # small shch
+    DE  D187 ;   # small ch
+    DF  D18A ;   # small hard sign
+
+    E0  D0AE ;   # capital YU
+    E1  D090 ;   # capital A
+    E2  D091 ;   # capital B
+    E3  D0A6 ;   # capital TS
+    E4  D094 ;   # capital D
+    E5  D095 ;   # capital YE
+    E6  D0A4 ;   # capital F
+    E7  D093 ;   # capital G
+    E8  D0A5 ;   # capital KH
+    E9  D098 ;   # capital I
+    EA  D099 ;   # capital J
+    EB  D09A ;   # capital K
+    EC  D09B ;   # capital L
+    ED  D09C ;   # capital M
+    EE  D09D ;   # capital N
+    EF  D09E ;   # capital O
+
+    F0  D09F ;   # capital P
+    F1  D0AF ;   # capital YA
+    F2  D0A0 ;   # capital R
+    F3  D0A1 ;   # capital S
+    F4  D0A2 ;   # capital T
+    F5  D0A3 ;   # capital U
+    F6  D096 ;   # capital ZH
+    F7  D092 ;   # capital V
+    F8  D0AC ;   # capital soft sign
+    F9  D0AB ;   # capital Y
+    FA  D097 ;   # capital Z
+    FB  D0A8 ;   # capital SH
+    FC  D0AD ;   # capital E
+    FD  D0A9 ;   # capital SHCH
+    FE  D0A7 ;   # capital CH
+    FF  D0AA ;   # capital hard sign
+}

package/demos/nginx-demo/conf/koi-win

@@ -0,0 +1,103 @@
+
+charset_map  koi8-r  windows-1251 {
+
+    80  88 ; # euro
+
+    95  95 ; # bullet
+
+    9A  A0 ; #  
+
+    9E  B7 ; # ·
+
+    A3  B8 ; # small yo
+    A4  BA ; # small Ukrainian ye
+
+    A6  B3 ; # small Ukrainian i
+    A7  BF ; # small Ukrainian yi
+
+    AD  B4 ; # small Ukrainian soft g
+    AE  A2 ; # small Byelorussian short u
+
+    B0  B0 ; # °
+
+    B3  A8 ; # capital YO
+    B4  AA ; # capital Ukrainian YE
+
+    B6  B2 ; # capital Ukrainian I
+    B7  AF ; # capital Ukrainian YI
+
+    B9  B9 ; # numero sign
+
+    BD  A5 ; # capital Ukrainian soft G
+    BE  A1 ; # capital Byelorussian short U
+
+    BF  A9 ; # (C)
+
+    C0  FE ; # small yu
+    C1  E0 ; # small a
+    C2  E1 ; # small b
+    C3  F6 ; # small ts
+    C4  E4 ; # small d
+    C5  E5 ; # small ye
+    C6  F4 ; # small f
+    C7  E3 ; # small g
+    C8  F5 ; # small kh
+    C9  E8 ; # small i
+    CA  E9 ; # small j
+    CB  EA ; # small k
+    CC  EB ; # small l
+    CD  EC ; # small m
+    CE  ED ; # small n
+    CF  EE ; # small o
+
+    D0  EF ; # small p
+    D1  FF ; # small ya
+    D2  F0 ; # small r
+    D3  F1 ; # small s
+    D4  F2 ; # small t
+    D5  F3 ; # small u
+    D6  E6 ; # small zh
+    D7  E2 ; # small v
+    D8  FC ; # small soft sign
+    D9  FB ; # small y
+    DA  E7 ; # small z
+    DB  F8 ; # small sh
+    DC  FD ; # small e
+    DD  F9 ; # small shch
+    DE  F7 ; # small ch
+    DF  FA ; # small hard sign
+
+    E0  DE ; # capital YU
+    E1  C0 ; # capital A
+    E2  C1 ; # capital B
+    E3  D6 ; # capital TS
+    E4  C4 ; # capital D
+    E5  C5 ; # capital YE
+    E6  D4 ; # capital F
+    E7  C3 ; # capital G
+    E8  D5 ; # capital KH
+    E9  C8 ; # capital I
+    EA  C9 ; # capital J
+    EB  CA ; # capital K
+    EC  CB ; # capital L
+    ED  CC ; # capital M
+    EE  CD ; # capital N
+    EF  CE ; # capital O
+
+    F0  CF ; # capital P
+    F1  DF ; # capital YA
+    F2  D0 ; # capital R
+    F3  D1 ; # capital S
+    F4  D2 ; # capital T
+    F5  D3 ; # capital U
+    F6  C6 ; # capital ZH
+    F7  C2 ; # capital V
+    F8  DC ; # capital soft sign
+    F9  DB ; # capital Y
+    FA  C7 ; # capital Z
+    FB  D8 ; # capital SH
+    FC  DD ; # capital E
+    FD  D9 ; # capital SHCH
+    FE  D7 ; # capital CH
+    FF  DA ; # capital hard sign
+}

package/demos/nginx-demo/conf/mime.types

@@ -0,0 +1,95 @@
+
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    application/font-woff                            woff;
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}