ezuikit-js 0.5.5 → 0.5.8-beta

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+v 0.5.7  
+[feta]新增对讲成功回调，用于国标对讲成功，开启视频声音  
+
+[feta]新增对讲失败回调，返回对讲失败错误信息  
+
+[fix]修复无子账号对讲权限不足，错误未捕获问题  
+
 v 0.5.5  
 [fix]修复无子账号对讲权限不足，错误未捕获问题  
 

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 {
@@ -27436,7 +27437,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 +27646,8 @@ window.tts = tts;
 
 var Talk = /*#__PURE__*/function () {
   function Talk(jSPlugin) {
+    var _this = this;
+
     _classCallCheck$1(this, Talk);
 
     this.jSPlugin = jSPlugin;
@@ -27664,11 +27672,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 +27710,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 +27751,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 +29330,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 +29470,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;
           }
         }
@@ -31796,8 +31832,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', ''];
@@ -31896,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();
 
@@ -32076,6 +32117,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;
 
@@ -32153,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);
+              }
             } // 回放处理
 
 
@@ -32462,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({
@@ -32620,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);
@@ -32633,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) => {