fcr-ui-scene 3.6.4 → 3.7.0

package/lib/providers/sharing-provider.js

@@ -78,12 +78,11 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
       prefix: 'FcrUISharingProviderImpl'
     })));
     (0, _defineProperty2["default"])(this, "_observer", {
-      onScreenSharingUpdated: function onScreenSharingUpdated(ownerId, state) {
-        _this.screenSharingOwnerId = ownerId;
+      onScreenSharingUpdated: function onScreenSharingUpdated(ownerStream, state) {
+        _this.screenSharingOwnerId = (ownerStream === null || ownerStream === void 0 ? void 0 : ownerStream.owner.userId) || '';
         _this.screenSharingState = state;
         if (state === _type.FcrScreenSharingState.END && (0, _env.isElectron)()) {
-          _this.isReplaceScreen && _this._sharedScreenShareSharedDataSource.setIsReplaceScreen(false);
-          _this.isSeizeStream && _this._sharedScreenShareSharedDataSource.setIsSeizeStream(false);
+          _this._sharedScreenShareSharedDataSource.setSharingInReplace(false);
         }
       },
       onWhiteboardStarted: function onWhiteboardStarted(ownerId, operatorUser) {
@@ -136,11 +135,6 @@ var FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/f
     set: function set(v) {
       _classPrivateFieldSet(_D, this, v);
     }
-  }, {
-    key: "isReplaceScreen",
-    get: function get() {
-      return this._sharedScreenShareSharedDataSource.isReplaceScreen;
-    }
   }, {
     key: "isSeizeStream",
     get: function get() {

package/lib/providers/user-setting-storage-provider.d.ts

@@ -1,4 +1,5 @@
 import { FcrUISettingConfig } from '../type';
+export declare const settingConfigStorageKey = "fcr-ui-setting-config";
 export interface FcrUIUserSettingStorageProvider {
     /**
      * 写入本地存储

package/lib/providers/user-setting-storage-provider.js

@@ -17,7 +17,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIUserSettingStorageProviderImpl = void 0;
+exports.settingConfigStorageKey = exports.FcrUIUserSettingStorageProviderImpl = void 0;
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.keys.js");
@@ -27,9 +27,9 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _base = require("../base");
 var _env = require("agora-foundation/lib/utilities/env");
-var _settingConfigStorage = require("../utilities/setting-config-storage");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var settingConfigStorageKey = exports.settingConfigStorageKey = 'fcr-ui-setting-config';
 var FcrUIUserSettingStorageProviderImpl = exports.FcrUIUserSettingStorageProviderImpl = /*#__PURE__*/function () {
   function FcrUIUserSettingStorageProviderImpl() {
     (0, _classCallCheck2["default"])(this, FcrUIUserSettingStorageProviderImpl);
@@ -46,7 +46,7 @@ var FcrUIUserSettingStorageProviderImpl = exports.FcrUIUserSettingStorageProvide
       if (this._isElectron) {
         window.runtime.setUserSettingData(value);
       } else {
-        localStorage.setItem(_settingConfigStorage.settingConfigStorageKey, JSON.stringify(value));
+        localStorage.setItem(settingConfigStorageKey, JSON.stringify(value));
       }
       return 1;
     }
@@ -56,17 +56,10 @@ var FcrUIUserSettingStorageProviderImpl = exports.FcrUIUserSettingStorageProvide
       if (this._isElectron) {
         return window.runtime.getUserSettingData();
       } else {
-        var getItem = localStorage.getItem(_settingConfigStorage.settingConfigStorageKey);
+        var getItem = localStorage.getItem(settingConfigStorageKey);
         return getItem ? JSON.parse(getItem) : null;
       }
     }
-
-    // remove(key: string) {
-    //   localStorage.removeItem(key);
-    // }
   }]);
-}(); // export enum FcrLocalStorageSettingKey {
-//   SpotlightEnabled = 'spotlightEnabled',
-//   ShouldHideNonVideoParticipants = 'shouldHideNonVideoParticipants',
-// }
+}();
 (0, _base.registerDependency)('userSettingStorageProvider');

package/lib/providers/widget-provider.d.ts

@@ -2,6 +2,9 @@ import { FcrUIRoomProvider } from '../providers/room-provider';
 import { FcrRegisteredWidgetConfigs, FcrUIWebWidget, ID } from '../modules/widget/type';
 import { FcrUIWebWidgetConfig } from '../type';
 import { FcrUIDialogProvider } from './dialog-provider';
+export interface FcrUIWidgetObserver {
+    onWidgetClicked(widgetId: string): void;
+}
 export interface FcrUIWidgetProvider {
     /**
      *Map<id, FcrUIWebWidgetConfig>
@@ -21,6 +24,7 @@ export interface FcrUIWidgetProvider {
      */
     get dialogIds(): Map<ID, string>;
     /**
+     * type为 FcrWidgetType.webWidget 的widget 点击事件
      * 根据widgetId打开widget
      *实例化FcrUIBaseWidget，加入openedWidgets
      * @param widgetId widget唯一标识
@@ -33,11 +37,23 @@ export interface FcrUIWidgetProvider {
      * @param widgetId widget唯一标识
      */
     closeWidget(widgetId: string): void;
+    /**
+     * type为 FcrWidgetType.eventWidget 的widget 点击事件
+     * @param widgetId widget唯一标识
+     */
+    onWidgetClick(widgetId: string): void;
+    /**
+     * 添加widget观察者
+     * @param observer 观察者
+     */
+    addObserver(observer: FcrUIWidgetObserver): void;
 }
 export declare class FcrUIWidgetProviderImpl implements FcrUIWidgetProvider {
+    protected logger: import("agora-foundation/lib/logger").Logger;
     private _roomProvider;
     private _dialogProvider;
     private _dialogProviderObserver;
+    private _observable;
     accessor dialogIds: Map<ID, string>;
     accessor registeredWidgetConfigs: FcrRegisteredWidgetConfigs;
     accessor openedWidgets: Map<ID, FcrUIWebWidget>;
@@ -47,6 +63,9 @@ export declare class FcrUIWidgetProviderImpl implements FcrUIWidgetProvider {
         dialogProvider: FcrUIDialogProvider;
     });
     openWidget(widgetId: string): void;
+    onWidgetClick(widgetId: string): void;
     closeWidget(widgetId: string): void;
     release(): void;
+    addObserver(observer: FcrUIWidgetObserver): void;
+    removeObserver(observer: FcrUIWidgetObserver): void;
 }

