diff --git a/src/assets/icon50.png b/src/assets/icon50.png new file mode 100644 index 0000000..9914d40 Binary files /dev/null and b/src/assets/icon50.png differ diff --git a/src/assets/icon51.png b/src/assets/icon51.png new file mode 100644 index 0000000..1b36b17 Binary files /dev/null and b/src/assets/icon51.png differ diff --git a/src/components/StupWizard/index.tsx b/src/components/StupWizard/index.tsx index 8f8cb72..c6ff0ed 100644 --- a/src/components/StupWizard/index.tsx +++ b/src/components/StupWizard/index.tsx @@ -6,7 +6,6 @@ import { agora } from '@/utils/package/agora' import { CloseOutlined, LoadingOutlined, QuestionCircleOutlined } from '@ant-design/icons'; import { storage } from '@/utils'; import path from 'path'; -import { getKeyOpenChildWindow } from '@/utils/package/public'; const fs = require('fs').promises; const { exec } = require('child_process'); @@ -100,11 +99,6 @@ const StupWizard = forwardRef((props: any, ref: any) => { if (location.hash.indexOf('/meeting') === -1) { agora.release() } - const isOpen = await getKeyOpenChildWindow('shareScreenWindow') - if (isOpen) { - window.electron.mainWindowHide() - window.electron.setViewStatus('hide') - } setIsStupWizard(false) }} /> diff --git a/src/page/Meeting/ShareScreenWindow/index.tsx b/src/page/Meeting/ShareScreenWindow/index.tsx index 8d9164e..a69af22 100644 --- a/src/page/Meeting/ShareScreenWindow/index.tsx +++ b/src/page/Meeting/ShareScreenWindow/index.tsx @@ -1,4 +1,4 @@ -import { GetRoomUser, GetRoomUserItem } from '@/api/Meeting'; +import { GetRoomUser } from '@/api/Meeting'; import { role } from '@/config/role'; import styles from '@/page/Meeting/ShareScreenWindow/index.module.scss' import { storage } from '@/utils'; @@ -36,13 +36,6 @@ const ShareScreenWindow: React.FC = () => { active: false, select: false, }, - { - title: '设置', - icon: ImageUrl.icon28, - iconSelect: ImageUrl.icon28Select, - active: false, - select: false, - }, { title: '录制', icon: ImageUrl.icon27, @@ -73,8 +66,8 @@ const ShareScreenWindow: React.FC = () => { footerListTemplate[0].active = footerList[0][0].active; footerListTemplate[1].title = footerList[0][1].active ? '开启视频' : '关闭视频'; footerListTemplate[1].active = footerList[0][1].active; - footerListTemplate[5].title = footerList[1][3].active ? '录制中' : '录制'; - footerListTemplate[5].active = footerList[1][3].active; + footerListTemplate[4].title = footerList[1][3].active ? '录制中' : '录制'; + footerListTemplate[4].active = footerList[1][3].active; setFooterLists(footerListTemplate) break; case 'currentSpeakUserMe': @@ -90,24 +83,17 @@ const ShareScreenWindow: React.FC = () => { // 获取房间用户 const getRoomUser = async (): Promise => { const data = JSON.parse(storage.getItem('stateInfo') as string) - await GetRoomUserItem(data.channelId, userInfo.uid).then((res: any) => { + await GetRoomUser(data.channelId).then(res => { if (res.code === 200) { - const footerListTemplate = [...footerLists]; - footerListTemplate[0].title = !res.data.enableMicr ? '解除静音' : '静音'; - footerListTemplate[0].active = !res.data.enableMicr; - footerListTemplate[1].title = !res.data.enableCamera ? '开启视频' : '关闭视频'; - footerListTemplate[1].active = !res.data.enableCamera; - setFooterLists(footerListTemplate) - GetRoomUser(data.channelId).then(res => { - if (res.code === 200) { - res.data.forEach((item: any) => { - item.isShow = true; - item.isRoom = true; - item.isAdmin = role.ID.includes(item.roleId) || item.isRoomManager - }) - setRoomUserLists(res.data) - } + res.data.forEach((item: any) => { + item.isShow = true; + item.isRoom = true; + item.isAdmin = role.ID.includes(item.roleId) || item.isRoomManager }) + setRoomUserLists(res.data) + channel.postMessage({ + type: 'shareScreenWindowGetFooterLists', + }); } }) } @@ -145,11 +131,6 @@ const ShareScreenWindow: React.FC = () => { shareScreenWindowfooterListsTitle: item.title }); break; - case '设置': - channel.postMessage({ - type: 'shareScreenWindowSetting' - }); - break; case '聊天': const chatBigWindow = await getKeyOpenChildWindow('chatBigWindow') if (!chatBigWindow) { diff --git a/src/page/Meeting/UserListWindow/index.tsx b/src/page/Meeting/UserListWindow/index.tsx index 963ebda..8bcd214 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, UserAddOutlined, UserDeleteOutlined } from '@ant-design/icons'; +import { EllipsisOutlined, ExclamationCircleFilled, SearchOutlined } from '@ant-design/icons'; import { Button, Input, Modal, Popover } from 'antd'; import Avatar from '@/components/Avatar'; import { useEffect, useState } from "react"; @@ -91,6 +91,27 @@ const UserListWindow: React.FC = () => {
+ {item.uid !== user.uid && !role.ID.includes(item.roleId) ?
{ + if (item.isRoomManager) { + channel.postMessage({ + type: 'userListWindowDeleteRoomManager', + userListWindowDeleteRoomManager: { + uid: item.uid + } + }); + } else { + channel.postMessage({ + type: 'userListWindowPostRoomManager', + userListWindowPostRoomManager: { + uid: item.uid + } + }); + } + }}> + {!item.isRoomManager ? + : + } +
: null} {role.ID.includes(item.roleId) || item.isRoomManager ?
{ channel.postMessage({ @@ -113,27 +134,6 @@ const UserListWindow: React.FC = () => { }); }} title={item.enableCamera ? '关闭视频' : '开启视频'} />
: null} - {item.uid !== user.uid && !role.ID.includes(item.roleId) ?
{ - if (item.isRoomManager) { - channel.postMessage({ - type: 'userListWindowDeleteRoomManager', - userListWindowDeleteRoomManager: { - uid: item.uid - } - }); - } else { - channel.postMessage({ - type: 'userListWindowPostRoomManager', - userListWindowPostRoomManager: { - uid: item.uid - } - }); - } - }}> - {!item.isRoomManager ? - : - } -
: null} {item.uid !== user.uid && role.ID.includes(user.roleId) ?
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 3e3a216..3016891 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, UserAddOutlined, UserDeleteOutlined } from '@ant-design/icons'; +import { SearchOutlined, EllipsisOutlined, ExclamationCircleFilled, FullscreenExitOutlined, FullscreenOutlined, QuestionCircleOutlined } from '@ant-design/icons'; import { useLocation, useNavigate } from 'react-router-dom'; import { thumbImageBufferToBase64 } from '@/utils/package/base64' import { storage } from '@/utils'; @@ -229,11 +229,6 @@ const Meeting: React.FC = () => { await stopScreenCapture() await allUserLook(userInfo.uid, userInfo.userName) break; - case 'shareScreenWindowSetting': - stupWizardRef.current.changeModal(3); - window.electron.mainWindowCenter() - window.electron.setViewStatus('show') - break; case 'shareScreenWindowfooterListsTitle': switch (shareScreenWindowfooterListsTitle) { case '静音': @@ -256,6 +251,20 @@ const Meeting: React.FC = () => { break; } break; + case 'shareScreenWindowGetFooterLists': + setFooterList((res: any) => { + channel.postMessage({ + type: 'footerList', + footerList: res, + }); + return res + }) + break; + case 'shareScreenWindowEquipmentManagement': + equipmentManagement(shareScreenWindowEquipmentManagement.uid, shareScreenWindowEquipmentManagement.userName) + window.electron.mainWindowCenter() + window.electron.setViewStatus('show') + break; case 'userListWindowPostOpenMicr': postOpenMicr(userListWindowPostOpenMicr.enableMicr, userListWindowPostOpenMicr.uid) break; @@ -282,11 +291,6 @@ const Meeting: React.FC = () => { case 'userListWindowAllPostOpenMicr': postOpenMicr(false, userInfo.id, true) break; - case 'shareScreenWindowEquipmentManagement': - equipmentManagement(shareScreenWindowEquipmentManagement.uid, shareScreenWindowEquipmentManagement.userName) - window.electron.mainWindowCenter() - window.electron.setViewStatus('show') - break; case 'chatSmallWindowSendChannelMsg': sendMsg(chatSmallWindowSendChannelMsg.msg) break; @@ -2229,16 +2233,6 @@ const Meeting: React.FC = () => {
- {role.ID.includes(item.roleId) || item.isRoomManager ?
- { - postOpenMicr(!item.enableMicr, item.uid) - }} title={item.enableMicr ? '静音' : '解除静音'} /> -
: null} - {role.ID.includes(item.roleId) || item.isRoomManager ?
- { - postOpenCamera(!item.enableCamera, item.uid) - }} title={item.enableCamera ? '关闭视频' : '开启视频'} /> -
: null} {item.uid !== user.uid && !role.ID.includes(item.roleId) ?
{ if (item.isRoomManager) { DeleteRoomManager({ @@ -2255,8 +2249,19 @@ const Meeting: React.FC = () => { } }}> {!item.isRoomManager ? - : - } + : + + } +
: null} + {role.ID.includes(item.roleId) || item.isRoomManager ?
+ { + postOpenMicr(!item.enableMicr, item.uid) + }} title={item.enableMicr ? '静音' : '解除静音'} /> +
: null} + {role.ID.includes(item.roleId) || item.isRoomManager ?
+ { + postOpenCamera(!item.enableCamera, item.uid) + }} title={item.enableCamera ? '关闭视频' : '开启视频'} />
: null} {item.uid !== user.uid && role.ID.includes(user.roleId) ?