From c66f60d2ab8f22e856bf33636b65af5b5da8ea8c Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 16 Oct 2024 10:43:42 +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/UserListWindow/index.tsx | 48 +++++++++++-----------
 src/page/Meeting/index.tsx                | 49 ++++++++++-------------
 2 files changed, 45 insertions(+), 52 deletions(-)

diff --git a/src/page/Meeting/UserListWindow/index.tsx b/src/page/Meeting/UserListWindow/index.tsx
index b3bf4bf..963ebda 100644
--- a/src/page/Meeting/UserListWindow/index.tsx
+++ b/src/page/Meeting/UserListWindow/index.tsx
@@ -1,7 +1,7 @@
 import { role } from '@/config/role';
 import styles from '@/page/Meeting/UserListWindow/index.module.scss'
 import ImageUrl from '@/utils/package/imageUrl';
-import { EllipsisOutlined, ExclamationCircleFilled, SearchOutlined } from '@ant-design/icons';
+import { EllipsisOutlined, ExclamationCircleFilled, SearchOutlined, UserAddOutlined, UserDeleteOutlined } from '@ant-design/icons';
 import { Button, Input, Modal, Popover } from 'antd';
 import Avatar from '@/components/Avatar';
 import { useEffect, useState } from "react";
@@ -100,7 +100,7 @@ const UserListWindow: React.FC = () => {
                           uid: item.uid
                         }
                       });
-                    }} title={item.enableMicr ? '静音' : '解除声音'} />
+                    }} title={item.enableMicr ? '静音' : '解除静音'} />
                   </div> : null}
                   {role.ID.includes(item.roleId) || item.isRoomManager ? <div>
                     <img src={item.enableCamera ? ImageUrl.icon23 : ImageUrl.icon23Active} alt="" onClick={() => {
@@ -113,32 +113,30 @@ const UserListWindow: React.FC = () => {
                       });
                     }} title={item.enableCamera ? '关闭视频' : '开启视频'} />
                   </div> : null}
+                  {item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
+                    if (item.isRoomManager) {
+                      channel.postMessage({
+                        type: 'userListWindowDeleteRoomManager',
+                        userListWindowDeleteRoomManager: {
+                          uid: item.uid
+                        }
+                      });
+                    } else {
+                      channel.postMessage({
+                        type: 'userListWindowPostRoomManager',
+                        userListWindowPostRoomManager: {
+                          uid: item.uid
+                        }
+                      });
+                    }
+                  }}>
+                    {!item.isRoomManager ?
+                      <UserAddOutlined style={{ color: '#fff', fontSize: '20px' }} title='设为发言人' /> :
+                      <UserDeleteOutlined style={{ color: '#fff', fontSize: '20px' }} title='取消发言人' />}
+                  </div> : null}
                   {item.uid !== user.uid && role.ID.includes(user.roleId) ? <div>
                     <Popover placement="left" title={''} content={
                       <div style={{ width: '100px' }}>
-                        {!role.ID.includes(item.roleId) ? <Button
-                          type="primary"
-                          className='m-ant-btn'
-                          style={{ marginBottom: '10px', width: '100%' }}
-                          size={'small'}
-                          onClick={() => {
-                            if (item.isRoomManager) {
-                              channel.postMessage({
-                                type: 'userListWindowDeleteRoomManager',
-                                userListWindowDeleteRoomManager: {
-                                  uid: item.uid
-                                }
-                              });
-                            } else {
-                              channel.postMessage({
-                                type: 'userListWindowPostRoomManager',
-                                userListWindowPostRoomManager: {
-                                  uid: item.uid
-                                }
-                              });
-                            }
-                          }}
-                        >{item.isRoomManager ? '取消发言人' : '设为发言人'}</Button> : null}
                         <Button
                           type="primary"
                           className='m-ant-btn'
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 409c0d6..3e3a216 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -4,7 +4,7 @@ import Operation from '@/components/Operation';
 import SpeakerModeModal from '@/components/SpeakerModeModal';
 import InvitingPersonnelModal from '@/components/InvitingPersonnelModal';
 import { Button, Input, Popover, Modal, Checkbox, message, Popconfirm, notification } from "antd";
-import { SearchOutlined, EllipsisOutlined, ExclamationCircleFilled, FullscreenExitOutlined, FullscreenOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { SearchOutlined, EllipsisOutlined, ExclamationCircleFilled, FullscreenExitOutlined, FullscreenOutlined, QuestionCircleOutlined, UserAddOutlined, UserDeleteOutlined } from '@ant-design/icons';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { thumbImageBufferToBase64 } from '@/utils/package/base64'
 import { storage } from '@/utils';
@@ -2232,37 +2232,35 @@ const Meeting: React.FC = () => {
                                 {role.ID.includes(item.roleId) || item.isRoomManager ? <div>
                                   <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" onClick={() => {
                                     postOpenMicr(!item.enableMicr, item.uid)
-                                  }} title={item.enableMicr ? '静音' : '解除声音'} />
+                                  }} title={item.enableMicr ? '静音' : '解除静音'} />
                                 </div> : null}
                                 {role.ID.includes(item.roleId) || item.isRoomManager ? <div>
                                   <img src={item.enableCamera ? ImageUrl.icon23 : ImageUrl.icon23Active} alt="" onClick={() => {
                                     postOpenCamera(!item.enableCamera, item.uid)
                                   }} title={item.enableCamera ? '关闭视频' : '开启视频'} />
                                 </div> : null}
