fcr-ui-scene 3.6.0 → 3.6.2

package/lib/modules/control-bar/store.js

@@ -70,7 +70,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _logger = require("../../utilities/logger");
 var _jsxRuntime = require("react/jsx-runtime");
 var _ControlBarStore;
-var _initProto, _leaveConfirmRefDecs, _init_leaveConfirmRef, _init_shareWithAudio, _init_currentShareId, _init_currentShareType, _init_currentShareBounds, _init_recordShareBounds, _init_cloudRecordingState, _init_isHost, _init_roomDuration, _init_startTime, _init_playUrl, _init_liveStreamingState, _init_allApplicationWindows, _init_roomInfo, _init_isShowMeetingDetailPortal, _init_hiddenShareActionNav, _init_boardOwnerUser, _init_currentShareDisplayId, _setCheckedStateMapDecs, _initControlBarDecs, _updateCurrentShareContentDecs, _setShareWithAudioStateDecs, _showLockedRoomToastDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _handleLeaveRoomDecs, _resetMessageCountDecs, _ref;
+var _initProto, _leaveConfirmRefDecs, _init_leaveConfirmRef, _init_currentShareId, _init_currentShareType, _init_currentShareBounds, _init_recordShareBounds, _init_cloudRecordingState, _init_isHost, _init_roomDuration, _init_startTime, _init_playUrl, _init_liveStreamingState, _init_allApplicationWindows, _init_roomInfo, _init_isShowMeetingDetailPortal, _init_hiddenShareActionNav, _init_boardOwnerUser, _init_currentShareDisplayId, _setCheckedStateMapDecs, _initControlBarDecs, _updateCurrentShareContentDecs, _setShareWithAudioStateDecs, _showLockedRoomToastDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _handleLeaveRoomDecs, _resetMessageCountDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -98,7 +98,6 @@ var _N = /*#__PURE__*/new WeakMap();
 var _O = /*#__PURE__*/new WeakMap();
 var _P = /*#__PURE__*/new WeakMap();
 var _Q = /*#__PURE__*/new WeakMap();
-var _R = /*#__PURE__*/new WeakMap();
 _ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _setCheckedStateMapDecs = [_mobx.action, _mobx.action.bound], _initControlBarDecs = [_mobx.action, _mobx.action.bound], _updateCurrentShareContentDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _showLockedRoomToastDecs = [_mobx.action, _mobx.action.bound], _createNewShareDecs = [_mobx.action, _mobx.action.bound], _handlerStopShareDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _handleMoreClickDecs = [_mobx.action, _mobx.action.bound], _pauseCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
 })], _resumeCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
@@ -126,8 +125,11 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       sharedMeetingTimeDataSource = _ref2.sharedMeetingTimeDataSource,
       messageProvider = _ref2.messageProvider,
       sharedSecuritySharedDataSource = _ref2.sharedSecuritySharedDataSource,