package/lib/providers/widget-provider.js

@@ -56,6 +56,8 @@ var _mobx = require("mobx");
 var _base = require("../base");
 var _constant = require("../utilities/constant");
 var _webWidget = require("../modules/widget/web-widget");
+var _observable = require("agora-foundation/lib/utilities/observable");
+var _logger = require("../utilities/logger");
 var _FcrUIWidgetProviderImpl;
 var _initProto, _init_dialogIds, _init_registeredWidgetConfigs, _init_openedWidgets;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -78,7 +80,9 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
       roomProvider = _ref.roomProvider,
       dialogProvider = _ref.dialogProvider;
     (0, _classCallCheck2["default"])(this, FcrUIWidgetProviderImpl);
-    (0, _defineProperty2["default"])(this, "_roomProvider", void _initProto(this));
+    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrUIWidgetProvider'
+    })));
     (0, _defineProperty2["default"])(this, "_dialogProviderObserver", {
       onDialogClosed: function onDialogClosed(dialogId) {
         var _Array$from$find;
@@ -96,6 +100,7 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
         }
       }
     });
+    (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     _classPrivateFieldInitSpec(this, _A, _init_dialogIds(this, new Map()));
     _classPrivateFieldInitSpec(this, _B, _init_registeredWidgetConfigs(this, new Map()));
     _classPrivateFieldInitSpec(this, _C, _init_openedWidgets(this, new Map()));
@@ -132,7 +137,11 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
     key: "openWidget",
     value: function openWidget(widgetId) {
       var widgetConfig = this.registeredWidgetConfigs.get(widgetId);
-      if (widgetConfig && this._roomProvider.currentRoomControl) {
+      if (!widgetConfig) {
+        this.logger.error('widgetConfig not found', widgetId);
+        return;
+      }
+      if (this._roomProvider.currentRoomControl) {
         var isOpened = this.openedWidgets.has(widgetId);
         if (!isOpened) {
           var webWidget = new _webWidget.FcrUIWebWidgetImpl(this._roomProvider.currentRoomControl);
@@ -140,8 +149,15 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
         }
         var dialogId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.WIDGET, widgetId, widgetConfig);
         this.dialogIds.set(widgetId, dialogId);
+      } else {
+        this.logger.error('roomProvider.currentRoomControl not found', widgetId);
       }
     }
+  }, {
+    key: "onWidgetClick",
+    value: function onWidgetClick(widgetId) {
+      this._observable.notifyObservers('onWidgetClicked', widgetId);
+    }
   }, {
     key: "closeWidget",
     value: function closeWidget(widgetId) {
@@ -161,6 +177,16 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
     value: function release() {
       this._dialogProvider.removeObserver(this._dialogProviderObserver);
     }
+  }, {
+    key: "addObserver",
+    value: function addObserver(observer) {
+      this._observable.addObserver(observer);
+    }
+  }, {
+    key: "removeObserver",
+    value: function removeObserver(observer) {
+      this._observable.removeObserver(observer);
+    }
   }]);
 }();
 _FcrUIWidgetProviderImpl = FcrUIWidgetProviderImpl;

