yangjie #51

Open
yangqiang wants to merge 34 commits from yangjie into master
1 changed files with 11 additions and 3 deletions
Showing only changes of commit 883525787d - Show all commits

View File

@ -743,7 +743,7 @@ const Meeting: React.FC = () => {
case 'Operation':
try {
const temp = JSON.parse(item.contentString)
if (temp.type === 'mode') {
if (temp.type === 'mode' && temp.msg) {
message.success(`管理员已将会议室显示模式更新为${getMeetingContentBodyLeftModeText(temp.mode)}`)
setMeetingMode(temp.mode)
}
@ -776,7 +776,6 @@ const Meeting: React.FC = () => {
}
}
}
setMeetingMode('StandardMode')
getShowUser()
break;
// 用户加入频道回调
@ -2175,6 +2174,14 @@ const Meeting: React.FC = () => {
await PostStopSharedScreen(state.channelId)
} else {
await PostShowUser(state.channelId, uid, name)
await window.electron.onInvoke('sendOper', {
roomNum: state.channelId,
contentString: JSON.stringify({
mode: 'StandardMode',
type: 'mode',
msg: false
})
})
}
}
// 设置发言人
@ -2650,7 +2657,8 @@ const Meeting: React.FC = () => {
roomNum: state.channelId,
contentString: JSON.stringify({
mode,
type: 'mode'
type: 'mode',
msg: true,
})
})
setModeOpen(false)