fcr-ui-scene 3.8.2 → 3.9.0-alpha

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

@@ -70,10 +70,11 @@ import { FcrWhiteboardState } from 'fcr-core/lib/type';
 import { FcrUIBoardShareStopReason } from './struct';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 import { bound } from 'agora-foundation/lib/decorator';
-import { jsonstring } from 'fcr-core/lib/imports';
+import { FcrError, jsonstring } from 'fcr-core/lib/imports';
 import { FcrUIDialogKey } from '../../utilities/constant';
 import whiteboardTheme from '../../modules/whiteboard/libs/theme';
 import { FcrBoardInactiveReason } from 'fcr-core/lib/room-control/whiteboard-control/enum';
+import { FcrUIToastKey } from '../../modules/toast-manager/type';
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -88,6 +89,8 @@ export var FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
     })));
     _defineProperty(this, "_disposers", []);
     _defineProperty(this, "_observable", new AgoraObservable());
+    _defineProperty(this, "_ownerId", null);
+    _defineProperty(this, "_startShareLock", false);
     _defineProperty(this, "_observer", {
       // onWhiteboardStarted is active event callback
       onWhiteboardStarted: this._handleStarted,
@@ -105,6 +108,7 @@ export var FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
     this.objectManager = objectManager;
     this._roomProvider = this.objectManager.getObject(FcrUIObjectKeys.P_ROOM_PROVIDER);
     this._dialogProvider = this.objectManager.getObject(FcrUIObjectKeys.P_DIALOG_PROVIDER);
+    this._messageProvider = this.objectManager.getObject(FcrUIObjectKeys.P_MESSAGE_PROVIDER);
     this._privilegeProvider = this.objectManager.getObject(FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
     var roomControl = this._roomProvider.currentRoomControl;
     this._sharingControl = roomControl.getSharingControl();
@@ -116,6 +120,7 @@ export var FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
     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(reaction(function () {
@@ -172,7 +177,7 @@ export var FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
   }, {
     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');
       }
@@ -222,13 +227,62 @@ export var FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
     }
   }, {
     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 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _t;
+        return _regeneratorRuntime.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(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 FcrError && _t.code === 730409104) {
+                this._messageProvider.showToastByKey({
+                  key: FcrUIToastKey.FMT_SCREENSHARE_TIPS_ALREADYOPENED
+                });
+              } else {
+                this._messageProvider.showToastByKey({
+                  key: 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() {
@@ -294,13 +348,18 @@ export var FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
   }, {
     key: "_handleStarted",
     value: function () {
-      var _handleStarted2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(ownerId, operatorUser) {
-        return _regeneratorRuntime.wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _handleStarted2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ownerId, operatorUser) {
+        return _regeneratorRuntime.wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.logger.info("Board share started with ownerId: ".concat(ownerId, ", operatorUser: ").concat(jsonstring(operatorUser)));
+              this._ownerId = ownerId;
               this.boardState = FcrWhiteboardState.START;
-              this._boardControl.open();
+
+              // 如果是自己触发的白板开启事件, 则不需要重复 open 一次, 因为在 startShare 已经 open 过了
+              if (this._userId !== ownerId) {
+                this._boardControl.open();
+              }
               this._observable.notifyObservers('onBoardShareStarted', {
                 ownerId: ownerId,
                 operatorUser: operatorUser
@@ -308,9 +367,9 @@ export var FcrUIBoardShareProviderBase = /*#__PURE__*/function () {
               this._dialogProvider.closeDialog(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-es/providers/device-privilege-provider.js

@@ -16,7 +16,6 @@ import { FcrPermissionAction, FcrStreamPrivilegeOperation, FcrStreamType, FcrUse
 import { FcrPrivilegeUserRole } from 'fcr-core/lib/room-control/privilege-control/type';
 import { hasPermissionWithTargetRoleEnabled, isPermissionWithTargetRoleEnabled } from '../utilities/privilege';
 import { transI18n } from 'agora-ui-foundation/lib/i18n';
-import { getUserRoleI18nLabel } from '../utilities/i18n-common-data';
 export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
   function FcrUIDevicePrivilegeProviderImpl(_privilegeControl, _streamControl, _userControl, _deviceProvider, _messageProvider) {
     var _this = this;
@@ -37,12 +36,12 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
     this._privilegeObserver = {
       onLocalUserPermissionInfoAdded: function () {
         var _onLocalUserPermissionInfoAdded = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(roomId, event) {
-          var hasVideoPermission, localStream, hasVideo, hasAudioPermission, _localStream, hasAudio, _t, _t2;
+          var hasVideoPermission, localStream, hasVideo, hasAudioPermission, _localStream, hasAudio;
           return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (!_this._autoUpdateVideoStreamPrivilege) {
-                  _context.next = 4;
+                  _context.next = 1;
                   break;
                 }
                 hasVideoPermission = hasPermissionWithTargetRoleEnabled(event.permissionInfo, FcrPermissionAction.StreamStartVideo, FcrPrivilegeUserRole.SELF);
@@ -51,28 +50,22 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
                 });
                 hasVideo = (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === FcrStreamType.VIDEO || (localStream === null || localStream === void 0 ? void 0 : localStream.streamType) === 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(_defineProperty({}, localStream.streamId, {
+                _context.next = 1;
+                return _this._updatePublishPrivilegeOfStreams({
+                  streamId: localStream.streamId,
                   videoPrivilege: FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
                   audioPrivilege: 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 = hasPermissionWithTargetRoleEnabled(event.permissionInfo, FcrPermissionAction.StreamStartAudio, FcrPrivilegeUserRole.SELF);
@@ -81,30 +74,24 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
                 });
                 hasAudio = (_localStream === null || _localStream === void 0 ? void 0 : _localStream.streamType) === FcrStreamType.AUDIO || (_localStream === null || _localStream === void 0 ? void 0 : _localStream.streamType) === 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(_defineProperty({}, _localStream.streamId, {
+                _context.next = 2;
+                return _this._updatePublishPrivilegeOfStreams({
+                  streamId: _localStream.streamId,
                   videoPrivilege: FcrStreamPrivilegeOperation.NOOPERATION,
                   audioPrivilege: 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);
@@ -131,32 +118,14 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
                     var hasVideo = stream.streamType === FcrStreamType.VIDEO || stream.streamType === FcrStreamType.BOTH;
                     var hasAudio = stream.streamType === FcrStreamType.AUDIO || stream.streamType === 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: transI18n('fmt_attendies_tips_receive_video_off_you', {
-                              reason1: 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) || FcrUserRole.HOST;
-                        if (_this._deviceProvider.microphoneEnabled) {
-                          _this._messageProvider.showToast({
-                            type: 'error',
-                            message: transI18n('fmt_attendies_tips_receive_mute_you', {
-                              reason1: getUserRoleI18nLabel(_operatorUserRole)
-                            })
-                          });
-                        }
                         _this._observable.notifyObservers('onMicrophoneNeedClosed');
                       }
                     }
@@ -177,10 +146,11 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
                     }
                     // 更新流权限
                     if (videoPrivilege !== FcrStreamPrivilegeOperation.NOOPERATION || audioPrivilege !== FcrStreamPrivilegeOperation.NOOPERATION) {
-                      _this._streamControl.updatePublishPrivilegeOfStreams(_defineProperty({}, stream.streamId, {
+                      _this._updatePublishPrivilegeOfStreams({
+                        streamId: stream.streamId,
                         videoPrivilege: videoPrivilege,
                         audioPrivilege: audioPrivilege
-                      }));
+                      });
                     }
                   }
                 });
@@ -228,7 +198,7 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
     key: "hasOpenCameraPrivilege",
     value: function () {
       var _hasOpenCameraPrivilege = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var permissionInfo, hasVideoPermission, localUserId, localStream, hasVideo, _t3;
+        var permissionInfo, hasVideoPermission, localUserId, localStream, hasVideo, _t;
         return _regeneratorRuntime.wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -277,16 +247,17 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
               }
               _context3.prev = 6;
               _context3.next = 7;
-              return this._streamControl.updatePublishPrivilegeOfStreams(_defineProperty({}, localStream.streamId, {
+              return this._updatePublishPrivilegeOfStreams({
+                streamId: localStream.streamId,
                 videoPrivilege: FcrStreamPrivilegeOperation.HAS_PRIVILEGE,
                 audioPrivilege: 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);
@@ -310,7 +281,7 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
     key: "hasOpenMicrophonePrivilege",
     value: function () {
       var _hasOpenMicrophonePrivilege = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var permissionInfo, hasAudioPermission, localUserId, localStream, hasAudio, _t4;
+        var permissionInfo, hasAudioPermission, localUserId, localStream, hasAudio, _t2;
         return _regeneratorRuntime.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -359,16 +330,17 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
               }
               _context4.prev = 6;
               _context4.next = 7;
-              return this._streamControl.updatePublishPrivilegeOfStreams(_defineProperty({}, localStream.streamId, {
+              return this._updatePublishPrivilegeOfStreams({
+                streamId: localStream.streamId,
                 videoPrivilege: FcrStreamPrivilegeOperation.NOOPERATION,
                 audioPrivilege: 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);
@@ -388,6 +360,57 @@ export var FcrUIDevicePrivilegeProviderImpl = /*#__PURE__*/function () {
       }
       return hasOpenMicrophonePrivilege;
     }()
+  }, {
+    key: "_updatePublishPrivilegeOfStreams",
+    value: function () {
+      var _updatePublishPrivilegeOfStreams2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref) {
+        var audioPrivilege, videoPrivilege, streamId, err, _t3;
+        return _regeneratorRuntime.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(_defineProperty({}, 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 === FcrStreamPrivilegeOperation.HAS_PRIVILEGE) {
+                this._messageProvider.showToast({
+                  type: 'error',
+                  message: transI18n('fmt_device_toast_enable_microphone_maximum')
+                });
+              }
+              if (videoPrivilege === FcrStreamPrivilegeOperation.HAS_PRIVILEGE) {
+                this._messageProvider.showToast({
+                  type: 'error',
+                  message: 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) {