+                                {item.uid !== user.uid && !role.ID.includes(item.roleId) ? <div onClick={() => {
+                                  if (item.isRoomManager) {
+                                    DeleteRoomManager({
+                                      roomId: state.roomId,
+                                      roomNum: state.channelId,
+                                      userId: item.uid
+                                    })
+                                  } else {
+                                    postRoomManager({
+                                      roomId: state.roomId,
+                                      roomNum: state.channelId,
+                                      userId: item.uid
+                                    })
+                                  }
+                                }}>
+                                  {!item.isRoomManager ?
+                                    <UserAddOutlined style={{ color: '#fff', fontSize: '20px' }} title='设为发言人' /> :
+                                    <UserDeleteOutlined style={{ color: '#fff', fontSize: '20px' }} title='取消发言人' />}
+                                </div> : null}
                                 {item.uid !== user.uid && role.ID.includes(user.roleId) ? <div>
                                   <Popover placement="left" title={''} content={
                                     <div style={{ width: '100px' }}>
-                                      {!role.ID.includes(item.roleId) ? <Button
-                                        type="primary"
-                                        className='m-ant-btn'
-                                        style={{ marginBottom: '10px', width: '100%' }}
-                                        size={'small'}
-                                        onClick={() => {
-                                          if (item.isRoomManager) {
-                                            DeleteRoomManager({
-                                              roomId: state.roomId,
-                                              roomNum: state.channelId,
-                                              userId: item.uid
-                                            })
-                                          } else {
-                                            postRoomManager({
-                                              roomId: state.roomId,
-                                              roomNum: state.channelId,
-                                              userId: item.uid
-                                            })
-                                          }
-                                        }}
-                                      >{item.isRoomManager ? '取消发言人' : '设为发言人'}</Button> : null}
                                       <Button
                                         type="primary"
                                         className='m-ant-btn'
@@ -2282,10 +2280,7 @@ const Meeting: React.FC = () => {
                                       >移出会议</Button>
                                     </div>
                                   }>
-                                    <EllipsisOutlined style={{
-                                      color: '#fff',
-                                      fontSize: '20px'
-                                    }} />
+                                    <EllipsisOutlined style={{ color: '#fff', fontSize: '20px' }} />
                                   </Popover>
                                 </div> : null}
                               </div>