ezuikit-js 0.5.6 → 0.5.7

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-v 0.5.6  
+v 0.5.7  
 [feta]新增对讲成功回调，用于国标对讲成功，开启视频声音  
 
 [feta]新增对讲失败回调，返回对讲失败错误信息  

package/demos/base-demo/ezuikit.js

@@ -15833,8 +15833,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到分钟，因此绘图完成后需要复原到当前分钟，再次计算偏移
              */
 
 
@@ -27436,7 +27436,12 @@ Janus.init({
                 "codec": "opus",
                 "dir": "sendrecv",
                 "audio_debug": 1
-              }; //tts.send({"message": body});
+              };
+
+              if (window.EZUIKit.opt.talkType === 'gb28181') {
+                body['devProto'] = 'gb28181';
+              } //tts.send({"message": body});
+
 
               Janus.debug("Trying a createOffer too (audio/video sendrecv)");
               tts.createOffer({
@@ -27640,6 +27645,8 @@ window.tts = tts;
 
 var Talk = /*#__PURE__*/function () {
   function Talk(jSPlugin) {
+    var _this = this;
+
     _classCallCheck$1(this, Talk);
 
     this.jSPlugin = jSPlugin;
@@ -27664,11 +27671,22 @@ var Talk = /*#__PURE__*/function () {
     //     addJs(`${this.jSPlugin.staticPath}/talk/tts-v4.js`, () => {
     // 临时处理
 
-    window.EZUIKit["handleTalkError"] = {
-      handleTalkError: function handleTalkError(err) {
-        console.log("talk err", err);
+    window.EZUIKit["handleTalkError"] = function (err) {
+      console.log("talk err", err);
+
+      if (typeof _this.jSPlugin.handleTalkError !== 'undefined') {
+        _this.jSPlugin.handleTalkError(err);
+      }
+    };
+
+    window.EZUIKit["handleTalkSuccess"] = function (data) {
+      console.log("talk success", data);
+
+      if (typeof _this.jSPlugin.handleTalkSuccess !== 'undefined') {
+        _this.jSPlugin.handleTalkSuccess(data);
       }
     };
+
     window.EZUIKit.opt = {
       rtcUrl: "",
       talkLink: "",
@@ -27691,9 +27709,9 @@ var Talk = /*#__PURE__*/function () {
   }, {
     key: "startTalk",
     value: function startTalk() {
-      var _this = this;
+      var _this2 = this;
 
-      if (!(this.jSPlugin.capacity && (this.jSPlugin.capacity.support_talk === '3' || this.jSPlugin.capacity.support_talk === '1'))) {
+      if (this.jSPlugin.capacity && this.jSPlugin.capacity.support_talk && !(this.jSPlugin.capacity && (this.jSPlugin.capacity.support_talk === '3' || this.jSPlugin.capacity.support_talk === '1'))) {
         if (typeof this.jSPlugin.params.handleError === 'function') {
           this.jSPlugin.params.handleError({
             msg: "设备不支持对讲",
@@ -27732,17 +27750,28 @@ var Talk = /*#__PURE__*/function () {
 
             window.EZUIKit.opt.rtcUrl = rtcTrunk;
             window.EZUIKit.opt.ttsUrl = "tts://" + apiResult.ttsUrl;
-            var talk = "talk://" + window.EZUIKit.opt.deviceSerial + ":0:" + window.EZUIKit.opt.channelNo + ":cas.ys7.com:6500";
-            window.EZUIKit.opt.talkLink = window.EZUIKit.opt.ttsUrl + "/" + talk;
+            var urlList = window.EZUIKit.opt.ttsUrl.split("?");
+
+            if (urlList.length === 2) {
+              // 国标设备
+              var talk = "talk?dev=" + window.EZUIKit.opt.deviceSerial + "&chann=" + window.EZUIKit.opt.channelNo + "&encodetype=2";
+              window.EZUIKit.opt.talkLink = window.EZUIKit.opt.ttsUrl.split("?")[0] + "/" + talk;
+              window.EZUIKit.opt.talkType = "gb28181";
+            } else {
+              // 普通设备
+              var talk = "talk://" + window.EZUIKit.opt.deviceSerial + ":0:" + window.EZUIKit.opt.channelNo + ":cas.ys7.com:6500";
+              window.EZUIKit.opt.talkLink = window.EZUIKit.opt.ttsUrl.split("?")[0] + "/" + talk;
+            }
+
             window.EZUIKit.opt.stream = apiResult.stream;
             window.startTalk();
           }
         } else {
-          if (typeof _this.jSPlugin.params.handleError === 'function') {
-            _this.jSPlugin.params.handleError({
+          if (typeof _this2.jSPlugin.params.handleError === 'function') {
+            _this2.jSPlugin.params.handleError({
               msg: data.msg,
               retcode: data.code,
-              id: _this.jSPlugin.params.id,
+              id: _this2.jSPlugin.params.id,
               type: "handleError"
             });
           }
@@ -29300,7 +29329,7 @@ var Theme = /*#__PURE__*/function () {
           var headerContainer = document.createElement('div');
           headerContainer.setAttribute('id', "".concat(this.jSPlugin.id, "-headControl"));
           headerContainer.setAttribute('class', 'head-message');
-          headerContainer.innerHTML = "<div id='".concat(this.jSPlugin.id, "}-headControl-left' style='display:flex'></div><div id='").concat(this.jSPlugin.id, "}-headControl-right' style='display:flex'></div>");
+          headerContainer.innerHTML = "<div id='".concat(this.jSPlugin.id, "-headControl-left' style='display:flex'></div><div id='").concat(this.jSPlugin.id, "}-headControl-right' style='display:flex'></div>");
           var headerStyle = {
             height: this.jSPlugin.width > MEDIAWIDTH ? "48px" : "32px",
             "line-height": this.jSPlugin.width > MEDIAWIDTH ? "48px" : "32px",
@@ -29440,11 +29469,17 @@ var Theme = /*#__PURE__*/function () {
         if (data.code == 200 && data.data) {
           // 设备序列号
           if (document.getElementById("".concat(_this6.jSPlugin.id, "-deviceName-content"))) {
+            document.getElementById("".concat(_this6.jSPlugin.id, "-deviceName-content")).style.maxWidth = "160px";
+            document.getElementById("".concat(_this6.jSPlugin.id, "-deviceName-content")).style.overflow = "hidden";
+            document.getElementById("".concat(_this6.jSPlugin.id, "-deviceName-content")).style.textOverflow = "ellipsis";
             document.getElementById("".concat(_this6.jSPlugin.id, "-deviceName-content")).innerHTML = data.data.deviceName;
           } // 设备序列号
 
 
           if (document.getElementById("".concat(_this6.jSPlugin.id, "-deviceID-content"))) {
+            document.getElementById("".concat(_this6.jSPlugin.id, "-deviceID-content")).style.maxWidth = "160px";
+            document.getElementById("".concat(_this6.jSPlugin.id, "-deviceID-content")).style.overflow = "hidden";
+            document.getElementById("".concat(_this6.jSPlugin.id, "-deviceID-content")).style.textOverflow = "ellipsis";
             document.getElementById("".concat(_this6.jSPlugin.id, "-deviceID-content")).innerHTML = matchEzopenUrl(_this6.jSPlugin.url).deviceSerial;
           }
         }
@@ -31495,8 +31530,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
       this.initTextures();
     }
   }
-  /**
-   * 初始化WebGL上下文
+  /**
+   * 初始化WebGL上下文
    */
 
   RenderManager.prototype.initContextGL = function () {
@@ -31516,10 +31551,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  片段着色器脚本
    */
 
 
@@ -31555,8 +31590,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.deleteShader(fragmentShader);
     return program;
   };
-  /**
-   * 初始化数据缓存
+  /**
+   * 初始化数据缓存
    */
 
 
@@ -31573,8 +31608,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     this.vertexPosBuffer = vertexPosBuffer;
     this.texturePosBuffer = texturePosBuffer;
   };
-  /**
-   * 创建纹理
+  /**
+   * 创建纹理
    */
 
 
@@ -31589,8 +31624,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.bindTexture(gl.TEXTURE_2D, null);
     return textureRef;
   };
-  /**
-   * 初始化YUV纹理
+  /**
+   * 初始化YUV纹理
    */
 
 
@@ -31612,11 +31647,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   帧数据
    */
 
 
@@ -31661,11 +31696,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   帧数据
    */
 
 
@@ -31745,9 +31780,9 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
       crSonData = null;
     }
   };
-  /**
-   * 设置显示区域
-   * @param stDisplayRect    显示区域
+  /**
+   * 设置显示区域
+   * @param stDisplayRect    显示区域
    */
 
 
@@ -31772,8 +31807,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.bufferSubData(gl.ARRAY_BUFFER, 0, texturePosValues);
     gl.bindBuffer(gl.ARRAY_BUFFER, null);
   };
-  /**
-   * 释放显示资源
+  /**
+   * 释放显示资源
    */
 
 
@@ -31796,8 +31831,6 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
   return RenderManager;
 });
 
-// iframe模板 - 兼容旧版本
-
 var matchTemplate = function matchTemplate(templateName, params) {
   var IFRAMETEMPLATE = ['simple', 'standard', 'security', 'voice', 'theme'];
   var LOCALTEMPLATE = ['pcLive', 'pcRec', 'mobileLive', 'mobileRec', 'noData', ''];
@@ -32076,6 +32109,14 @@ var EZUIKitPlayer = /*#__PURE__*/function () {
           _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;
 

package/ezuikit.js

@@ -15833,8 +15833,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到分钟，因此绘图完成后需要复原到当前分钟，再次计算偏移
              */
 
 
@@ -27754,7 +27754,7 @@ var Talk = /*#__PURE__*/function () {
 
             if (urlList.length === 2) {
               // 国标设备
-              var talk = "talk://" + window.EZUIKit.opt.deviceSerial + ":0:" + window.EZUIKit.opt.channelNo + ":cas.ys7.com:6500";
+              var talk = "talk?dev=" + window.EZUIKit.opt.deviceSerial + "&chann=" + window.EZUIKit.opt.channelNo + "&encodetype=2";
               window.EZUIKit.opt.talkLink = window.EZUIKit.opt.ttsUrl.split("?")[0] + "/" + talk;
               window.EZUIKit.opt.talkType = "gb28181";
             } else {
@@ -31530,8 +31530,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
       this.initTextures();
     }
   }
-  /**
-   * 初始化WebGL上下文
+  /**
+   * 初始化WebGL上下文
    */
 
   RenderManager.prototype.initContextGL = function () {
@@ -31551,10 +31551,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 +31590,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.deleteShader(fragmentShader);
     return program;
   };
-  /**
-   * 初始化数据缓存
+  /**
+   * 初始化数据缓存
    */
 
 
@@ -31608,8 +31608,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     this.vertexPosBuffer = vertexPosBuffer;
     this.texturePosBuffer = texturePosBuffer;
   };
-  /**
-   * 创建纹理
+  /**
+   * 创建纹理
    */
 
 
@@ -31624,8 +31624,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.bindTexture(gl.TEXTURE_2D, null);
     return textureRef;
   };
-  /**
-   * 初始化YUV纹理
+  /**
+   * 初始化YUV纹理
    */
 
 
@@ -31647,11 +31647,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 +31696,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 +31780,9 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
       crSonData = null;
     }
   };
-  /**
-   * 设置显示区域
-   * @param stDisplayRect    显示区域
+  /**
+   * 设置显示区域
+   * @param stDisplayRect    显示区域
    */
 
 
@@ -31807,8 +31807,8 @@ var fragmentYUVShader = ['precision highp float;', 'varying highp vec2 textureCo
     gl.bufferSubData(gl.ARRAY_BUFFER, 0, texturePosValues);
     gl.bindBuffer(gl.ARRAY_BUFFER, null);
   };
-  /**
-   * 释放显示资源
+  /**
+   * 释放显示资源
    */
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezuikit-js",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "ezuikit javascript for npm",
   "main": "ezuikit.js",
   "scripts": {