package/lib/runtime.d.ts

@@ -90,22 +90,31 @@ declare global {
     onSettingOpen?: () => void;
     onSettingClose?: () => void;
     onLaunchMeeting?: (launchOptions: any) => void;
+    onRenewUserToken?: (token: string) => void;
     initSDK: (options: any) => void;
     openSetting: () => void;
     getIsSDKReady: () => Promise<boolean>;
     onSDKReady?: () => void;
+    onLaunchFailure?: (roomId: string, errorCode: string) => void;
     loadBuiltinResources: () => Promise<{
       virtualBackgroundImages: string[];
       virtualBackgroundVideos: string[];
       soundEffects: string[];
     }>;
     launchSuccess: (roomId: string) => void;
+    onLaunchSuccess?: (roomId: string) => void;
     launchFailure: (roomId: string, errorCode: number) => void;
     onSetParameters?: (parameters: Record<string, unknown>) => void;
     setParameters: (parameters: string) => void;
-    onCloseWindowBeforeLaunchSuccess?: () => void;
+    exitUiScene?: () => void;
+    onExitUiScene?: () => void;
     exitedMeeting?: (roomId: string, reason: FcrUIExitReason) => void;
+    onExitedMeeting?: (roomId: string, reason: number) => void;
     getIsMeetingLaunched: () => Promise<boolean>;
+    onWidgetClicked?: (widgetId: string) => void;
+    onUserTokenWillExpire?: () => void;
+    onRefreshUserToken?: () => void;
+    refreshUserToken?: (token: string) => void;
   }
 
   interface Window {

package/lib/scenes/main-scene.d.ts

@@ -15,7 +15,7 @@ import { FcrUISharedSettingDataSource } from '../shared-data-source/setting';
 import { FcrUISharedLayoutDataSource } from '../shared-data-source/layout-data';
 import { FcrBaseUIScene } from '../base';
 import { FcrUIChatProviderImpl } from '../providers/chat-provider';
-import { FcrUISharedInterpreterDataSourceImpl } from '../shared-data-source/interpreter';
+import { FcrUISharedInterpreterDataSource } from '../shared-data-source/interpreter';
 import { FcrUIMessageProvider } from '../providers/message-provider';
 import { FcrUIDialogProvider } from '../providers/dialog-provider';
 import { FcrUISharedWaitingRoomDataSource } from '../shared-data-source/waiting-room';
@@ -34,6 +34,10 @@ import { FcrUISecuritySharedDataSource } from '../shared-data-source/security-da
 import { FcrUIAnnotationProvider } from '../providers/annotation-provider';
 import { FcrUISharingProvider } from '../providers/sharing-provider';
 import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
+import { FcrUIApplistProvider } from '../providers/app-list-provider';
+import { FcrUISharedApplistSourceImpl } from '../shared-data-source/app-list-data';
+import { FcrUISharedConfirmDataSource } from '../shared-data-source/confirm-data';
+import { FcrUISharedAnnotationSource } from '../shared-data-source/annotation-data';
 export type FcrMainUISceneArgs = {
     engine: FcrCoreEngine;
     eventProvider: FcrUIEventProvider;
@@ -50,6 +54,8 @@ export type FcrMainUISceneArgs = {
     sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
     widgetProvider: FcrUIWidgetProvider;
     sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+    sharedConfirmDataSource: FcrUISharedConfirmDataSource;
+    sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
 };
 export declare class FcrMainUIScene extends FcrBaseUIScene {
     eventProvider: FcrUIEventProvider;
@@ -77,8 +83,9 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     abilityProvider: FcrUIAbilityProviderImpl;
     annotationProvider: FcrUIAnnotationProvider;
     sharingProvider: FcrUISharingProvider;
+    applistProvider: FcrUIApplistProvider;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
-    sharedInterpreterDataSource: FcrUISharedInterpreterDataSourceImpl;
+    sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
     sharedSettingDataSource: FcrUISharedSettingDataSource;
     sharedLayoutDataSource: FcrUISharedLayoutDataSource;
     sharedSpeakerSpotlightDataSource: FcrUISharedSpeakerSpotlightDataSource;
@@ -91,6 +98,9 @@ export declare class FcrMainUIScene extends FcrBaseUIScene {
     sharedMeetingTimeDataSource: FcrUIMeetingTimeSharedDataSource;
     sharedSecuritySharedDataSource: FcrUISecuritySharedDataSource;
     sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+    sharedApplistDataSource: FcrUISharedApplistSourceImpl;
+    sharedConfirmDataSource: FcrUISharedConfirmDataSource;
+    sharedAnnotationDataSource: FcrUISharedAnnotationSource;
     private _isWaitingRoomNotify;
     constructor(args: FcrMainUISceneArgs);
     private _addObservers;

package/lib/scenes/main-scene.js

@@ -68,17 +68,17 @@ var _audioStream = require("../modules/audio-stream");
 var _chat = require("../modules/chat");
 var _controlBar = require("../modules/control-bar");
 var _dialog = require("../modules/dialog");
-var _chat2 = require("../modules/dialog/components/chat");
-var _connectionGateway = require("../modules/dialog/components/connection-gateway");
-var _controlBar2 = require("../modules/dialog/components/control-bar");
-var _interpreter = _interopRequireDefault(require("../modules/dialog/components/interpreter"));
-var _invite = require("../modules/dialog/components/invite");
-var _liveStreaming = require("../modules/dialog/components/live-streaming");
-var _participant = require("../modules/dialog/components/participant");
-var _shareScreenSelection = require("../modules/dialog/components/share-screen-selection");
-var _systemPreference = require("../modules/dialog/components/system-preference");
-var _whiteboard = require("../modules/dialog/components/whiteboard");
-var _videoWindow = require("../modules/dialog/components/video-window");
+var _chat2 = require("../modules/dialog/dialogs/chat");
+var _connectionGateway = require("../modules/dialog/dialogs/connection-gateway");
+var _controlBar2 = require("../modules/dialog/dialogs/control-bar");
+var _interpreter = _interopRequireDefault(require("../modules/dialog/dialogs/interpreter"));
+var _invite = require("../modules/dialog/dialogs/invite");
+var _liveStreaming = require("../modules/dialog/dialogs/live-streaming");
+var _participant = require("../modules/dialog/dialogs/participant");
+var _shareScreenSelection = require("../modules/dialog/dialogs/share-screen-selection");
+var _systemPreference = require("../modules/dialog/dialogs/system-preference");
+var _whiteboard = require("../modules/dialog/dialogs/whiteboard");
+var _videoWindow = require("../modules/dialog/dialogs/video-window");
 var _eventConfirm = require("../modules/event-confirm");
 var _eventToast = require("../modules/event-toast");
 var _interpreter2 = require("../modules/interpreter");
@@ -108,7 +108,6 @@ var _deviceStreamProvider = require("../providers/device-stream-provider");
 var _monitorProvider = require("../providers/monitor-provider");
 var _base = require("../base");
 var _chatProvider = require("../providers/chat-provider");
-var _interpreter3 = require("../shared-data-source/interpreter");
 var _waitingRoom = require("../shared-data-source/waiting-room");
 var _screenShareProvider = require("../providers/screen-share-provider");
 var _pcAudioConnect = require("../modules/pc-audio-connect");
@@ -118,20 +117,25 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _misc = require("agora-foundation/lib/utilities/misc");
 var _chatData = require("../shared-data-source/chat-data");
 var _memberData = require("../shared-data-source/member-data");
-var _widget = _interopRequireDefault(require("../modules/dialog/components/widget"));
+var _widget = _interopRequireDefault(require("../modules/dialog/dialogs/widget"));
 var _widget2 = require("../modules/widget");
 var _abilityProvider = require("../providers/ability-provider");
 var _meetingTime = require("../shared-data-source/meeting-time");
 var _securityData = require("../shared-data-source/security-data");
-var _rename = require("../modules/dialog/components/rename");
+var _rename = require("../modules/dialog/dialogs/rename");
 var _annotation = require("../modules/annotation");
-var _annotationTool = require("../modules/dialog/components/annotation-tool");
+var _annotationTool = require("../modules/dialog/dialogs/annotation-tool");
 var _annotationProvider = require("../providers/annotation-provider");
 var _sharingProvider = require("../providers/sharing-provider");
-var _confirmLeaveMeeting = require("../modules/dialog/components/confirm-leave-meeting");
+var _appListProvider = require("../providers/app-list-provider");
+var _appListData = require("../shared-data-source/app-list-data");
+var _confirmLeaveMeeting = require("../modules/dialog/dialogs/confirm-leave-meeting");
+var _endMeeting = require("../modules/dialog/dialogs/end-meeting");
+var _annotationData = require("../shared-data-source/annotation-data");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrMainUIScene;
-var _initProto; // import { RemoveAdmitWaitingRoomDialog } from '../modules/dialog/components/remove-admit-waiting-room';
+var _initProto; // import DeviceSettingDialog from '../modules/dialog/dialogs/device-setting';
+// import { RemoveAdmitWaitingRoomDialog } from '../modules/dialog/components/remove-admit-waiting-room';
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
@@ -162,7 +166,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       sharedVideoWindowDataSource = args.sharedVideoWindowDataSource,
       sharedDevicePrivilegeDataSource = args.sharedDevicePrivilegeDataSource,
       widgetProvider = args.widgetProvider,
-      sharedScreenShareSharedDataSource = args.sharedScreenShareSharedDataSource;
+      sharedScreenShareSharedDataSource = args.sharedScreenShareSharedDataSource,
+      sharedConfirmDataSource = args.sharedConfirmDataSource,
+      sharedInterpreterDataSource = args.sharedInterpreterDataSource;
     var mainRoomControl = roomProvider.currentRoomControl;
     var sharingControl = mainRoomControl.getSharingControl();
     var streamControl = mainRoomControl.getStreamControl();
@@ -172,7 +178,6 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var abilityControl = mainRoomControl.getAbilityControl();
     var abilityProvider = new _abilityProvider.FcrUIAbilityProviderImpl(abilityControl);
     var devicePrivilegeProvider = new _devicePrivilegeProvider.FcrUIDevicePrivilegeProviderImpl(privilegeControl, streamControl, userControl, deviceProvider, messageProvider);
-    var sharedInterpreterDataSource = new _interpreter3.FcrUISharedInterpreterDataSourceImpl(interpreterControl, userControl);
     var localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
     var remoteVideoRenderProvider = new _rendererProvider.FcrUIRemoteVideoRenderProviderImpl(mainRoomControl.getStreamControl());
     var mainRoomControlProvider = new _roomProvider.FcrUIMainRoomControlProviderImpl(mainRoomControl, eventProvider, messageProvider, dialogProvider, sharedInterpreterDataSource);
@@ -204,10 +209,13 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var sharedMeetingTimeDataSource = new _meetingTime.FcrUIMeetingTimeSharedDataSourceImpl({
       mainRoomControl: mainRoomControl
     });
-    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource, mainRoomControl.getSharingControl().getBoardControl());
+    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource, eventProvider, mainRoomControl.getSharingControl().getBoardControl());
     var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
-    var annotationProvider = new _annotationProvider.FcrUIAnnotationProviderImpl(dialogProvider, sharingProvider, sharedMemberDataSource, sharedVideoWindowDataSource, screenShareProvider, deviceProvider);
+    var annotationProvider = new _annotationProvider.FcrUIAnnotationProviderImpl(dialogProvider, sharedVideoWindowDataSource, privilegeProvider, sharedScreenShareSharedDataSource);
     var sharedSecurityDataSource = new _securityData.FcrUISecuritySharedDataSourceImpl(privilegeProvider, sharedMemberDataSource);
+    var sharedApplistDataSource = new _appListData.FcrUISharedApplistSourceImpl(abilityProvider, privilegeProvider, roomProvider, widgetProvider, sharedMemberDataSource, sharedInterpreterDataSource);
+    var sharedAnnotationDataSource = new _annotationData.FcrUISharedAnnotationSourceImpl();
+    var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource);
     var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider, sharedScreenShareSharedDataSource);
     _this.messageProvider = messageProvider;
     _this.dialogProvider = dialogProvider;
