fcr-ui-scene 3.6.1 → 3.6.3

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

@@ -55,22 +55,21 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
-var _type = require("agora-rte-sdk/lib/core/rtc/type");
 var _decorator = require("agora-foundation/lib/decorator");
-var _type2 = require("fcr-core/lib/room-control/type");
+var _type = require("fcr-core/lib/room-control/type");
 var _fcrCore = require("fcr-core");
-var _type3 = require("fcr-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _react = require("react");
 var _stopButton = _interopRequireDefault(require("./components/stop-live-streaming/stop-button"));
 var _constant = require("../../utilities/constant");
 var _enums = require("./enums");
 var _leaveMeeting = require("../components/leave-meeting");
-var _type4 = require("../../type");
+var _type3 = require("../../type");
 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_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, _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; }
@@ -95,11 +94,7 @@ var _K = /*#__PURE__*/new WeakMap();
 var _L = /*#__PURE__*/new WeakMap();
 var _M = /*#__PURE__*/new WeakMap();
 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, {
+_ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _setCheckedStateMapDecs = [_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, {
   leading: true
@@ -126,8 +121,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'
@@ -155,34 +153,25 @@ 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, {
-      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, _B, _init_recordShareBounds(this, new Map()));
+    _classPrivateFieldInitSpec(this, _C, _init_cloudRecordingState(this, _type2.FcrRecordingState.Stopped));
+    _classPrivateFieldInitSpec(this, _D, _init_isHost(this, false));
+    _classPrivateFieldInitSpec(this, _E, _init_roomDuration(this, 0));
+    _classPrivateFieldInitSpec(this, _F, _init_startTime(this, new Date().getTime()));
+    _classPrivateFieldInitSpec(this, _G, _init_playUrl(this, ''));
+    _classPrivateFieldInitSpec(this, _H, _init_liveStreamingState(this, _type2.FcrLiveStreamingState.STOPPED));
+    _classPrivateFieldInitSpec(this, _I, _init_allApplicationWindows(this, []));
+    _classPrivateFieldInitSpec(this, _J, _init_roomInfo(this, {
       roomId: '',
       roomName: '',
-      roomType: _type2.FcrRoomType.Mainroom,
+      roomType: _type.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, _K, _init_isShowMeetingDetailPortal(this, false));
+    _classPrivateFieldInitSpec(this, _L, _init_hiddenShareActionNav(this, false));
+    _classPrivateFieldInitSpec(this, _M, _init_boardOwnerUser(this, ''));
+    _classPrivateFieldInitSpec(this, _N, _init_currentShareDisplayId(this, 0));
     this._uiEventStore = uiEventStore;
     this._roomControl = roomControl;
     this._securityStore = securityStore;
@@ -194,13 +183,16 @@ 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 = {
@@ -221,7 +213,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 +224,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "shareWithAudio",
+    key: "recordShareBounds",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -240,7 +232,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "currentShareId",
+    key: "cloudRecordingState",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -248,7 +240,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "currentShareType",
+    key: "isHost",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -256,7 +248,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "currentShareBounds",
+    key: "roomDuration",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -264,7 +256,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "recordShareBounds",
+    key: "startTime",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -272,7 +264,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "cloudRecordingState",
+    key: "playUrl",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -280,7 +272,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "isHost",
+    key: "liveStreamingState",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -288,7 +280,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "roomDuration",
+    key: "allApplicationWindows",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -296,7 +288,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "startTime",
+    key: "roomInfo",
     get: function get() {
       return _classPrivateFieldGet(_J, this);
     },
@@ -304,7 +296,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "playUrl",
+    key: "isShowMeetingDetailPortal",
     get: function get() {
       return _classPrivateFieldGet(_K, this);
     },
@@ -312,7 +304,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_K, this, v);
     }
   }, {
-    key: "liveStreamingState",
+    key: "hiddenShareActionNav",
     get: function get() {
       return _classPrivateFieldGet(_L, this);
     },
@@ -320,7 +312,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_L, this, v);
     }
   }, {
-    key: "allApplicationWindows",
+    key: "boardOwnerUser",
     get: function get() {
       return _classPrivateFieldGet(_M, this);
     },
@@ -328,7 +320,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "roomInfo",
+    key: "currentShareDisplayId",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -336,41 +328,24 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "isShowMeetingDetailPortal",
-    get: function get() {
-      return _classPrivateFieldGet(_O, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_O, this, v);
-    }
-  }, {
-    key: "hiddenShareActionNav",
+    key: "shareWithAudio",
     get: function get() {
-      return _classPrivateFieldGet(_P, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_P, this, v);
+      return this._sharedScreenShareSharedDataSource.shareWithAudio;
     }
   }, {
-    key: "boardOwnerUser",
+    key: "currentShareId",
     get: function get() {
-      return _classPrivateFieldGet(_Q, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_Q, this, v);
+      return this._sharedScreenShareSharedDataSource.currentShareId;
     }
   }, {
-    key: "currentShareDisplayId",
+    key: "currentShareType",
     get: function get() {
-      return _classPrivateFieldGet(_R, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_R, this, v);
+      return this._sharedScreenShareSharedDataSource.currentShareType;
     }
   }, {
-    key: "shareAudioProcessingChannel",
+    key: "currentShareBounds",
     get: function get() {
-      return this._screenShareDataSource.currentShareAudioProcessingChannel;
+      return this._sharedScreenShareSharedDataSource.currentSelectionBounds;
     }
   }, {
     key: "privilegeProvider",
@@ -427,6 +402,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,45 +493,35 @@ 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: "setCheckedStateMap",
-    value: function setCheckedStateMap(val) {
-      this._sharedSecuritySharedDataSource.setCheckedStateMap(val);
+    key: "isSharingScreen",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isSharingScreen;
     }
   }, {
-    key: "initControlBar",
-    value: function initControlBar(payload, _browserWindow) {
-      // this._screenShareDataSource.setCurrentShareAudioProcessingChannel(
-      //   payload.currentShareAudioProcessingChannel,
-      // );
-      this.currentShareId = payload.currentShareId;
-      this.currentShareType = payload.currentShareType;
-      this.currentShareBounds = payload.currentShareBounds;
-      this.setShareWithAudioState(payload.shareWithAudio);
+    key: "isReplaceScreen",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isReplaceScreen;
     }
   }, {
-    key: "updateCurrentShareContent",
-    value: function updateCurrentShareContent(payload) {
-      var id = payload.id,
-        type = payload.type,
-        bounds = payload.bounds;
-      this.currentShareId = id;
-      this.currentShareType = type;
-      this.currentShareBounds = bounds;
-      // this.setControlBarWindowBounds();
+    key: "setCheckedStateMap",
+    value: function setCheckedStateMap(val) {
+      this._sharedSecuritySharedDataSource.setCheckedStateMap(val);
     }
   }, {
     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 +534,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
@@ -607,7 +591,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
           var dispose = (0, _mobx.reaction)(function () {
             return _this2.liveStreamingState;
           }, function (liveStreamingState) {
-            if (liveStreamingState === _type3.FcrLiveStreamingState.STOPPED) {
+            if (liveStreamingState === _type2.FcrLiveStreamingState.STOPPED) {
               _this2._liveStreamingDialogKey && _this2._uiEventStore.closeDialog(_this2._liveStreamingDialogKey);
               dispose();
             }
@@ -656,7 +640,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     key: "startCloudRecording",
     value: function startCloudRecording() {
       this._roomControl.startCloudRecording({
-        audioProfile: _type3.FcrCloudRecordingAudioProfile.DEFAULT,
+        audioProfile: _type2.FcrCloudRecordingAudioProfile.DEFAULT,
         videoEncoderConfig: {
           dimensions: {
             width: 1280,
@@ -719,6 +703,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,37 +720,38 @@ 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() {
-      this.newMessageCount = (0, _defineProperty2["default"])({}, _type4.FcrUIRoomType.MAIN_ROOM, 0);
+      this.newMessageCount = (0, _defineProperty2["default"])({}, _type3.FcrUIRoomType.MAIN_ROOM, 0);
     }
   }]);
 }();
 _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, "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"], [_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, 15);
 _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_recordShareBounds = _applyDecs$e[1];
+_init_cloudRecordingState = _applyDecs$e[2];
+_init_isHost = _applyDecs$e[3];
+_init_roomDuration = _applyDecs$e[4];
+_init_startTime = _applyDecs$e[5];
+_init_playUrl = _applyDecs$e[6];
+_init_liveStreamingState = _applyDecs$e[7];
+_init_allApplicationWindows = _applyDecs$e[8];
+_init_roomInfo = _applyDecs$e[9];
+_init_isShowMeetingDetailPortal = _applyDecs$e[10];
+_init_hiddenShareActionNav = _applyDecs$e[11];
+_init_boardOwnerUser = _applyDecs$e[12];
+_init_currentShareDisplayId = _applyDecs$e[13];
+_initProto = _applyDecs$e[14];
 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");
@@ -56,6 +58,7 @@ var _tools = require("../../utilities/tools");
 var _enums = require("./enums");
 var _constant = require("../../utilities/constant");
 var _type2 = require("../../type");
+var _annotationButton = require("./components/annotation-button");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["x", "y"];
 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; }
@@ -72,25 +75,27 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     setShareAudioProcessingChannel = _useContext2.setShareAudioProcessingChannel,
     createNewShare = _useContext2.createNewShare,
     currentShareId = _useContext2.currentShareId,
+    isSharingScreen = _useContext2.isSharingScreen,
     handleMoreClick = _useContext2.handleMoreClick,
     liveStreamingState = _useContext2.liveStreamingState,
     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,
+    isReplaceScreen = _useContext2.isReplaceScreen,
+    log = _useContext2.log;
   // 控制栏本身的高度
   var NAV_HEIGHT = 84;
   // 鼠标移开后自动隐藏的时间
@@ -279,12 +284,14 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
         y: y
       }, bounds);
       browserWindow.setBounds(screenBounds);
+      log("[ControlBarView]: [getScreenBounds][screen-share], screenBounds: ".concat(JSON.stringify(screenBounds)));
     } else {
       recordShareBounds.clear();
       screenBounds = (0, _tools.getCurrentSharingWorkArea)({
         currentShareBounds: currentShareBounds
       });
       recordShareBounds.set(currentShareBounds, screenBounds);
+      log("[ControlBarView]: [getScreenBounds][screen-share], screenBounds: ".concat(JSON.stringify(screenBounds)));
     }
     return screenBounds;
   }
@@ -325,6 +332,45 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       clearInterval(windowFocusTimerRef.current);
     };
   }, [currentShareId]);
