marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

聊天优化

This commit is contained in:
yj 2024-08-21 09:45:34 +08:00
parent ad8d75beaf
commit a4b24252d6
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/page/Meeting/index.tsx
View File

@ -258,7 +258,7 @@ const Meeting: React.FC = () => {
setStatusList((res: any) => { setStatusList((res: any) => {
if (!res.userChatList) { if (!res.userChatList) {
api.open({ api.open({
message: '消息', message: item.userName,
description: item.message, description: item.message,
duration: 3, duration: 3,
showProgress: true, showProgress: true,
@ -341,9 +341,12 @@ const Meeting: React.FC = () => {
case 'ManagerRefresh': case 'ManagerRefresh':
setAllUserListData('ManagerRefresh', item, async () => { setAllUserListData('ManagerRefresh', item, async () => {
if (item.user.uid === userInfo.uid) { if (item.user.uid === userInfo.uid) {
message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}您为发言人`)
await agora.updateChannelMediaOptions(item.user.isRoomManager) await agora.updateChannelMediaOptions(item.user.isRoomManager)
await postOpenMicrApi(item.user.isRoomManager, userInfo.uid) await postOpenMicrApi(item.user.isRoomManager, userInfo.uid)
await postOpenCameraApi(item.user.isRoomManager, userInfo.uid) await postOpenCameraApi(item.user.isRoomManager, userInfo.uid)
} else {
message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`)
} }
}) })
break; break;
@ -798,6 +801,7 @@ const Meeting: React.FC = () => {
uid: user.uid, uid: user.uid,
userName: user.userName, userName: user.userName,
message: msg, message: msg,
timestamp: +new Date()
}]) }])
setTextMsg(''); setTextMsg('');
chatScrollBotton() chatScrollBotton()
@ -1423,11 +1427,18 @@ const Meeting: React.FC = () => {
}> }>
<div> <div>
<div><Avatar name={item.userName} /></div> <div><Avatar name={item.userName} /></div>
<span>{item.userName}</span> {item.uid !== user.uid ?
<span>{item.userName} <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')}</span></span> :
<span> <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')} </span>{item.userName}</span>
}
</div> </div>
</Popover> : <div> </Popover> : <div>
<div><Avatar name={item.userName} /></div> <div><Avatar name={item.userName} /></div>
<span>{item.userName}</span> {item.uid !== user.uid ?
<span>{item.userName} <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')}</span></span> :
<span><span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')} </span>{item.userName}</span>
}
</div>} </div>}
<div>{item.message}</div> <div>{item.message}</div>
</div> </div>

4
src/utils/package/signalr.ts
View File

@ -57,10 +57,10 @@ export const onOtherSignalr = (callBack: Function) => {
export const onSignalr = (callBack: Function) => { export const onSignalr = (callBack: Function) => {
if (connection) { if (connection) {
// 聊天 // 聊天
connection.on("ReceiveMessage", (uid: string, userName: string, message: string) => { connection.on("ReceiveMessage", (uid: string, userName: string, message: string, timestamp: string) => {
callBack({ callBack({
key: 'ReceiveMessage', key: 'ReceiveMessage',
uid, message, userName uid, message, userName, timestamp
}) })
}); });
// 扩展操作 // 扩展操作