ezuikit-js 7.6.5 → 7.6.6

package/demos/react-demo/package.json

@@ -7,7 +7,7 @@
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
     "axios": "^0.19.2",
-    "ezuikit-js": "^0.6.5",
+    "ezuikit-js": "^7.6.6",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-scripts": "3.4.1"

package/demos/vue-demo/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "core-js": "^3.6.4",
-    "ezuikit-js": "^0.6.5",
+    "ezuikit-js": "^7.6.6",
     "vue": "^2.6.11"
   },
   "devDependencies": {

package/ezuikit.js

@@ -27308,7 +27308,7 @@ var Talk = /*#__PURE__*/function () {
     }
   }, {
     key: "startTalk",
-    value: function startTalk() {
+    value: function startTalk(callback) {
       var _this2 = this;
       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') {
@@ -27353,16 +27353,22 @@ var Talk = /*#__PURE__*/function () {
             window.EZUIKit.opt.deviceSerial = matchEzopenUrl(_this2.jSPlugin.url).deviceSerial;
             window.EZUIKit.opt.channelNo = matchEzopenUrl(_this2.jSPlugin.url).channelNo;
             var urlList = window.EZUIKit.opt.ttsUrl.split("?");
-            if (urlList.length === 2) {
-              // 国标设备
+            if (urlList.length === 2 || window.EZUIKit.opt.deviceSerial.indexOf(":") !== -1) {
+              // 国标设备、第三方对讲设备使用新的对讲格式
               var talk = "talk?dev=" + window.EZUIKit.opt.deviceSerial + "&chann=" + window.EZUIKit.opt.channelNo + "&encodetype=2";
+              // var talk = "talk?dev=" + window.EZUIKit.opt.deviceSerial + "&chann=0" + "&encodetype=2";
               window.EZUIKit.opt.talkLink = window.EZUIKit.opt.ttsUrl.split("?")[0] + "/" + talk;
-              window.EZUIKit.opt.talkType = "gb28181";
+              if (apiResult.ttsUrl.indexOf('gb28181') > -1) {
+                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;
             }
+            if (callback) {
+              callback(apiResult.ttsUrl.indexOf('gb28181') > -1);
+            }
             window.EZUIKit.opt.stream = apiResult.stream;
             window.startTalk();
           }
@@ -30197,20 +30203,17 @@ var Theme = /*#__PURE__*/function () {
               play = _this9$decoderState$s2.play,
               sound = _this9$decoderState$s2.sound,
               talk = _this9$decoderState$s2.talk;
-            if (play) {
+            if (play && !talk) {
               if (sound) {
                 _this9.jSPlugin.closeSound();
                 _this9.setDecoderState({
                   sound: false
                 });
               } else {
-                //xuehb 判断是否打开对讲了，对讲情况下不可以打开声音
-                if (!talk) {
-                  _this9.jSPlugin.openSound();
-                  _this9.setDecoderState({
-                    sound: true
-                  });
-                }
+                _this9.jSPlugin.openSound();
+                _this9.setDecoderState({
+                  sound: true
+                });
               }
             }
           };
@@ -30281,13 +30284,15 @@ var Theme = /*#__PURE__*/function () {
                 _this9.setDecoderState({
                   talk: true
                 });
-                if (sound) {
-                  _this9.jSPlugin.closeSound();
-                  _this9.setDecoderState({
-                    sound: false
-                  });
-                }
-                _this9.jSPlugin.Talk.startTalk();
+                _this9.jSPlugin.Talk.startTalk(function (isGb) {
+                  if (sound && !isGb) {
+                    // 非国标设开启对讲时关闭视频流声音
+                    _this9.jSPlugin.closeSound();
+                    _this9.setDecoderState({
+                      sound: false
+                    });
+                  }
+                });
               }
             }
           };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ezuikit-js",
   "maintainers": ["jzy"],
-  "version": "7.6.5",
+  "version": "7.6.6",
   "description": "ezuikit javascript for npm",
   "main": "ezuikit.js",
   "scripts": {