fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/providers/board-share/provider.base.d.ts

@@ -10,15 +10,18 @@ export declare abstract class FcrUIBoardShareProviderBase implements FcrUIBoardS
     private readonly objectManager;
     protected logger: import("fcr-core/lib/imports").Logger;
     private _disposers;
+    protected _observable: AgoraObservable<FcrUIBoardShareObserver>;
     protected _roomProvider: FcrUIRoomProvider;
     protected _boardControl: FcrWhiteboardControl;
-    protected _observable: AgoraObservable<FcrUIBoardShareObserver>;
+    protected _boardMainWindow: FcrBoardMainWindow | undefined;
     private _sharingControl;
     private _privilegeProvider;
-    protected _boardMainWindow: FcrBoardMainWindow | undefined;
     private _userControl;
     private _dialogProvider;
+    private _messageProvider;
     private _userId;
+    private _ownerId;
+    private _startShareLock;
     private _observer;
     private _boardObserver;
     protected get boardMainWindow(): FcrBoardMainWindow;
@@ -44,12 +47,12 @@ export declare abstract class FcrUIBoardShareProviderBase implements FcrUIBoardS
     abstract setIsDualDisplayMode(isDualDisplayMode: boolean): void;
     startShare(): Promise<void>;
     stopShare(): Promise<void>;
-    setStrokeWidth(width: number): Promise<void>;
-    setStrokeColor(color: FcrColor): Promise<void>;
-    selectTool(tool: FcrBoardToolType): Promise<void>;
-    clear(): Promise<void>;
-    undo(): Promise<void>;
-    redo(): Promise<void>;
+    setStrokeWidth(width: number): Promise<number>;
+    setStrokeColor(color: FcrColor): Promise<number>;
+    selectTool(tool: FcrBoardToolType): Promise<number>;
+    clear(): Promise<number>;
+    undo(): Promise<number>;
+    redo(): Promise<number>;
     abstract captureScreen(hideWindow: boolean): void;
     getBoardDom(): HTMLElement | null;
     release(): void;

package/lib/providers/board-share/provider.base.js

@@ -69,6 +69,7 @@ var _imports = require("fcr-core/lib/imports");
 var _constant = require("../../utilities/constant");
 var _theme = _interopRequireDefault(require("../../modules/whiteboard/libs/theme"));
 var _enum = require("fcr-core/lib/room-control/whiteboard-control/enum");