@@ -232,6 +240,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.chatProvider = chatProvider;
     _this.annotationProvider = annotationProvider;
     _this.sharingProvider = sharingProvider;
+    _this.applistProvider = applistProvider;
+    _this.widgetProvider = widgetProvider;
+    _this.abilityProvider = abilityProvider;
     _this.sharedSpeakerSpotlightDataSource = sharedSpeakerSpotlightDataSource;
     _this.sharedPinDataSource = sharedPinDataSource;
     _this.sharedConfigDataSource = sharedConfigDataSource;
@@ -246,8 +257,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     _this.sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
     _this.sharedSecuritySharedDataSource = sharedSecurityDataSource;
     _this.sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
-    _this.widgetProvider = widgetProvider;
-    _this.abilityProvider = abilityProvider;
+    _this.sharedApplistDataSource = sharedApplistDataSource;
+    _this.sharedConfirmDataSource = sharedConfirmDataSource;
+    _this.sharedAnnotationDataSource = sharedAnnotationDataSource;
     _this._addObservers();
     return _this;
   }
@@ -403,7 +415,6 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
           key: _constant.FcrUIDialogKey.LIVE_STREAMING,
           component: function component() {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_liveStreaming.LiveStreamingDialog, {
-              title: (0, _i18n.transI18n)('fmt_live_label_push_platform'),
               children: liveStreamingUIModule === null || liveStreamingUIModule === void 0 ? void 0 : liveStreamingUIModule.getComponent()
             }, "LiveStreamingDialog-".concat(Math.random()));
           }
