diff --git a/src/components/JoinSetting/index.tsx b/src/components/JoinSetting/index.tsx index f10644e..2d38cba 100644 --- a/src/components/JoinSetting/index.tsx +++ b/src/components/JoinSetting/index.tsx @@ -8,6 +8,7 @@ import { PostRefresh } from '@/api/Login'; import Avatar from '@/components/Avatar'; import { useNavigate } from 'react-router-dom'; import { agora } from '@/utils/package/agora'; +import { role } from '@/config/role'; let time = null as any; const JoinSetting = forwardRef((_props: any, ref: any) => { useImperativeHandle(ref, () => ({ @@ -127,7 +128,7 @@ const JoinSetting = forwardRef((_props: any, ref: any) => { { joinRoomSettingForm.map((item, index) => { return
{ - if (user.roleId === '1') { + if (role.ID.includes(user.roleId)) { let msg = ''; if (index === 0) { await agora.getAudioMediaList().then(res => { diff --git a/src/components/SharedFilesModel/index.tsx b/src/components/SharedFilesModel/index.tsx index 44bb73b..097e9fa 100644 --- a/src/components/SharedFilesModel/index.tsx +++ b/src/components/SharedFilesModel/index.tsx @@ -13,6 +13,7 @@ import axios from 'axios'; import { useLocation } from 'react-router-dom'; import { storage } from '@/utils'; import StupWizard from '../StupWizard'; +import { role } from '@/config/role'; const fs = require('fs').promises; const { exec } = require('child_process'); const { Column } = Table @@ -128,7 +129,7 @@ const SharedFilesModel = forwardRef((props: any, ref: any) => { }) } }} /> - {roomUserItem && roomUserItem.roleId === '1' || roomUserItem.isRoomManager ? { + {roomUserItem && role.ID.includes(roomUserItem.roleId) || roomUserItem.isRoomManager ? { setShowRowSelection(!showRowSelection) }} style={{ color: showRowSelection ? '#5575F2' : 'white' }} /> : null} {showRowSelection ? { diff --git a/src/config/role.ts b/src/config/role.ts new file mode 100644 index 0000000..228b636 --- /dev/null +++ b/src/config/role.ts @@ -0,0 +1,3 @@ +export const role = { + ID: ['1', '3'] +} diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index 7e57f57..85736b3 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -9,6 +9,7 @@ import JoinSetting from '@/components/JoinSetting'; import { storage } from '@/utils'; import { PostRefresh } from '@/api/Login'; import { useNavigate } from 'react-router-dom'; +import { role } from '@/config/role'; const Index: React.FC = () => { const navigate = useNavigate(); const [list, setList] = useState({ @@ -153,7 +154,7 @@ const Index: React.FC = () => { : null} - {item.uid !== user.uid && item.roleId !== '1' ?
- {item.roleId === '1' || item.isRoomManager ?
+ {role.ID.includes(item.roleId) || item.isRoomManager ?
{ postOpenMicr(!item.enableMicr, item.uid) }} title={item.enableMicr ? '静音' : '解除声音'} />
: null} - {item.roleId === '1' || item.isRoomManager ?
+ {role.ID.includes(item.roleId) || item.isRoomManager ?
{ postOpenCamera(!item.enableCamera, item.uid) }} title={item.enableCamera ? '关闭视频' : '开启视频'} />
: null} - {item.uid !== user.uid && user.roleId === '1' ?
+ {item.uid !== user.uid && role.ID.includes(user.roleId) ?
- {item.roleId !== '1' ? : null} - {roomUserItem.uid !== user.uid && roomUserItem.roleId !== '1' ?
case '申请发言': - if (user.roleId !== '1') { + if (!role.ID.includes(user.roleId)) { return
changeStatusList(row, itemIndex, rowIndex)} key={rowIndex}> {row.title} @@ -2032,7 +2033,7 @@ const Meeting: React.FC = () => { } return null case '结束发言': - if (user.roleId !== '1') { + if (!role.ID.includes(user.roleId)) { return { } return null case '会议监控': - if (user.roleId === '1') { + if (role.ID.includes(user.roleId)) { return
changeStatusList(row, itemIndex, rowIndex)} @@ -2208,8 +2209,8 @@ const meetingContentUser = (item: any, bool?: boolean) => { <>
- {item.roleId === '1' || item.isRoomManager ? -
+ {role.ID.includes(item.roleId) || item.isRoomManager ? +
: null} { @@ -2220,9 +2221,9 @@ const meetingContentUser = (item: any, bool?: boolean) => {
: ''} } - + {item.userName} - {item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''} + {role.ID.includes(item.roleId) || item.isRoomManager ? role.ID.includes(item.roleId) ? '(管理员)' : '(发言人)' : ''}
diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts index 40617cb..0f16462 100644 --- a/src/utils/package/agora.ts +++ b/src/utils/package/agora.ts @@ -12,6 +12,7 @@ import { } from "agora-electron-sdk"; import { GetRoomRtcToken, GetAgoraConf } from "@/api/Home/Index"; import { storage } from '@/utils'; +import { role } from "@/config/role"; const option: any = { appId: '', token: '', @@ -271,7 +272,7 @@ export const agora = { { clientRoleType: bool ? ClientRoleType.ClientRoleAudience : ClientRoleType.ClientRoleBroadcaster, //用户角色 ClientRoleBroadcaster 主播 ClientRoleAudience 观众 autoSubscribeAudio: false,//设置是否自动订阅所有音频流 - autoSubscribeVideo: user.roleId === '1' ? true : false,//设置是否自动订阅所有视频流 + autoSubscribeVideo: role.ID.includes(user.roleId) ? true : false,//设置是否自动订阅所有视频流 publishMicrophoneTrack: false,//设置是否发布麦克风采集到的音频 publishCameraTrack: true,//设置是否发布摄像头采集的视频 publishScreenTrack: false,//设置是否发布屏幕采集的视频