+var _type2 = require("../../modules/toast-manager/type");
 var _FcrUIBoardShareProviderBase;
 var _initProto, _init_loading, _init_boardState, _init_connectionState, _init_joined, _handleStartedDecs, _handleEndedDecs, _handleConnectionStateUpdatedDecs, _handleConnectedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -95,6 +96,8 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
     })));
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
+    (0, _defineProperty2["default"])(this, "_ownerId", null);
+    (0, _defineProperty2["default"])(this, "_startShareLock", false);
     (0, _defineProperty2["default"])(this, "_observer", {
       // onWhiteboardStarted is active event callback
       onWhiteboardStarted: this._handleStarted,
@@ -112,6 +115,7 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
     this.objectManager = objectManager;
     this._roomProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
     this._dialogProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
+    this._messageProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
     this._privilegeProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
     var roomControl = this._roomProvider.currentRoomControl;
     this._sharingControl = roomControl.getSharingControl();
@@ -123,6 +127,7 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
     this.boardState = this._sharingControl.getWhiteboardState();
     this._userId = this._userControl.getLocalUser().userId;
     if (this.isActive) {
+      this._ownerId = this._boardControl.getOwnerId();
       this._boardControl.open();
     }
     this._disposers.push((0, _mobx.reaction)(function () {
@@ -179,7 +184,7 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
   }, {
     key: "ownerUser",
     get: function get() {
-      var ownerId = this._boardControl.getOwnerId();
+      var ownerId = this._ownerId;
       if (!ownerId) {
         throw new Error('get ownerId failed, no user is sharing board currently');
       }
@@ -229,13 +234,62 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
     }
   }, {
     key: "startShare",
-    value:
-    // this._sharingControl.startWhiteboard is trigger active event
-    function startShare() {
-      return this._sharingControl.startWhiteboard();
-    }
+    value: // this._sharingControl.startWhiteboard is trigger active event
+    function () {
+      var _startShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var _t;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!this._startShareLock) {
+                _context.next = 1;
+                break;
+              }
+              this.logger.warn('startShare is already in progress, please wait for it to complete');
+              return _context.abrupt("return");
+            case 1:
+              this._startShareLock = true;
+              this._ownerId = this._userId;
+              _context.prev = 2;
+              _context.next = 3;
+              return this._boardControl.open();
+            case 3:
+              _context.next = 4;
+              return this._sharingControl.startWhiteboard();
+            case 4:
+              this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
+              _context.next = 6;
+              break;
+            case 5:
+              _context.prev = 5;
+              _t = _context["catch"](2);
+              this._ownerId = this._boardControl.getOwnerId();
 
-    // this._sharingControl.stop is trigger inactive event
+              // 30409104: 白板预加载冲突, 说明已经有其他人正在开启白板中
+              if (_t instanceof _imports.FcrError && _t.code === 730409104) {
+                this._messageProvider.showToastByKey({
+                  key: _type2.FcrUIToastKey.FMT_SCREENSHARE_TIPS_ALREADYOPENED
+                });
+              } else {
+                this._messageProvider.showToastByKey({
+                  key: _type2.FcrUIToastKey.FMT_WHITEBOARD_TIPS_SHARE_FAILED
+                });
+              }
+            case 6:
+              _context.prev = 6;
+              this._startShareLock = false;
+              return _context.finish(6);
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[2, 5, 6, 7]]);
+      }));
+      function startShare() {
+        return _startShare.apply(this, arguments);
+      }
+      return startShare;
+    }() // this._sharingControl.stop is trigger inactive event
   }, {
     key: "stopShare",
     value: function stopShare() {
@@ -301,13 +355,18 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
   }, {
     key: "_handleStarted",
     value: function () {
-      var _handleStarted2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(ownerId, operatorUser) {
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _handleStarted2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(ownerId, operatorUser) {
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.logger.info("Board share started with ownerId: ".concat(ownerId, ", operatorUser: ").concat((0, _imports.jsonstring)(operatorUser)));
+              this._ownerId = ownerId;
               this.boardState = _type.FcrWhiteboardState.START;
-              this._boardControl.open();
+
+              // 如果是自己触发的白板开启事件, 则不需要重复 open 一次, 因为在 startShare 已经 open 过了
+              if (this._userId !== ownerId) {
+                this._boardControl.open();
+              }
               this._observable.notifyObservers('onBoardShareStarted', {
                 ownerId: ownerId,
                 operatorUser: operatorUser
@@ -315,9 +374,9 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
               this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
             case 1:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function _handleStarted(_x, _x2) {
         return _handleStarted2.apply(this, arguments);

package/lib/providers/board-share/type.d.ts

@@ -2,8 +2,8 @@ import { FcrUIBoardShareStopReason } from './struct';
 import { FcrConnectionState, FcrUserInfo, FcrWhiteboardState } from 'fcr-core/lib/type';
 import { WhiteboardThemeType } from '../../modules/whiteboard/type';
 import { FcrToolbarState } from '../../modules/components/toolbar/types';
-import { FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../../modules/secondary-window/type';
-import { FcrBoardShape, FcrBoardToolType, FcrColor } from 'fcr-core';
+import { FcrUIBoardToolSelectedPayload, FcrUIMainWindowRendererObserver } from '../../modules/secondary-window/type';
+import { FcrBoardToolType, FcrColor } from 'fcr-core';
 export interface FcrUIBoardShareObserver {
     /**
      * 白板共享开启
@@ -84,28 +84,28 @@ export interface FcrUIBoardShareProvider {
      * 设置画笔宽度
      * @param width
      */
-    setStrokeWidth(width: number): Promise<void>;
+    setStrokeWidth(width: number): Promise<number>;
     /**
      * 设置画笔颜色
      * @param color
      */
-    setStrokeColor(color: FcrColor): Promise<void>;
+    setStrokeColor(color: FcrColor): Promise<number>;
     /**
      * 选择工具
      */
-    selectTool(tool: FcrBoardToolType): Promise<void>;
+    selectTool(tool: FcrBoardToolType): Promise<number>;
     /**
      * 清除画布
      */
-    clear(): Promise<void>;
+    clear(): Promise<number>;
     /**
      * 撤销
      */
-    undo(): Promise<void>;
+    undo(): Promise<number>;
     /**
      * 重做
      */
-    redo(): Promise<void>;
+    redo(): Promise<number>;
     /**
      * 截屏
      * @param hideWindow
@@ -143,10 +143,9 @@ export interface FcrUIBoardBarControl {
     setSharingUser: (userInfo: FcrUserInfo) => void;
     updateSubProcessBackgroundColor: (color: string) => void;
     setBackgroundColor: (color: string) => void;
-    setWhiteboardTool: (tool: {
-        action: WhiteboardToolAction;
-        tool: FcrBoardToolType | FcrBoardShape | string | number;
-    }) => void;
+    setWhiteboardTool: (payload: FcrUIBoardToolSelectedPayload) => void;
+    setWhiteboardStrokeWidth: (width: number) => void;
+    setWhiteboardStrokeColor: (color: string) => void;
     setTheme: (theme: WhiteboardThemeType) => void;
     setCurrentTheme: (theme: Required<WhiteboardThemeType>) => void;
     setControlEnable: (enable: boolean) => void;

package/lib/providers/device-privilege-provider.d.ts

@@ -1,4 +1,4 @@
-import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from 'fcr-core';
+import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl, FcrUserRole } from 'fcr-core';
 import { FcrUIMessageProvider } from './message/type';
 import { FcrUIDeviceProvider } from './device-provider';
 import { FcrUIManagedObject } from '../object-manager';
@@ -7,16 +7,16 @@ export interface FcrUIDevicePrivilegeObserver {
      * 可开启摄像头权限变更
      * @param result
      */
-    onOpenCameraPrivilegeUpdated?(result: boolean): void;
+    onOpenCameraPrivilegeUpdated?(result: boolean, operatorUserRole: FcrUserRole, cameraEnabled: boolean): void;
     /**
      * 可开启麦克风权限变更
      * @param result
      */
-    onOpenMicrophonePrivilegeUpdated?(result: boolean): void;
+    onOpenMicrophonePrivilegeUpdated?(result: boolean, operatorUserRole: FcrUserRole, microphoneEnabled: boolean): void;
     /**
      * 需要关闭摄像头
      */
-    onCameraNeedClosed?(): void;
+    onCameraNeedClosed?(operatorUserRole: FcrUserRole): void;
     /**
      * 需要关闭麦克风
      */
@@ -77,6 +77,7 @@ export declare class FcrUIDevicePrivilegeProviderImpl implements FcrUIDevicePriv
     setAutoUpdateAudioStreamPrivilege(enable: boolean): void;
     hasOpenCameraPrivilege(): Promise<boolean>;
     hasOpenMicrophonePrivilege(): Promise<boolean>;
+    private _updatePublishPrivilegeOfStreams;
     addObserver(observer: FcrUIDevicePrivilegeObserver): void;
     removeObserver(observer: FcrUIDevicePrivilegeObserver): void;
 }

package/lib/providers/device-privilege-provider.js

@@ -24,7 +24,6 @@ var _fcrCore = require("fcr-core");
 var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
 var _privilege = require("../utilities/privilege");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _i18nCommonData = require("../utilities/i18n-common-data");
 var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
   function FcrUIDevicePrivilegeProviderImpl(_privilegeControl, _streamControl, _userControl, _deviceProvider, _messageProvider) {
     var _this = this;
@@ -45,12 +44,12 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
     this._privilegeObserver = {
       onLocalUserPermissionInfoAdded: function () {
         var _onLocalUserPermissionInfoAdded = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(roomId, event) {
-          var hasVideoPermission, localStream, hasVideo, hasAudioPermission, _localStream, hasAudio, _t, _t2;
+          var hasVideoPermission, localStream, hasVideo, hasAudioPermission, _localStream, hasAudio;
           return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (!_this._autoUpdateVideoStreamPrivilege) {
-                  _context.next = 4;
+                  _context.next = 1;
                   break;
                 }
                 hasVideoPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(event.permissionInfo, _fcrCore.FcrPermissionAction.StreamStartVideo, _type2.FcrPrivilegeUserRole.SELF);
@@ -59,28 +58,22 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                 });
                 hasVideo = (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.VIDEO || (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
                 if (!hasVideoPermission) {
-                  _context.next = 4;
+                  _context.next = 1;
                   break;
                 }
                 if (!(!hasVideo && localStream)) {
-                  _context.next = 4;
+                  _context.next = 1;
                   break;
                 }
-                _context.prev = 1;
-                _context.next = 2;
-                return _this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, localStream.streamId, {
+                _context.next = 1;
+                return _this._updatePublishPrivilegeOfStreams({
+                  streamId: localStream.streamId,
                   videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
                   audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
-                }));
-              case 2:
-                _context.next = 4;
-                break;
-              case 3:
-                _context.prev = 3;
-                _t = _context["catch"](1);
-              case 4:
+                });
+              case 1:
                 if (!_this._autoUpdateAudioStreamPrivilege) {
-                  _context.next = 8;
+                  _context.next = 2;
                   break;
                 }
                 hasAudioPermission = (0, _privilege.hasPermissionWithTargetRoleEnabled)(event.permissionInfo, _fcrCore.FcrPermissionAction.StreamStartAudio, _type2.FcrPrivilegeUserRole.SELF);
@@ -89,30 +82,24 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                 });
                 hasAudio = (_localStream === null || _localStream === void 0 ? void 0 : _localStream.streamType) === _fcrCore.FcrStreamType.AUDIO || (_localStream === null || _localStream === void 0 ? void 0 : _localStream.streamType) === _fcrCore.FcrStreamType.BOTH;
                 if (!hasAudioPermission) {
-                  _context.next = 8;
+                  _context.next = 2;
                   break;
                 }
                 if (!(!hasAudio && _localStream)) {
-                  _context.next = 8;
+                  _context.next = 2;
                   break;
                 }
-                _context.prev = 5;
-                _context.next = 6;
-                return _this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, _localStream.streamId, {
+                _context.next = 2;
+                return _this._updatePublishPrivilegeOfStreams({
+                  streamId: _localStream.streamId,
                   videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION,
                   audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
-                }));
-              case 6:
-                _context.next = 8;
-                break;
-              case 7:
-                _context.prev = 7;
-                _t2 = _context["catch"](5);
-              case 8:
+                });
+              case 2:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[1, 3], [5, 7]]);
+          }, _callee);
         }));
         function onLocalUserPermissionInfoAdded(_x, _x2) {
           return _onLocalUserPermissionInfoAdded.apply(this, arguments);
@@ -139,32 +126,14 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                     var hasVideo = stream.streamType === _fcrCore.FcrStreamType.VIDEO || stream.streamType === _fcrCore.FcrStreamType.BOTH;
                     var hasAudio = stream.streamType === _fcrCore.FcrStreamType.AUDIO || stream.streamType === _fcrCore.FcrStreamType.BOTH;
                     if (!_this._alwaysHasCameraPrivilege) {
-                      _this._observable.notifyObservers('onOpenCameraPrivilegeUpdated', hasVideo);
+                      _this._observable.notifyObservers('onOpenCameraPrivilegeUpdated', hasVideo, operatorUserRole, _this._deviceProvider.cameraEnabled);
                       if (hasNoVideo) {
-                        if (_this._deviceProvider.cameraEnabled) {
-                          _this._messageProvider.showToast({
-                            type: 'error',
-                            message: (0, _i18n.transI18n)('fmt_attendies_tips_receive_video_off_you', {
-                              reason1: (0, _i18nCommonData.getUserRoleI18nLabel)(operatorUserRole)
-                            })
-                          });
-                        }
-                        _this._observable.notifyObservers('onCameraNeedClosed');
+                        _this._observable.notifyObservers('onCameraNeedClosed', operatorUserRole);
                       }
                     }
                     if (!_this._alwaysHasMicrophonePrivilege) {
-                      _this._observable.notifyObservers('onOpenMicrophonePrivilegeUpdated', hasAudio);
+                      _this._observable.notifyObservers('onOpenMicrophonePrivilegeUpdated', hasAudio, operatorUserRole, _this._deviceProvider.microphoneEnabled);
                       if (hasNoAudio) {
-                        var _event$operatorUser;
-                        var _operatorUserRole = ((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userRole) || _fcrCore.FcrUserRole.HOST;
-                        if (_this._deviceProvider.microphoneEnabled) {
-                          _this._messageProvider.showToast({
-                            type: 'error',
-                            message: (0, _i18n.transI18n)('fmt_attendies_tips_receive_mute_you', {
-                              reason1: (0, _i18nCommonData.getUserRoleI18nLabel)(_operatorUserRole)
-                            })
-                          });
-                        }
                         _this._observable.notifyObservers('onMicrophoneNeedClosed');
                       }
                     }
@@ -185,10 +154,11 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
                     }
                     // 更新流权限
                     if (videoPrivilege !== _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION || audioPrivilege !== _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION) {
-                      _this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, stream.streamId, {
+                      _this._updatePublishPrivilegeOfStreams({
+                        streamId: stream.streamId,
                         videoPrivilege: videoPrivilege,
                         audioPrivilege: audioPrivilege
-                      }));
+                      });
                     }
                   }
                 });