-      dialogProvider = _ref2.dialogProvider,
-      screenShareDataSource = _ref2.screenShareDataSource;
+      annotationProvider = _ref2.annotationProvider,
+      sharingProvider = _ref2.sharingProvider,
+      screenShareProvider = _ref2.screenShareProvider,
+      sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
+      dialogProvider = _ref2.dialogProvider;
     (0, _classCallCheck2["default"])(this, ControlBarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ControlBarStore'
@@ -142,7 +144,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_liveStreamingDialogKey", null);
     (0, _defineProperty2["default"])(this, "_dialogObsever", {
-      onDialogOpened: function onDialogOpened(dialogKey, dialogId, params) {
+      onDialogOpened: function onDialogOpened(dialogKey, dialogId) {
         if (dialogKey === _constant.FcrUIDialogKey.PARTICIPANT) {
           _this._participantDialogId = dialogId;
         }
@@ -155,34 +157,33 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "_participantDialogId", '');
     _classPrivateFieldInitSpec(this, _A, _init_leaveConfirmRef(this, undefined));
-    _classPrivateFieldInitSpec(this, _B, _init_shareWithAudio(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_currentShareId(this, ''));
-    _classPrivateFieldInitSpec(this, _D, _init_currentShareType(this, _type.AgoraRtcScreenCaptureType.SCREEN));
-    _classPrivateFieldInitSpec(this, _E, _init_currentShareBounds(this, {
+    _classPrivateFieldInitSpec(this, _B, _init_currentShareId(this, ''));
+    _classPrivateFieldInitSpec(this, _C, _init_currentShareType(this, _type.AgoraRtcScreenCaptureType.SCREEN));
+    _classPrivateFieldInitSpec(this, _D, _init_currentShareBounds(this, {
       width: 0,
       height: 0,
       x: 0,
       y: 0
     }));
-    _classPrivateFieldInitSpec(this, _F, _init_recordShareBounds(this, new Map()));
-    _classPrivateFieldInitSpec(this, _G, _init_cloudRecordingState(this, _type3.FcrRecordingState.Stopped));
-    _classPrivateFieldInitSpec(this, _H, _init_isHost(this, false));
-    _classPrivateFieldInitSpec(this, _I, _init_roomDuration(this, 0));
-    _classPrivateFieldInitSpec(this, _J, _init_startTime(this, new Date().getTime()));
-    _classPrivateFieldInitSpec(this, _K, _init_playUrl(this, ''));
-    _classPrivateFieldInitSpec(this, _L, _init_liveStreamingState(this, _type3.FcrLiveStreamingState.STOPPED));
-    _classPrivateFieldInitSpec(this, _M, _init_allApplicationWindows(this, []));
-    _classPrivateFieldInitSpec(this, _N, _init_roomInfo(this, {
+    _classPrivateFieldInitSpec(this, _E, _init_recordShareBounds(this, new Map()));
+    _classPrivateFieldInitSpec(this, _F, _init_cloudRecordingState(this, _type3.FcrRecordingState.Stopped));
+    _classPrivateFieldInitSpec(this, _G, _init_isHost(this, false));
+    _classPrivateFieldInitSpec(this, _H, _init_roomDuration(this, 0));
+    _classPrivateFieldInitSpec(this, _I, _init_startTime(this, new Date().getTime()));
+    _classPrivateFieldInitSpec(this, _J, _init_playUrl(this, ''));
+    _classPrivateFieldInitSpec(this, _K, _init_liveStreamingState(this, _type3.FcrLiveStreamingState.STOPPED));
+    _classPrivateFieldInitSpec(this, _L, _init_allApplicationWindows(this, []));
+    _classPrivateFieldInitSpec(this, _M, _init_roomInfo(this, {
       roomId: '',
       roomName: '',
       roomType: _type2.FcrRoomType.Mainroom,
       password: '',
       inviteLink: ''
     }));
-    _classPrivateFieldInitSpec(this, _O, _init_isShowMeetingDetailPortal(this, false));
-    _classPrivateFieldInitSpec(this, _P, _init_hiddenShareActionNav(this, false));
-    _classPrivateFieldInitSpec(this, _Q, _init_boardOwnerUser(this, ''));
-    _classPrivateFieldInitSpec(this, _R, _init_currentShareDisplayId(this, 0));
+    _classPrivateFieldInitSpec(this, _N, _init_isShowMeetingDetailPortal(this, false));
+    _classPrivateFieldInitSpec(this, _O, _init_hiddenShareActionNav(this, false));
+    _classPrivateFieldInitSpec(this, _P, _init_boardOwnerUser(this, ''));
+    _classPrivateFieldInitSpec(this, _Q, _init_currentShareDisplayId(this, 0));
     this._uiEventStore = uiEventStore;
     this._roomControl = roomControl;
     this._securityStore = securityStore;
@@ -194,21 +195,24 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     this._sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
     this._messageProvider = messageProvider;
     this._sharedSecuritySharedDataSource = sharedSecuritySharedDataSource;
-    this._screenShareDataSource = screenShareDataSource;
+    this._annotationProvider = annotationProvider;
+    this._sharingProvider = sharingProvider;
     this.startTime = (_roomControl$getRoomS = (_roomControl$getRoomS2 = roomControl.getRoomSchedule()) === null || _roomControl$getRoomS2 === void 0 ? void 0 : _roomControl$getRoomS2.startTime) !== null && _roomControl$getRoomS !== void 0 ? _roomControl$getRoomS : new Date().getTime();
     this.roomInfo = roomControl.getRoomInfo();
     this.roomDuration = (_roomControl$getRoomS3 = (_roomControl$getRoomS4 = roomControl.getRoomSchedule()) === null || _roomControl$getRoomS4 === void 0 ? void 0 : _roomControl$getRoomS4.duration) !== null && _roomControl$getRoomS3 !== void 0 ? _roomControl$getRoomS3 : 0;
     this.liveStreamingState = roomControl.getLiveStreamingState();
     this._deviceProvider = deviceProvider;
     this._abilityProvider = abilityProvider;
+    this._screenShareProvider = screenShareProvider;
+    this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     this._dialogProvider = dialogProvider;
     this._dialogProvider.addObserver(this._dialogObsever);
     this._roomObserver = {
-      onLiveStreamingStateUpdated: function onLiveStreamingStateUpdated(roomId, state, url) {
+      onLiveStreamingStateUpdated: function onLiveStreamingStateUpdated(_roomId, state, url) {
         _this.liveStreamingState = state;
         _this.playUrl = url;
       },
-      onCloudRecordingStateUpdated: function onCloudRecordingStateUpdated(roomId, state) {
+      onCloudRecordingStateUpdated: function onCloudRecordingStateUpdated(_roomId, state) {
         return _this.cloudRecordingState = state;
       }
     };
@@ -221,7 +225,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       }
     };
     roomControl.addObserver(this._roomObserver);
-    roomControl.getBoardControl().addObserver(this._boardObserver);
+    roomControl.getSharingControl().getBoardControl().addObserver(this._boardObserver);
   }
   return (0, _createClass2["default"])(ControlBarStore, [{
     key: "leaveConfirmRef",
@@ -232,7 +236,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "shareWithAudio",
+    key: "currentShareId",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -240,7 +244,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "currentShareId",
+    key: "currentShareType",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -248,7 +252,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "currentShareType",
+    key: "currentShareBounds",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -256,7 +260,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "currentShareBounds",
+    key: "recordShareBounds",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -264,7 +268,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "recordShareBounds",
+    key: "cloudRecordingState",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -272,7 +276,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "cloudRecordingState",
+    key: "isHost",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -280,7 +284,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "isHost",
+    key: "roomDuration",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -288,7 +292,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "roomDuration",
+    key: "startTime",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -296,7 +300,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "startTime",
+    key: "playUrl",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -304,7 +308,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "playUrl",
+    key: "liveStreamingState",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -312,7 +316,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "liveStreamingState",
+    key: "allApplicationWindows",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -320,7 +324,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "allApplicationWindows",
+    key: "roomInfo",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -328,7 +332,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "roomInfo",
+    key: "isShowMeetingDetailPortal",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -336,7 +340,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "isShowMeetingDetailPortal",
+    key: "hiddenShareActionNav",
     get: function get() {
       return _classPrivateFieldGet(_O, this);
     },
@@ -344,7 +348,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "hiddenShareActionNav",
+    key: "boardOwnerUser",
     get: function get() {
       return _classPrivateFieldGet(_P, this);
     },
@@ -352,7 +356,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_P, this, v);
     }
   }, {
-    key: "boardOwnerUser",
+    key: "currentShareDisplayId",
     get: function get() {
       return _classPrivateFieldGet(_Q, this);
     },
@@ -360,17 +364,9 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_Q, this, v);
     }
   }, {
-    key: "currentShareDisplayId",
-    get: function get() {
-      return _classPrivateFieldGet(_R, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_R, this, v);
-    }
-  }, {
-    key: "shareAudioProcessingChannel",
+    key: "shareWithAudio",
     get: function get() {
-      return this._screenShareDataSource.currentShareAudioProcessingChannel;
+      return this._sharedScreenShareSharedDataSource.shareWithAudio;
     }
   }, {
     key: "privilegeProvider",
@@ -427,6 +423,21 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._securityStore.hasEndRoomPermission();
     }
+  }, {
+    key: "hasAnnotationAllowWritePermission",
+    get: function get() {
+      return this._securityStore.hasAnnotationAllowWritePermission();
+    }
+  }, {
+    key: "hasAnnotationStartPermission",
+    get: function get() {
+      return this._securityStore.hasAnnotationStartPermission();
+    }
+  }, {
+    key: "allowAnnotationWriteState",
+    get: function get() {
+      return this._securityStore.allowAnnotationWriteState();
+    }
   }, {
     key: "totalHourText",
     get: function get() {
@@ -503,11 +514,21 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._sharedMemberDataSource.memberUserInfoList;
     }
+  }, {
+    key: "shareAudioProcessingChannel",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.currentShareAudioProcessingChannel;
+    }
   }, {
     key: "checkedStateMap",
     get: function get() {
       return this._sharedSecuritySharedDataSource.checkedStateMap;
     }
+  }, {
+    key: "isSharingScreen",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isSharingScreen;
+    }
   }, {
     key: "setCheckedStateMap",
     value: function setCheckedStateMap(val) {
@@ -515,7 +536,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "initControlBar",
-    value: function initControlBar(payload, browserWindow) {
+    value: function initControlBar(payload, _browserWindow) {
       // this._screenShareDataSource.setCurrentShareAudioProcessingChannel(
       //   payload.currentShareAudioProcessingChannel,
       // );
@@ -533,15 +554,11 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       this.currentShareId = id;
       this.currentShareType = type;
       this.currentShareBounds = bounds;
-      // this.setControlBarWindowBounds();
     }
   }, {
     key: "setShareWithAudioState",
     value: function setShareWithAudioState(withAudio) {
-      this.shareWithAudio = withAudio;
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.SET_SHARE_WITH_AUDIO, {
-        withAudio: withAudio
-      });
+      this._screenShareProvider.toggleScreenshareWithAudio(withAudio);
     }
   }, {
     key: "showLockedRoomToast",
@@ -554,17 +571,21 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "createNewShare",
     value: function createNewShare() {
-      this._uiEventStore.startShareScreen();
+      this._screenShareProvider.bootstrap();
     }
   }, {
     key: "handlerStopShare",
     value: function handlerStopShare() {
-      this._uiEventStore.stopShareScreen();
+      if (this.isSharingScreen) {
+        this._screenShareProvider.stop();
+      } else {
+        this.log('handlerStopShare: share screen is starting, please wait a moment to operate');
+      }
     }
   }, {
     key: "setShareAudioProcessingChannel",
     value: function setShareAudioProcessingChannel(target) {
-      this._screenShareDataSource.setCurrentShareAudioProcessingChannel(target);
+      this._sharedScreenShareSharedDataSource.setCurrentShareAudioProcessingChannel(target);
     }
 
     // more
@@ -719,6 +740,16 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       var _this$_localStoragePr;
       return (_this$_localStoragePr = this._localStorageProvider) === null || _this$_localStoragePr === void 0 ? void 0 : _this$_localStoragePr.read(this.meetingTimeKey);
     }
+  }, {
+    key: "toggleAnnotation",
+    value: function toggleAnnotation() {
+      this._annotationProvider.toggleAnnotation();
+    }
+  }, {
+    key: "setAllAnnotationWrite",
+    value: function setAllAnnotationWrite(allow) {
+      this._securityStore.setAllowAnnotation(allow);
+    }
   }, {
     key: "release",
     value: function release() {
@@ -726,11 +757,16 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
         return disposer();
       });
       this._disposers = [];
-      this._roomControl.getBoardControl().removeObserver(this._boardObserver);
+      this._roomControl.getSharingControl().getBoardControl().removeObserver(this._boardObserver);
       this._dialogProvider.removeObserver(this._dialogObsever);
       this._roomControl.removeObserver(this._roomObserver);
       this.recordShareBounds.clear();
     }
+  }, {
+    key: "log",
+    value: function log(info) {
+      this.logger.info(info);
+    }
   }, {
     key: "_resetMessageCount",
     value: function _resetMessageCount() {
@@ -739,24 +775,23 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _ControlBarStore = ControlBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentShareBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "isHost"], [_mobx.observable, 1, "roomDuration"], [_mobx.observable, 1, "startTime"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isShowMeetingDetailPortal"], [_mobx.observable, 1, "hiddenShareActionNav"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentShareDisplayId"], [_mobx.computed, 3, "hasSecurityPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingUrlPermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_mobx.computed, 3, "meetingTimeKey"], [_mobx.computed, 3, "roomId"], [_mobx.computed, 3, "meetingId"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_initControlBarDecs, 18, "initControlBar"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_createNewShareDecs, 18, "createNewShare"], [_handlerStopShareDecs, 18, "handlerStopShare"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_handleMoreClickDecs, 18, "handleMoreClick"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showToastDecs, 18, "showToast"], [_setShowMeetingDetailPortalDecs, 18, "setShowMeetingDetailPortal"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_handleLeaveRoomDecs, 18, "handleLeaveRoom"], [_decorator.bound, 2, "getLocalMeetingTime"], [_resetMessageCountDecs, 18, "_resetMessageCount"]], []).e, 19);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentShareBounds"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "isHost"], [_mobx.observable, 1, "roomDuration"], [_mobx.observable, 1, "startTime"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isShowMeetingDetailPortal"], [_mobx.observable, 1, "hiddenShareActionNav"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentShareDisplayId"], [_mobx.computed, 3, "hasSecurityPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingUrlPermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "hasAnnotationAllowWritePermission"], [_mobx.computed, 3, "hasAnnotationStartPermission"], [_mobx.computed, 3, "allowAnnotationWriteState"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_mobx.computed, 3, "meetingTimeKey"], [_mobx.computed, 3, "roomId"], [_mobx.computed, 3, "meetingId"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_initControlBarDecs, 18, "initControlBar"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_createNewShareDecs, 18, "createNewShare"], [_handlerStopShareDecs, 18, "handlerStopShare"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_handleMoreClickDecs, 18, "handleMoreClick"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showToastDecs, 18, "showToast"], [_setShowMeetingDetailPortalDecs, 18, "setShowMeetingDetailPortal"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_handleLeaveRoomDecs, 18, "handleLeaveRoom"], [_decorator.bound, 2, "getLocalMeetingTime"], [_decorator.bound, 2, "toggleAnnotation"], [_decorator.bound, 2, "setAllAnnotationWrite"], [_decorator.bound, 2, "log"], [_resetMessageCountDecs, 18, "_resetMessageCount"]], []).e, 18);
 _init_leaveConfirmRef = _applyDecs$e[0];
-_init_shareWithAudio = _applyDecs$e[1];
-_init_currentShareId = _applyDecs$e[2];
-_init_currentShareType = _applyDecs$e[3];
-_init_currentShareBounds = _applyDecs$e[4];
-_init_recordShareBounds = _applyDecs$e[5];
-_init_cloudRecordingState = _applyDecs$e[6];
-_init_isHost = _applyDecs$e[7];
-_init_roomDuration = _applyDecs$e[8];
-_init_startTime = _applyDecs$e[9];
-_init_playUrl = _applyDecs$e[10];
-_init_liveStreamingState = _applyDecs$e[11];
-_init_allApplicationWindows = _applyDecs$e[12];
-_init_roomInfo = _applyDecs$e[13];
-_init_isShowMeetingDetailPortal = _applyDecs$e[14];
-_init_hiddenShareActionNav = _applyDecs$e[15];
-_init_boardOwnerUser = _applyDecs$e[16];
-_init_currentShareDisplayId = _applyDecs$e[17];
-_initProto = _applyDecs$e[18];
+_init_currentShareId = _applyDecs$e[1];
+_init_currentShareType = _applyDecs$e[2];
+_init_currentShareBounds = _applyDecs$e[3];
+_init_recordShareBounds = _applyDecs$e[4];
+_init_cloudRecordingState = _applyDecs$e[5];
+_init_isHost = _applyDecs$e[6];
+_init_roomDuration = _applyDecs$e[7];
+_init_startTime = _applyDecs$e[8];
+_init_playUrl = _applyDecs$e[9];
+_init_liveStreamingState = _applyDecs$e[10];
+_init_allApplicationWindows = _applyDecs$e[11];
+_init_roomInfo = _applyDecs$e[12];
+_init_isShowMeetingDetailPortal = _applyDecs$e[13];
+_init_hiddenShareActionNav = _applyDecs$e[14];
+_init_boardOwnerUser = _applyDecs$e[15];
+_init_currentShareDisplayId = _applyDecs$e[16];
+_initProto = _applyDecs$e[17];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/control-bar/view.js

@@ -23,6 +23,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.find.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.iterator.constructor.js");
@@ -77,20 +79,20 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     cloudRecordingState = _useContext2.cloudRecordingState,
     hasStartCloudRecordingPermission = _useContext2.hasStartCloudRecordingPermission,
     hasStopLiveStreamingPermission = _useContext2.hasStopLiveStreamingPermission,
+    hasAnnotationStartPermission = _useContext2.hasAnnotationStartPermission,
     hasSecurityPermission = _useContext2.hasSecurityPermission,
-    allApplicationWindows = _useContext2.allApplicationWindows,
     isShowMeetingDetailPortal = _useContext2.isShowMeetingDetailPortal,
     setShowMeetingDetailPortal = _useContext2.setShowMeetingDetailPortal,
     setEnableWaitingRoom = _useContext2.setEnableWaitingRoom,
     currentShareDisplayId = _useContext2.currentShareDisplayId,
     privilegeProvider = _useContext2.privilegeProvider,
     newMessageCount = _useContext2.newMessageCount,
-    currentShareType = _useContext2.currentShareType,
     currentShareBounds = _useContext2.currentShareBounds,
     recordShareBounds = _useContext2.recordShareBounds,
     showLockedRoomToast = _useContext2.showLockedRoomToast,
     checkedStateMap = _useContext2.checkedStateMap,
-    setCheckedStateMap = _useContext2.setCheckedStateMap;
+    setCheckedStateMap = _useContext2.setCheckedStateMap,
+    log = _useContext2.log;
   // 控制栏本身的高度
   var NAV_HEIGHT = 84;
   // 鼠标移开后自动隐藏的时间
@@ -279,12 +281,14 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
         y: y
       }, bounds);
       browserWindow.setBounds(screenBounds);
+      log("[ControlBarView]: [getScreenBounds], screenBounds: ".concat(JSON.stringify(screenBounds)));
     } else {
       recordShareBounds.clear();
       screenBounds = (0, _tools.getCurrentSharingWorkArea)({
         currentShareBounds: currentShareBounds
       });
       recordShareBounds.set(currentShareBounds, screenBounds);
+      log("[ControlBarView]: [getScreenBounds], screenBounds: ".concat(JSON.stringify(screenBounds)));
     }
     return screenBounds;
   }

package/lib/modules/dialog/components/annotation-tool/index.d.ts

@@ -0,0 +1,4 @@
+import { PropsWithChildren } from 'react';
+export declare const title = "Annotation tool bar";
+export declare const config: Electron.BrowserWindowConstructorOptions;
+export declare const AnnotationBarDialog: (props: PropsWithChildren<{}>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/components/annotation-tool/index.js

@@ -0,0 +1,53 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.title = exports.config = exports.AnnotationBarDialog = void 0;
+var _constant = require("../../../../utilities/constant");
+var _useElectron = require("../../hooks/useElectron");
+var _mobxReact = require("mobx-react");
+var _hostAreaContainer = require("../host-area-container");
+var _jsxRuntime = require("react/jsx-runtime");
+var title = exports.title = 'Annotation tool bar';
+var config = exports.config = {
+  y: 0,
+  x: 0,
+  maximizable: false,
+  backgroundColor: '#00000000',
+  hiddenInMissionControl: true,
+  hasShadow: false,
+  useContentSize: true,
+  minimizable: false,
+  resizable: false,
+  title: title,
+  type: 'panel',
+  skipTaskbar: true,
+  width: 800,
+  height: 100,
+  movable: false
+};
+var AnnotationBarDialog = exports.AnnotationBarDialog = (0, _mobxReact.observer)(function (props) {
+  var children = props.children;
+  (0, _useElectron.useElectronDialog)({
+    dialogKey: _constant.FcrUIDialogKey.ANNOTATION_TOOL,
+    config: config,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_hostAreaContainer.HotAreaContainer, {
+      width: 800,
+      height: 90,
+      dialogKey: _constant.FcrUIDialogKey.ANNOTATION_TOOL,
+      children: children
+    }),
+    hasCustomShadow: false,
+    disableShortcutClose: true,
+    alwaysOnTop: 'screen-saver',
+    fullScreen: true,
+    ignoreMouseEvents: true,
+    onOpened: function onOpened(_ref) {
+      var browserWindow = _ref.browserWindow,
+        newRendererWindow = _ref.newRendererWindow;
+    }
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+});

package/lib/modules/dialog/components/chat/index.js

@@ -25,7 +25,7 @@ var Container = (0, _mobxReact.observer)(function (props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
     title: store.chatRoomState === _type.FcrChatRoomConnectionState.Connected ? transI18n('fmt_chat_label_chat') : transI18n('fmt_aside_status_connecting'),
     actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [props.chatAction, store.isSharingScreen ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+      children: [props.chatAction, store.isSharingScreen && store.isSharingScreenOwner ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
         content: transI18n('fmt_uimanager_option_mergeview'),
         mouseEnterDelay: 0,
         trigger: "hover",

package/lib/modules/dialog/components/dialog-container/index.css

@@ -3,6 +3,22 @@
   position: relative;
   flex: 1;
   width: 100%;
+  font-family:
+    ui-sans-serif,
+    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    'Helvetica Neue',
+    Arial,
+    'Noto Sans',
+    sans-serif,
+    'Apple Color Emoji',
+    'Segoe UI Emoji',
+    'Segoe UI Symbol',
+    'Noto Color Emoji';
+  font-size: 14px;
 }
 
 .fcr-dialog-container_shadow {

package/lib/modules/dialog/components/host-area-container/index.d.ts

@@ -0,0 +1,12 @@
+import { PropsWithChildren } from 'react';
+import { FcrUIDialogKey } from '../../../../utilities/constant';
+import { ToolTipProps } from 'agora-ui-foundation/lib/components/tooltip';
+export declare const HotAreaContext: import("react").Context<{
+    placement: ToolTipProps["placement"];
+}>;
+export declare const HotAreaContainer: (props: PropsWithChildren<{
+    width: number;
+    height: number;
+    dialogKey: FcrUIDialogKey;
+    placement?: ToolTipProps["placement"];
+}>) => import("react/jsx-runtime").JSX.Element;