trtc-electron-sdk 12.2.115-beta.16 → 12.2.115-beta.18

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

@@ -393,6 +393,8 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     private setDisplayRect;
     private createDesigner;
     private destroyDesigner;
+    private createorUpdateLayoutManager;
+    private destroyLayoutManager;
     private updateMixingVideoSize;
     private listenDesignerEvent;
     private unlistenDesignerEvent;

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -444,18 +444,29 @@ class TRTCMediaMixingManager {
         this.windowID = realWindowID;
         if (realWindowID !== 0 && viewOrRegion !== null) {
             if (viewOrRegion instanceof HTMLElement) {
-                this.destroyDesigner();
-                this.view = viewOrRegion;
-                this.setDisplayRect();
-                this.initResizeObserver();
-                this.createDesigner();
+                if (this.view !== viewOrRegion) {
+                    this.destroyDesigner();
+                    this.view = viewOrRegion;
+                    this.setDisplayRect();
+                    this.initResizeObserver();
+                    this.createDesigner();
+                }
+                else {
+                    this.setDisplayRect();
+                    if (!this.mediaMixingDesigner) {
+                        this.createDesigner();
+                    }
+                }
             }
             else {
                 // Rect
+                this.destroyLayoutManager();
+                this.destroyDesigner();
                 this.nodeMediaMixingPlugin.setDisplayParams(realWindowID, viewOrRegion);
             }
         }
         else {
+            this.destroyLayoutManager();
             this.destroyDesigner();
             this.nodeMediaMixingPlugin.setDisplayParams(realWindowID, { left: 0, right: 0, top: 0, bottom: 0 });
         }
@@ -709,7 +720,7 @@ class TRTCMediaMixingManager {
      * }
      */
     setStreamLayout(layout) {
-        var _a, _b;
+        var _a, _b, _c;
         logger_1.default.log(`${this.logPrefix}setStreamLayout:`, layout);
         if (this.paramsStore) {
             try {
@@ -719,21 +730,7 @@ class TRTCMediaMixingManager {
                 this.paramsStore.streamLayout = undefined;
             }
         }
-        const context = {
-            container: this.view,
-            mixingVideoSize: {
-                width: this.mixingVideoWidth,
-                height: this.mixingVideoHeight
-            },
-            mediaMixingDesigner: this.mediaMixingDesigner
-        };
-        if (!this.streamLayoutManager) {
-            this.streamLayoutManager = StreamLayout_1.StreamLayoutFactory.create(layout.layoutMode, this.nodeMediaMixingPlugin, context);
-        }
-        else if (this.streamLayoutManager.getLayoutMode() !== layout.layoutMode) {
-            this.streamLayoutManager.destroy();
-            this.streamLayoutManager = StreamLayout_1.StreamLayoutFactory.create(layout.layoutMode, this.nodeMediaMixingPlugin, context);
-        }
+        this.createorUpdateLayoutManager(layout);
         let transferredUserList = layout.userList;
         if (this.view) {
             const viewRect = this.view.getBoundingClientRect();
@@ -767,7 +764,7 @@ class TRTCMediaMixingManager {
         else {
             logger_1.default.warn(`${this.logPrefix}setStreamLayout: view is null, no container HTML element. User control the layout manually in device pixel unit.`);
         }
-        this.streamLayoutManager.setLayout(Object.assign(Object.assign({}, layout), { userList: transferredUserList }));
+        (_c = this.streamLayoutManager) === null || _c === void 0 ? void 0 : _c.setLayout(Object.assign(Object.assign({}, layout), { userList: transferredUserList }));
     }
     /**
      * @private
@@ -896,6 +893,17 @@ class TRTCMediaMixingManager {
                 canExceedContainer: true,
             });
             this.listenDesignerEvent();
+            if (this.sourceList.length >= 1) {
+                this.sourceList.forEach((mediaSource => {
+                    var _a;
+                    (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.addMedia({
+                        id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
+                        rect: mediaSource.rect,
+                        isSelected: mediaSource.isSelected || false,
+                        origin: mediaSource
+                    });
+                }));
+            }
         }
     }
     destroyDesigner() {
@@ -906,6 +914,29 @@ class TRTCMediaMixingManager {
             this.mediaMixingDesigner = null;
         }
     }
+    createorUpdateLayoutManager(layout) {
+        const context = {
+            container: this.view,
+            mixingVideoSize: {
+                width: this.mixingVideoWidth,
+                height: this.mixingVideoHeight
+            },
+            mediaMixingDesigner: this.mediaMixingDesigner
+        };
+        if (!this.streamLayoutManager) {
+            this.streamLayoutManager = StreamLayout_1.StreamLayoutFactory.create(layout.layoutMode, this.nodeMediaMixingPlugin, context);
+        }
+        else if (this.streamLayoutManager.getLayoutMode() !== layout.layoutMode) {
+            this.streamLayoutManager.destroy();
+            this.streamLayoutManager = StreamLayout_1.StreamLayoutFactory.create(layout.layoutMode, this.nodeMediaMixingPlugin, context);
+        }
+    }
+    destroyLayoutManager() {
+        if (this.streamLayoutManager) {
+            this.streamLayoutManager.destroy();
+            this.streamLayoutManager = null;
+        }
+    }
     updateMixingVideoSize(params) {
         if (resolutionMap.has(params.videoResolution)) {
             const { width, height } = resolutionMap.get(params.videoResolution);

package/liteav/extensions/MediaMixingManager/StreamLayout/NoneStreamLayoutManager.js

@@ -17,13 +17,22 @@ class NoneStreamLayoutManager extends BaseStreamLayoutManager_1.default {
         this.refreshLayout();
     }
     refreshLayout() {
-        var _a;
+        var _a, _b;
         if (this.context && this.layout.userList) {
             this.centerLiveOwner();
-            (_a = this.nativeStreamLayoutManager) === null || _a === void 0 ? void 0 : _a.setStreamLayout(this.layout.userList);
+            if (this.layout.userList.length === 1 && this.layout.userList[0].rect && this.displayArea.width !== 0 && this.displayArea.height !== 0 && window.devicePixelRatio !== 0) {
+                const workingArea = this.layout.userList[0].rect;
+                (_a = this.context.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.setWorkingArea({
+                    left: workingArea.left / this.displayArea.width / window.devicePixelRatio,
+                    top: workingArea.top / this.displayArea.height / window.devicePixelRatio,
+                    right: workingArea.right / this.displayArea.width / window.devicePixelRatio,
+                    bottom: workingArea.bottom / this.displayArea.height / window.devicePixelRatio,
+                }, this.layout.userList[0].fillMode);
+            }
+            (_b = this.nativeStreamLayoutManager) === null || _b === void 0 ? void 0 : _b.setStreamLayout(this.layout.userList);
         }
         else {
-            logger_1.default.error(`${this.logPrefix}setLayout context is null or no user`);
+            logger_1.default.error(`${this.logPrefix}refreshLayout context is null or no user`);
         }
     }
     centerLiveOwner() {

package/package.json

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