@@ -236,7 +206,7 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
     key: "hasOpenCameraPrivilege",
     value: function () {
       var _hasOpenCameraPrivilege = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        var permissionInfo, hasVideoPermission, localUserId, localStream, hasVideo, _t3;
+        var permissionInfo, hasVideoPermission, localUserId, localStream, hasVideo, _t;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -285,16 +255,17 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
               }
               _context3.prev = 6;
               _context3.next = 7;
-              return this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, localStream.streamId, {
+              return this._updatePublishPrivilegeOfStreams({
+                streamId: localStream.streamId,
                 videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
                 audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION
-              }));
+              });
             case 7:
               _context3.next = 9;
               break;
             case 8:
               _context3.prev = 8;
-              _t3 = _context3["catch"](6);
+              _t = _context3["catch"](6);
               return _context3.abrupt("return", false);
             case 9:
               return _context3.abrupt("return", true);
@@ -318,7 +289,7 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
     key: "hasOpenMicrophonePrivilege",
     value: function () {
       var _hasOpenMicrophonePrivilege = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var permissionInfo, hasAudioPermission, localUserId, localStream, hasAudio, _t4;
+        var permissionInfo, hasAudioPermission, localUserId, localStream, hasAudio, _t2;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -367,16 +338,17 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
               }
               _context4.prev = 6;
               _context4.next = 7;
