|
@@ -161,23 +161,30 @@ function handleUserJoin(members?: UserInfoType[], user?: UserInfoType) {
|
|
|
Dialog.toast({ content: t('action.hosterEnterRoom') });
|
|
|
socket.emit('action', { type: 'user-init' });
|
|
|
socket.emit('sync-floor', { floorId: appStore.floorId });
|
|
|
- const data: ChatContentType = {
|
|
|
- role: user?.Role,
|
|
|
- mode: rtcStore.mode,
|
|
|
- Nickname: name,
|
|
|
- UserId: user?.UserId,
|
|
|
- text: t('action.enterRoom'),
|
|
|
- };
|
|
|
- rtcStore.addToChatList(data);
|
|
|
}
|
|
|
+ const data: ChatContentType = {
|
|
|
+ role: user?.Role,
|
|
|
+ mode: rtcStore.mode,
|
|
|
+ Nickname: name,
|
|
|
+ UserId: user?.UserId,
|
|
|
+ text: t('action.enterRoom'),
|
|
|
+ };
|
|
|
+ // if (rtcStore.isLeader) {
|
|
|
+ // rtcStore.addToChatList(data);
|
|
|
+ // // const { socket } = useSocket();
|
|
|
+ // // const { currentScene } = useRoom();
|
|
|
+ // // socket.emit('action', {
|
|
|
+ // // type: 'changeScene',
|
|
|
+ // // data: currentScene.value,
|
|
|
+ // // });
|
|
|
+ // }
|
|
|
|
|
|
if (rtcStore.isLeader) {
|
|
|
- // const { socket } = useSocket();
|
|
|
- // const { currentScene } = useRoom();
|
|
|
- // socket.emit('action', {
|
|
|
- // type: 'changeScene',
|
|
|
- // data: currentScene.value,
|
|
|
- // });
|
|
|
+ console.log('主持人看到', data);
|
|
|
+ rtcStore.addToChatList(data);
|
|
|
+ } else {
|
|
|
+ console.log('参与者看到', data);
|
|
|
+ user.Role == 'leader' && rtcStore.addToChatList(data);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -281,16 +288,22 @@ const handleUserLeave = (user?: UserInfoType, members?: UserInfoType[]) => {
|
|
|
if (user.Role == 'leader') {
|
|
|
name = t('action.hoster');
|
|
|
Dialog.toast({ content: t('action.hostExitRoom') });
|
|
|
- const data = {
|
|
|
- role: user.Role,
|
|
|
- mode: '',
|
|
|
- Nickname: name,
|
|
|
- UserId: user.UserId,
|
|
|
- text: t('action.exitRoom'),
|
|
|
- };
|
|
|
+ }
|
|
|
+ const data = {
|
|
|
+ role: user.Role,
|
|
|
+ mode: '',
|
|
|
+ Nickname: name,
|
|
|
+ UserId: user.UserId,
|
|
|
+ text: t('action.exitRoom'),
|
|
|
+ };
|
|
|
|
|
|
- console.log('members', user, members);
|
|
|
+ console.log('members', user, members);
|
|
|
+ if (rtcStore.isLeader) {
|
|
|
+ console.log('主持人看到', data);
|
|
|
rtcStore.addToChatList(data);
|
|
|
+ } else {
|
|
|
+ console.log('参与者看到', data);
|
|
|
+ user.Role == 'leader' && rtcStore.addToChatList(data);
|
|
|
}
|
|
|
|
|
|
members && rtcStore.setMemberList(members);
|