yangjie #51

Open
yangqiang wants to merge 34 commits from yangjie into master
1 changed files with 9 additions and 6 deletions
Showing only changes of commit 15233cf8de - Show all commits

View File

@ -727,7 +727,13 @@ const Meeting: React.FC = () => {
break; break;
// 扩展操作 // 扩展操作
case 'Operation': case 'Operation':
switch (item.contentString) { try {
const temp = JSON.parse(item.contentString)
if (temp.type === 'mode') {
message.success(`管理员已将会议室显示模式更新为${getMeetingContentBodyLeftModeText(temp.mode)}`)
setMeetingMode(temp.mode)
}
} catch (error) {
} }
break; break;
@ -1001,9 +1007,6 @@ const Meeting: React.FC = () => {
uid: temp.uid, uid: temp.uid,
enableCamera: temp.enableCamera enableCamera: temp.enableCamera
}) })
} else if (temp.type === 'mode') {
message.success(`管理员已将会议室显示模式更新为${getMeetingContentBodyLeftModeText(temp.mode)}`)
setMeetingMode(temp.mode)
} }
} catch (error) { } catch (error) {
@ -2630,8 +2633,8 @@ const Meeting: React.FC = () => {
okText: '确定', okText: '确定',
cancelText: '取消', cancelText: '取消',
async onOk() { async onOk() {
await window.electron.onInvoke('sendOper2User', { await window.electron.onInvoke('sendOper', {
uid: userInfo.uid, roomNum: state.channelId,
contentString: JSON.stringify({ contentString: JSON.stringify({
mode, mode,
type: 'mode' type: 'mode'