-              return this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, localStream.streamId, {
+              return this._updatePublishPrivilegeOfStreams({
+                streamId: localStream.streamId,
                 videoPrivilege: _fcrCore.FcrStreamPrivilegeOperation.NOOPERATION,
                 audioPrivilege: _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE
-              }));
+              });
             case 7:
               _context4.next = 9;
               break;
             case 8:
               _context4.prev = 8;
-              _t4 = _context4["catch"](6);
+              _t2 = _context4["catch"](6);
               return _context4.abrupt("return", false);
             case 9:
               return _context4.abrupt("return", true);
@@ -396,6 +368,57 @@ var FcrUIDevicePrivilegeProviderImpl = exports.FcrUIDevicePrivilegeProviderImpl
       }
       return hasOpenMicrophonePrivilege;
     }()
+  }, {
+    key: "_updatePublishPrivilegeOfStreams",
+    value: function () {
+      var _updatePublishPrivilegeOfStreams2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(_ref) {
+        var audioPrivilege, videoPrivilege, streamId, err, _t3;
+        return _regenerator["default"].wrap(function (_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              audioPrivilege = _ref.audioPrivilege, videoPrivilege = _ref.videoPrivilege, streamId = _ref.streamId;
+              _context5.prev = 1;
+              _context5.next = 2;
+              return this._streamControl.updatePublishPrivilegeOfStreams((0, _defineProperty2["default"])({}, streamId, {
+                audioPrivilege: audioPrivilege,
+                videoPrivilege: videoPrivilege
+              }));
+            case 2:
+              return _context5.abrupt("return", _context5.sent);
+            case 3:
+              _context5.prev = 3;
+              _t3 = _context5["catch"](1);
+              err = _t3;
+              if (!(err.code === 720419004)) {
+                _context5.next = 4;
+                break;
+              }
+              if (audioPrivilege === _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE) {
+                this._messageProvider.showToast({
+                  type: 'error',
+                  message: (0, _i18n.transI18n)('fmt_device_toast_enable_microphone_maximum')
+                });
+              }
+              if (videoPrivilege === _fcrCore.FcrStreamPrivilegeOperation.HAS_PRIVILEGE) {
+                this._messageProvider.showToast({
+                  type: 'error',
+                  message: (0, _i18n.transI18n)('fmt_device_toast_enable_video_maximum')
+                });
+              }
+              return _context5.abrupt("return", _t3);
+            case 4:
+              throw _t3;
+            case 5:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this, [[1, 3]]);
+      }));
+      function _updatePublishPrivilegeOfStreams(_x5) {
+        return _updatePublishPrivilegeOfStreams2.apply(this, arguments);
+      }
+      return _updatePublishPrivilegeOfStreams;
+    }()
   }, {
     key: "addObserver",
     value: function addObserver(observer) {

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

@@ -11,6 +11,7 @@ import { BeautyKey } from '../modules/setting/type';
 import { FcrUIFacilityProvider } from './facility/type';
 import { FcrUIRendererWrapper } from '../utilities/renderer';
 import { FcrUISoundEffectAudiosSchema } from '../schema';
+import { FcrUIDialogProvider } from './dialog/type';
 export declare const DEFAULT_DEVICE_ID = "default";
 export interface FcrUIDeviceProvider {
     /**
@@ -135,6 +136,18 @@ export interface FcrUIDeviceProvider {
      * @param value
      */
     setSpeakerVolume(value: number): void;
+    /** 设置麦克风的音量 */
+    setMicrophoneVolumeLevel(level: number): void;
+    /**
+     * 设置更新麦克风音量的托管方法, 由外部设置.
+     * 因为在主房间时, 需要将远端音量和本地音量在一个 action 中更新, 以减少渲染次数, 所以需要一个托管方法
+     */
+    setMicrophoneVolumeLevelDelegate(delegate: (level: number) => void): void;
+    /**
+     * 清除更新麦克风音量的托管方法
+     * 比如从主房间进入等候室后, 就不需要再托管给 user-audio-volume-provider 了
+     */
+    clearMicrophoneVolumeLevelDelegate(): void;
     enableAudioHiFiMode(enable: boolean): void;
     enableAudioEchoCancellation(enable: boolean): void;
     enableAudioStereo(enable: boolean): void;
@@ -292,6 +305,10 @@ export interface FcrUIDeviceProvider {
      * 获取声卡采集设备ID
      */
     getLoopbackDeviceId(): string | null;
+    /**
+     * 开始摄像头检测
+     */
+    startCameraTest(): void;
     resetDevice(): void;
     addObserver(observer: FcrUIDeviceObserver): void;
     removeObserver(observer: FcrUIDeviceObserver): void;
@@ -302,6 +319,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     private _messageProvider;
     private _mediaControl;
     private _sharedSettingDataSource;
+    private _dialogProvider;
     protected logger: import("fcr-core/lib/imports").Logger;
     private _observable;
     private _disposer;
@@ -317,10 +335,15 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     private _isForceEnableBeauty;
     private _isForceEnableVirtualBackground;
     private _lastEnableVideoEffectType;
+    private _pendingPermissionDeviceMap;
+    private _dialogObserver;
     private _microphoneObserver;
+    private _cameraObserver;
     private _mediaControlObserver;
     private _defaultMirror;
     private _volumeIndicationInterval;
+    /** 更新麦克风音量的托管方法, 由外部设置   */
+    private _microphoneVolumeLevelDelegate?;
     private _soundEffectPlayUrlMap;
     private _soundEffectFilePathMap;
     private accessor _microphoneEnabled;
@@ -380,7 +403,7 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     get shouldEnableMicBeforeSession(): boolean;
     get microphoneEnabled(): boolean;
     get microphoneState(): FcrUIMicrophoneState;
-    constructor(_renderer: FcrUIRendererWrapper, _facilityProvider: FcrUIFacilityProvider, _messageProvider: FcrUIMessageProvider, _mediaControl: FcrDesktopMediaControl, _sharedSettingDataSource: FcrUISharedSettingDataSource);
+    constructor(_renderer: FcrUIRendererWrapper, _facilityProvider: FcrUIFacilityProvider, _messageProvider: FcrUIMessageProvider, _mediaControl: FcrDesktopMediaControl, _sharedSettingDataSource: FcrUISharedSettingDataSource, _dialogProvider: FcrUIDialogProvider);
     get soundEffectPlayUrlMap(): Map<keyof FcrUISoundEffectAudiosSchema, string>;
     get soundEffectFilePathMap(): Map<keyof FcrUISoundEffectAudiosSchema, string>;
     resetDevice(): void;
@@ -424,6 +447,9 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     setMicrophoneId(microphoneId: string): void;
     setSpeakerVolume(value: number): void;
     setMicrophoneVolume(value: number): void;
+    setMicrophoneVolumeLevel(level: number): void;
+    setMicrophoneVolumeLevelDelegate(delegate: (level: number) => void): void;
+    clearMicrophoneVolumeLevelDelegate(): void;
     startOrStopCamera(enable: boolean): void;
     setShowCameraPreview(enable: boolean): void;
     loadUiResources(uiResource: FcrUIResource): Promise<void>;
@@ -433,13 +459,17 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     setConnectType(connectType: FcrUIConnectType): void;
     toggleLocalCameraPreview(enabled: boolean): void;
     getLoopbackDeviceId(): string | null;
+    startCameraTest(): void;
+    private _startOrTestCameraTrack;
     private _initDeviceList;
     private _handleMicrophoneAudioTrack;
     private _handleMicrophoneStateUpdated;
+    private _handleCameraStateUpdated;
     private _handleMicrophoneEnabledChanged;
     private _handleCameraVideoTrack;
     private _handleCameraDeviceIdChanged;
     private _handleSpeakerDetectingChanged;
+    private _startOrTestMicrophoneAudioTrack;
     private _stopSelectedSpeakerTest;
     private _handleMicrophoneDetectingChanged;
     private _stopMicrophoneTest;
@@ -469,4 +499,5 @@ export declare class FcrUIDeviceProviderImpl implements FcrUIDeviceProvider, Fcr
     private _getSpeakerList;
     private _formatDeviceList;
     private _loadBuiltinResources;
+    private _checkDevicePermission;
 }