@@ -507,12 +518,20 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
                 }, _callee);
               })),
               onCancel: function onCancel() {
+                _this3.sharedLayoutDataSource.endMeetingPopoverOpened = true;
                 _this3.eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_DIALOG, {
                   dialogKey: _constant.FcrUIDialogKey.LEAVE_MEETING
                 });
               }
             }, "LeaveMeetingDialog");
           }
+        }, {
+          key: _constant.FcrUIDialogKey.END_MEETING,
+          component: function component(props) {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_endMeeting.EndMeetingDialog, {
+              params: props.params
+            }, "EndMeetingDialog");
+          }
         }]);
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_videoTrackRenderContext.FcrVideoTrackRenderContext.Provider, {
           value: {
@@ -533,7 +552,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
               stateBar: stateBarUIModule.getComponent(),
               layers: _this3.renderLayers([dialogModule.getComponent(), eventToastUIModule.getComponent('local'), eventNotificationUIModule.getComponent()]),
               whiteboard: whiteBoradUIModule.getComponent(),
-              annotationControl: annotationUIModule.getControlComponent(),
+              screenShareControl: shareScreenModule.getControlComponent(),
               annotation: annotationUIModule.getComponent(),
               globalToast: eventToastUIModule.getComponent('global'),
               confirm: eventConfirmUIModule.getComponent('mainroom')
@@ -564,6 +583,10 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       this.deviceStreamProvider.release();
       this.sharedInterpreterDataSource.release();
       this.sharedMemberDataSource.release();
+      this.sharedMeetingTimeDataSource.release(); // 修复：添加对会议时间数据源的释放
+      this.sharedWaitingRoomDataSource.release(); // 修复：添加对等候室数据源的释放
+      this.sharedSecuritySharedDataSource.release(); // 修复：添加对安全数据源的释放
+      this.sharedVideoWindowDataSource.release(); // 修复：添加对视频窗口数据源的释放
     }
   }, {
     key: "_setIsWaitingRoomNotify",
@@ -583,13 +606,16 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     value: function () {
       var _runSettingConfig2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this4 = this;
-        var deviceProvider, settingConfig, showToast, allowJoinWithCloseVideo, hasOpenCameraPrivilege, isJoinWithCloseVideo, allowJoinWithMuteAudio, hasOpenMicrophonePrivilege, isJoinWithMuteAudio;
+        var deviceProvider, _this$sharedSettingDa, media, setting, showToast, allowJoinWithCloseVideo, hasOpenCameraPrivilege, isJoinWithCloseVideo, allowJoinWithMuteAudio, hasOpenMicrophonePrivilege, isJoinWithMuteAudio;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               deviceProvider = this.deviceProvider;
-              settingConfig = this.sharedConfigDataSource.settingConfig;
-              this.logger.info('run setting config in main room:', (0, _misc.jsonstring)(settingConfig));
+              _this$sharedSettingDa = this.sharedSettingDataSource, media = _this$sharedSettingDa.media, setting = _this$sharedSettingDa.setting;
+              this.logger.info('run setting config in main room:', (0, _misc.jsonstring)({
+                media: media,
+                setting: setting
+              }));
               showToast = function showToast(content) {
                 _this4.messageProvider.showToast({
                   type: 'error',

package/lib/scenes/waiting-scene.d.ts

@@ -24,6 +24,11 @@ import { FcrUISharedWaitingRoomDataSource } from '../shared-data-source/waiting-
 import { FcrUIAbilityProviderImpl } from '../providers/ability-provider';
 import { FcrUIScreenShareProviderImpl } from '../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
+import { FcrUISharedConfirmDataSource } from '../shared-data-source/confirm-data';
+import { FcrUIApplistProvider } from '../providers/app-list-provider';
+import { FcrUISharedAnnotationSource } from '../shared-data-source/annotation-data';
+import { FcrUIVideoWindowDataSource } from '../shared-data-source/video-window';
+import { FcrUIAnnotationProviderImpl } from '../providers/annotation-provider';
 export type FcrWaitingUISceneArgs = {
     engine: FcrCoreEngine;
     eventProvider: FcrUIEventProvider;
@@ -37,6 +42,8 @@ export type FcrWaitingUISceneArgs = {
     sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
     widgetProvider: FcrUIWidgetProvider;
     sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+    sharedConfirmDataSource: FcrUISharedConfirmDataSource;
+    sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
 };
 export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     private _dom;
@@ -56,6 +63,7 @@ export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     deviceStreamProvider: FcrUIDeviceStreamProviderImpl;
     widgetProvider: FcrUIWidgetProvider;
     screenShareProvider: FcrUIScreenShareProviderImpl;
+    applistProvider: FcrUIApplistProvider;
     sharedConfigDataSource: FcrUISharedConfigDataSource;
     messageProvider: FcrUIMessageProvider;
     sharedInterpreterDataSource: FcrUISharedInterpreterDataSourceImpl;
@@ -66,7 +74,10 @@ export declare class FcrWaitingUIScene extends FcrBaseUIScene {
     sharedMemberDataSource: FcrUIMemberSharedDataSource;
     sharedWaitingRoomDataSource: FcrUISharedWaitingRoomDataSource;
     sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
+    sharedConfirmDataSource: FcrUISharedConfirmDataSource;
     abilityProvider: FcrUIAbilityProviderImpl;
+    annotationProvider: FcrUIAnnotationProviderImpl;
+    sharedAnnotationDataSource: FcrUISharedAnnotationSource;
     constructor(args: FcrWaitingUISceneArgs);
     mount(dom: HTMLElement): void;
     onNodeWillActive(): void;

package/lib/scenes/waiting-scene.js

@@ -21,7 +21,7 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _actionBar = require("../modules/action-bar");
 var _chat = require("../modules/chat");
 var _dialog = require("../modules/dialog");
-var _connectionGateway = require("../modules/dialog/components/connection-gateway");
+var _connectionGateway = require("../modules/dialog/dialogs/connection-gateway");
 var _eventToast = require("../modules/event-toast");
 var _stateBar = require("../modules/state-bar");
 var _constant = require("../utilities/constant");
@@ -44,9 +44,14 @@ var _waitingRoom = require("../shared-data-source/waiting-room");
 var _abilityProvider = require("../providers/ability-provider");
 var _screenShareProvider = require("../providers/screen-share-provider");
 var _sharingProvider = require("../providers/sharing-provider");
+var _appListProvider = require("../providers/app-list-provider");
+var _appListData = require("../shared-data-source/app-list-data");
+var _endMeeting = require("../modules/dialog/dialogs/end-meeting");
+var _annotationData = require("../shared-data-source/annotation-data");
+var _annotationProvider = require("../providers/annotation-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } // import DeviceSettingDialog from '../modules/dialog/dialogs/device-setting';
 var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
   // providers
 
@@ -68,7 +73,9 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
       sharedDevicePrivilegeDataSource = args.sharedDevicePrivilegeDataSource,
       engine = args.engine,
       widgetProvider = args.widgetProvider,
-      sharedScreenShareSharedDataSource = args.sharedScreenShareSharedDataSource;
+      sharedScreenShareSharedDataSource = args.sharedScreenShareSharedDataSource,
+      sharedConfirmDataSource = args.sharedConfirmDataSource,
+      sharedVideoWindowDataSource = args.sharedVideoWindowDataSource;
     var waitingRoomControl = roomProvider.currentRoomControl;
     var privilegeControl = waitingRoomControl.getPrivilegeControl();
     var streamControl = waitingRoomControl.getStreamControl();
@@ -93,9 +100,16 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     var sharingControl = waitingRoomControl.getSharingControl();
     var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
     var sharedInterpreterDataSource = new _interpreter.FcrUISharedInterpreterDataSourceImpl();
-    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource);
+    var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource, eventProvider);
     var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
+    var privilegeProvider = waitingRoomControlProvider.privilegeProvider;
+    var sharedApplistDataSource = new _appListData.FcrUISharedApplistSourceImpl(abilityProvider, privilegeProvider, roomProvider, widgetProvider, sharedMemberDataSource);
+    var applistProvider = new _appListProvider.FcrUIApplistProviderImpl(dialogProvider, eventProvider, widgetProvider, sharedApplistDataSource);
+    _this.applistProvider = applistProvider;
     var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider, sharedScreenShareSharedDataSource);
+    var sharedAnnotationDataSource = new _annotationData.FcrUISharedAnnotationSourceImpl();
+    var annotationProvider = new _annotationProvider.FcrUIAnnotationProviderImpl(dialogProvider, sharedVideoWindowDataSource, privilegeProvider, sharedScreenShareSharedDataSource);
+    _this.annotationProvider = annotationProvider;
     _this.eventProvider = eventProvider;
     _this.devicePrivilegeProvider = devicePrivilegeProvider;
     _this.sharedSettingDataSource = sharedSettingDataSource;
@@ -123,6 +137,8 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     _this.widgetProvider = widgetProvider;
     _this.sharedWaitingRoomDataSource = sharedWaitingRoomDataSource;
     _this.abilityProvider = abilityProvider;
+    _this.sharedConfirmDataSource = sharedConfirmDataSource;
+    _this.sharedAnnotationDataSource = sharedAnnotationDataSource;
     return _this;
   }
   (0, _inherits2["default"])(FcrWaitingUIScene, _FcrBaseUIScene);
@@ -166,6 +182,13 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
               children: pcAudioConnectionModule.getComponent()
             }, "ConnectionGatewayDialog");
           }
+        }, {
+          key: _constant.FcrUIDialogKey.END_MEETING,
+          component: function component(props) {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_endMeeting.EndMeetingDialog, {
+              params: props.params
+            }, "EndMeetingDialog");
+          }
         }]);
         var layoutComponent = waitingRoomLayoutModule.getComponent({
           chat: chatModule.getComponent(),
@@ -204,20 +227,23 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
       this.remoteVideoRenderProvider.release();
       this.devicePrivilegeProvider.release();
       this.sharedInterpreterDataSource.release();
-      this._dom && this.unmount(this._dom);
+      // this._dom && this.unmount(this._dom);
     }
   }, {
     key: "_runSettingConfig",
     value: function () {
       var _runSettingConfig2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var _this3 = this;
-        var deviceProvider, settingConfig;
+        var deviceProvider, _this$sharedSettingDa, media, setting;
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               deviceProvider = this.deviceProvider;
-              settingConfig = this.sharedConfigDataSource.settingConfig;
-              this.logger.info('run setting config in waiting room:', (0, _misc.jsonstring)(settingConfig));
+              _this$sharedSettingDa = this.sharedSettingDataSource, media = _this$sharedSettingDa.media, setting = _this$sharedSettingDa.setting;
+              this.logger.info('run setting config in waiting room:', (0, _misc.jsonstring)({
+                media: media,
+                setting: setting
+              }));
               if (this.deviceProvider.ifNeedExecuteOpenCamera()) {
                 // const hasOpenCameraPrivilege = await this.devicePrivilegeProvider.hasOpenCameraPrivilege();
                 this.deviceProvider.setCameraEnabled(true);