trtc-electron-sdk 13.0.709-alpha.1 → 13.0.709-beta.1

package/liteav/MediaMixingDesigner/index.js

@@ -158,7 +158,7 @@ class TRTCMediaMixingDesigner {
         (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.off(event, func);
     }
     destroy() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         if (this.resizeObserver) {
             if (this.container) {
                 this.resizeObserver.unobserve(this.container);
@@ -171,9 +171,9 @@ class TRTCMediaMixingDesigner {
         this.movableHandler = null;
         this.resizableHandler = null;
         (_c = this.container) === null || _c === void 0 ? void 0 : _c.removeEventListener('contextmenu', this.onRightButtonClicked, false);
-        (_d = this.container) === null || _d === void 0 ? void 0 : _d.removeEventListener("mousedown", this.onContainerMousedown, false);
+        document.removeEventListener("mousedown", this.onContainerMousedown, false);
         if (this.moveAndResizeOverlay) {
-            (_e = this.container) === null || _e === void 0 ? void 0 : _e.removeChild(this.moveAndResizeOverlay);
+            (_d = this.container) === null || _d === void 0 ? void 0 : _d.removeChild(this.moveAndResizeOverlay);
             this.moveAndResizeOverlay = null;
         }
         this.container = null;
@@ -204,7 +204,7 @@ class TRTCMediaMixingDesigner {
             this.onContainerMousedown = this.onContainerMousedown.bind(this);
             this.onContainerMousemove = this.onContainerMousemove.bind(this);
             this.onContainerMouseup = this.onContainerMouseup.bind(this);
-            this.container.addEventListener("mousedown", this.onContainerMousedown, false);
+            document.addEventListener("mousedown", this.onContainerMousedown, false);
             this.onRightButtonClicked = this.onRightButtonClicked.bind(this);
             this.container.addEventListener('contextmenu', this.onRightButtonClicked, false);
         }
@@ -405,29 +405,31 @@ class TRTCMediaMixingDesigner {
         const target = event.target;
         this.eventButton = event.button;
         if (target && this.container) {
-            // calc click point coordinates in mix video image
-            const containerBounds = this.container.getBoundingClientRect();
-            const xInPreviewImage = event.clientX - containerBounds.left - this.absoluteWorkingArea.left - this.previewLeft;
-            const yInPreviewImage = event.clientY - containerBounds.top - this.absoluteWorkingArea.top - this.previewTop;
-            const xInImage = xInPreviewImage / this.previewScale;
-            const yInImage = yInPreviewImage / this.previewScale;
-            for (let i = 0; i < this.mediaList.length; i++) {
-                const item = this.mediaList[i];
-                if (item.rect &&
-                    xInImage >= item.rect.left &&
-                    xInImage <= item.rect.right &&
-                    yInImage >= item.rect.top &&
-                    yInImage <= item.rect.bottom) {
-                    this.clickedMediaSources.push(item);
-                    if (this.mediaList[this.selectedMediaIndex]) {
-                        if (item.id === this.mediaList[this.selectedMediaIndex].id) {
-                            this.oldSelectedIndex = this.clickedMediaSources.length - 1;
+            if (this.container.contains(target)) {
+                // calc click point coordinates in mix video image
+                const containerBounds = this.container.getBoundingClientRect();
+                const xInPreviewImage = event.clientX - containerBounds.left - this.absoluteWorkingArea.left - this.previewLeft;
+                const yInPreviewImage = event.clientY - containerBounds.top - this.absoluteWorkingArea.top - this.previewTop;
+                const xInImage = xInPreviewImage / this.previewScale;
+                const yInImage = yInPreviewImage / this.previewScale;
+                for (let i = 0; i < this.mediaList.length; i++) {
+                    const item = this.mediaList[i];
+                    if (item.rect &&
+                        xInImage >= item.rect.left &&
+                        xInImage <= item.rect.right &&
+                        yInImage >= item.rect.top &&
+                        yInImage <= item.rect.bottom) {
+                        this.clickedMediaSources.push(item);
+                        if (this.mediaList[this.selectedMediaIndex]) {
+                            if (item.id === this.mediaList[this.selectedMediaIndex].id) {
+                                this.oldSelectedIndex = this.clickedMediaSources.length - 1;
+                            }
                         }
                     }
                 }
+                this.mousedownLeft = event.screenX;
+                this.mousedownTop = event.screenY;
             }
-            this.mousedownLeft = event.screenX;
-            this.mousedownTop = event.screenY;
             if (this.clickedMediaSources.length > 0) {
                 if (this.eventButton === 2 && this.oldSelectedIndex === -1) {
                     // select first media source

package/liteav/extensions/MediaMixingManager/MediaMixingManager.d.ts

@@ -262,6 +262,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     setCameraCaptureParam(cameraID: string, params: TRTCCameraCaptureParams): void;
     /**
      * 设置手机投屏参数
+     * @private
      * @param phoneMirrorSourceId {string} - 手机投屏媒体源 ID
      * @param param {TRTCPhoneMirrorParam} - 手机投屏参数
      */

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -73,6 +73,10 @@ const TRTCMediaSourceType_HACK_JSDOC = {
     kImage: 2,
     /** 手机投屏 */
     kPhoneMirror: 4,
+    /** 在线视频 */
+    kOnlineVideo: 5,
+    /** 本地视频文件 */
+    kVideoFile: 6,
 };
 /**
  * 手机投屏媒体源参数
@@ -648,6 +652,7 @@ class TRTCMediaMixingManager {
     }
     /**
      * 设置手机投屏参数
+     * @private
      * @param phoneMirrorSourceId {string} - 手机投屏媒体源 ID
      * @param param {TRTCPhoneMirrorParam} - 手机投屏参数
      */

package/liteav/trtc.d.ts

@@ -1369,7 +1369,7 @@ declare class TRTCCloud extends EventEmitter {
      * @param {TRTCVideoResolutionMode} params.resMode - 分辨率模式（横屏分辨率 - 竖屏分辨率）
      * - TRTCVideoResolutionModeLandscape: 横屏分辨率
      * - TRTCVideoResolutionModePortrait : 竖屏分辨率
-     * @param {Number} params.videoFps     - 视频采集帧率
+     * @param {Number} params.videoFps     - 视频编码帧率
      * @param {Number} params.videoBitrate - 视频上行码率
      * @param {Number} params.minVideoBitrate - 视频最小码率
      * @param {Boolean} params.enableAdjustRes - 是否允许动态调整分辨率，默认值：关闭。

package/liteav/trtc.js

@@ -2543,7 +2543,7 @@ class TRTCCloud extends events_1.EventEmitter {
      * @param {TRTCVideoResolutionMode} params.resMode - 分辨率模式（横屏分辨率 - 竖屏分辨率）
      * - TRTCVideoResolutionModeLandscape: 横屏分辨率
      * - TRTCVideoResolutionModePortrait : 竖屏分辨率
-     * @param {Number} params.videoFps     - 视频采集帧率
+     * @param {Number} params.videoFps     - 视频编码帧率
      * @param {Number} params.videoBitrate - 视频上行码率
      * @param {Number} params.minVideoBitrate - 视频最小码率
      * @param {Boolean} params.enableAdjustRes - 是否允许动态调整分辨率，默认值：关闭。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "13.0.709-alpha.1",
+  "version": "13.0.709-beta.1",
   "description": "trtc electron sdk",
   "main": "./liteav/index.js",
   "types": "./liteav/index.d.ts",