优化

src/page/Meeting/index.tsx

@@ -362,6 +362,17 @@ const Meeting: React.FC = () => {
         // 发言人用户信息刷新
         case 'ManagerRefresh':
           setAllUserListData('ManagerRefresh', item, async () => {
+            if (item.user.uid === item.uid) {
+              if (item.user.uid === userInfo.uid) {
+                message.success(`操作成功`)
+                await agora.updateChannelMediaOptions(item.user.isRoomManager)
+                await postOpenMicrApi(item.user.isRoomManager, userInfo.uid, false)
+                await postOpenCameraApi(item.user.isRoomManager, userInfo.uid)
+                await stopScreenCapture()
+              } else {
+                message.success(`${item.user.userName}已结束发言`)
+              }
+            } else {
               if (item.user.uid === userInfo.uid) {
                 message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}您为发言人`)
                 await agora.updateChannelMediaOptions(item.user.isRoomManager)
@@ -371,6 +382,7 @@ const Meeting: React.FC = () => {
               } else {
                 message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`)
               }
+            }
             if (!item.user.isRoomManager) {
               changeVideo()
             }
@@ -1763,6 +1775,7 @@ const Meeting: React.FC = () => {
                       case '结束发言':
                         if (user.roleId !== '1') {
                           return <Popconfirm
+                            key={rowIndex}
                             title="提示"
                             description="确定要结束发言吗？"
                             onConfirm={() => {

src/utils/package/signalr.ts

@@ -138,10 +138,11 @@ export const onSignalr = (callBack: Function) => {
       })
     });
     // 发言人用户信息刷新
-    connection.on("ManagerRefresh", (user: any) => {
+    connection.on("ManagerRefresh", (user: any, uid: string) => {
       callBack({
         key: 'ManagerRefresh',
-        user
+        user,
+        uid
       })
     });
     // 申请发言
@@ -168,6 +169,7 @@ export const offSignalr = () => {
     connection.off('OperMicr');
     connection.off('OperCamera');
     connection.off('ManagerRefresh');
+    connection.off('ApplyToSpeak');
   }
 }
 export const onInvoke = async (str: string, data: any) => {