全员看ta优化

src/api/Meeting/index.ts

@@ -105,9 +105,9 @@ export const GetShowUser = (roomNum: string) =>
     method: 'get'
   })
 
-export const PostShowUser = (roomNum: string, uid: string) =>
+export const PostShowUser = (roomNum: string, uid: string, uname: string) =>
   request({
-    url: `/room/show-user?roomNum=${roomNum}&uid=${uid}`,
+    url: `/room/show-user?roomNum=${roomNum}&uid=${uid}&uname=${uname}`,
     method: 'post'
   })
 export const GetJoin = (data: any) =>

src/page/Meeting/index.tsx

@@ -298,6 +298,7 @@ const Meeting: React.FC = () => {
           break;
         // 全员看他
         case 'ShowUser':
+          console.log(item);
           getShowUser()
           break;
         // 用户加入频道回调
@@ -314,10 +315,16 @@ const Meeting: React.FC = () => {
           break;
         // 用户关闭开启麦克风
         case 'OperMicr':
+          if (item.user.uid === userInfo.uid) {
+            message.success(item.user.enableMicr ? '管理员已取消你的静音' : '你已被管理员静音')
+          }
           setAllUserListData('OperMicr', item)
           break;
         // 用户开启关闭摄像头
         case 'OperCamera':
+          if (item.user.uid === userInfo.uid) {
+            message.success(item.user.enableCamera ? '管理员已开启你的摄像头' : '管理员已关闭你摄像头')
+          }
           setAllUserListData('OperCamera', item)
           break;
         // 发言人用户信息刷新
@@ -613,7 +620,7 @@ const Meeting: React.FC = () => {
           if (res) {
             await agora.leaveChannelEx(userInfo.screenShareId)
             agora.stopScreenCapture()
-            await allUserLook(userInfo.uid)
+            await allUserLook(userInfo.uid, userInfo.userName)
             footerListTemplate[itemIndex][rowIndex].title = '共享屏幕'
           } else {
             message.error(msgTips)
@@ -729,7 +736,7 @@ const Meeting: React.FC = () => {
       footerListTemplate[footerListIndex.itemIndex][footerListIndex.rowIndex].title = '停止共享'
       setIsSharedScreenModal(false)
       await agora.setDesktopCapturerVideo(sharedScreenItem, isComputerAudio, isFluencyPriority)
-      await allUserLook(user.screenShareId)
+      await allUserLook(user.screenShareId, user.userName)
     } else {
       message.error('请选择应用!')
     }
@@ -752,8 +759,8 @@ const Meeting: React.FC = () => {
   };
 
   // 设置全员看谁
-  const allUserLook = async (uid: string): Promise<void> => {
+  const allUserLook = async (uid: string, name: string): Promise<void> => {
-    await PostShowUser(state.channelId, uid).then(res => {
+    await PostShowUser(state.channelId, uid, name).then(res => {
       if (res.code === 200) {
         getShowUser()
       }
@@ -985,9 +992,9 @@ const Meeting: React.FC = () => {
   // 设置全员观看
   const setAllUserLook = (item: any): void => {
     if (isShare) {
-      allUserLook(String(isShare) === item.screenShareId ? item.screenShareId : item.uid)
+      allUserLook(String(isShare) === item.screenShareId ? item.screenShareId : item.uid, item.userName)
     } else {
-      allUserLook(item.uid)
+      allUserLook(item.ui, item.userName)
     }
   }
   // 移出房间

src/utils/package/signalr.ts

@@ -83,9 +83,13 @@ export const onSignalr = (callBack: Function) => {
       })
     });
     // 全员看他
-    connection.on("ShowUser", () => {
+    connection.on("ShowUser", (uid: string, uname: string, operUid: string, operUserName: string) => {
       callBack({
         key: 'ShowUser',
+        uid,
+        uname,
+        operUid,
+        operUserName,
       })
     });
     // 更新视图模式