+
+  // useEffect(() => {
+  //   console.log('isReplaceScreen', isReplaceScreen);
+  //   return () => {
+  //     if (isReplaceScreen) {
+  //       const mainWindowVisible = window.runtime.browserWindow.isVisible();
+  //       log(
+  //         `[ControlBarView]:[screen-share]: control bar is destroying, main window is ${mainWindowVisible ? 'visible' : 'hidden'}, isReplaceScreen: ${isReplaceScreen}`,
+  //       );
+  //       // 当 control bar 卸载时，看看主窗口是否隐藏，如果隐藏，则显示主窗口
+  //       if (!mainWindowVisible) {
+  //         window.runtime.browserWindow.show();
+  //         log(
+  //           `[ControlBarView]:[screen-share]: main window is hiding at control bar destroyed, show main window`,
+  //         );
+  //       }
+  //       // 当 control bar 卸载时，看看 controlbar 的 window 是否仍然存在 ，如果存在则隐藏
+  //       if (browserWindow.isVisible()) {
+  //         browserWindow.hide();
+  //         log(
+  //           `[ControlBarView]:[screen-share]: control bar window is showing at control bar destroyed, hide control bar window`,
+  //         );
+  //       }
+  //     }
+  //   };
+  // }, [isReplaceScreen]);
+
+  // useEffect(() => {
+  //   return () => {
+  //     log(
+  //       `[ControlBarView]:[screen-share]: control bar is destroying, sharing state is ${isSharingScreen ? 'sharing' : 'not sharing'}`,
+  //     );
+  //     // 如果 controlbar 销毁后共享状态仍然进行，则再次尝试停止共享
+  //     if (isSharingScreen) {
+  //       handlerStopShare();
+  //     }
+  //   };
+  // }, [isSharingScreen]);
+
   return currentShareId ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, bind()), {}, {
     style: {
       width: 'fit-content',
@@ -389,7 +435,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
             }
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareScreenButton.ShareScreenButton, {
             onCreateNewShareButtonClick: createNewShare
-          }), hasStopLiveStreamingPermission && liveStreamingState === _type.FcrLiveStreamingState.STARTED && /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopLiveStreaming.StopLiveStreamingButton, {}), hasStartCloudRecordingPermission && cloudRecordingState !== _type.FcrRecordingState.Stopped && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cloudRecordingButtons.CloudRecordingButtons, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
+          }), hasAnnotationStartPermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationButton.AnnotationButton, {}), hasStopLiveStreamingPermission && liveStreamingState === _type.FcrLiveStreamingState.STARTED && /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopLiveStreaming.StopLiveStreamingButton, {}), hasStartCloudRecordingPermission && cloudRecordingState !== _type.FcrRecordingState.Stopped && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cloudRecordingButtons.CloudRecordingButtons, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
             count: newMessageCount[_type2.FcrUIRoomType.MAIN_ROOM] || 0,
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_more.More, {
               visible: moreVisible,

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;