From 57860ea91b2141fdceb5a3650493ee4cba0240c5 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 20 Aug 2024 16:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx   | 11 ++++++++---
 src/utils/package/signalr.ts | 10 ++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 44475a4..3ef3ad7 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -298,6 +298,11 @@ const Meeting: React.FC = () => {
           break;
         // 全员看他
         case 'ShowUser':
+          if (item.uid === userInfo.uid) {
+            message.success(`${item.operUserName}设置全员看你`)
+          } else {
+            message.success(`${item.operUserName}设置全员看${item.uname}`)
+          }
           getShowUser()
           break;
         // 用户加入频道回调
@@ -314,15 +319,15 @@ const Meeting: React.FC = () => {
           break;
         // 用户关闭开启麦克风
         case 'OperMicr':
-          if (item.user.uid === userInfo.uid) {
+          if (item.operUid !== userInfo.uid) {
             message.success(item.user.enableMicr ? '管理员已取消你的静音' : '你已被管理员静音')
           }
           setAllUserListData('OperMicr', item)
           break;
         // 用户开启关闭摄像头
         case 'OperCamera':
-          if (item.user.uid === userInfo.uid) {
-            message.success(item.user.enableCamera ? '管理员已开启你的摄像头' : '管理员已关闭你摄像头')
+          if (item.operUid !== userInfo.uid) {
+            message.success(item.user.enableCamera ? '管理员已取消你的静音' : '你已被管理员静音')
           }
           setAllUserListData('OperCamera', item)
           break;
diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts
index 4d77714..ca847f1 100644
--- a/src/utils/package/signalr.ts
+++ b/src/utils/package/signalr.ts
@@ -122,17 +122,19 @@ export const onSignalr = (callBack: Function) => {
       })
     });
     // 用户关闭开启麦克风
-    connection.on("OperMicr", (user: any) => {
+    connection.on("OperMicr", (user: any, operUid: string) => {
       callBack({
         key: 'OperMicr',
-        user
+        user,
+        operUid
       })
     });
     // 用户开启关闭摄像头
-    connection.on("OperCamera", (user: any) => {
+    connection.on("OperCamera", (user: any, operUid: string) => {
       callBack({
         key: 'OperCamera',
-        user
+        user,
+        operUid
       })
     });
     // 发言人用户信息刷新