yangjie #31

Merged
yangqiang merged 3 commits from yangjie into master 2024-10-30 14:29:28 +08:00
4 changed files with 55 additions and 1 deletions
Showing only changes of commit 0a411fd5c5 - Show all commits

View File

@ -0,0 +1,4 @@
.meetingDisconnected {
color: white;
font-size: 24px;
}

View File

@ -0,0 +1,30 @@
import styles from '@/components/MeetingDisconnected/index.module.scss'
import { InfoCircleOutlined } from '@ant-design/icons';
import { Modal } from 'antd';
import { useState, useImperativeHandle, forwardRef } from "react";
const MeetingDisconnected = forwardRef((props: any, ref: any) => {
useImperativeHandle(ref, () => ({
changeModal: (bool: boolean) => {
setIsMeetingDisconnectedModal(bool)
}
}))
const [isMeetingDisconnectedModal, setIsMeetingDisconnectedModal] = useState(false);
return (
<>
<Modal
title=""
open={isMeetingDisconnectedModal}
footer={null}
centered
width={'300px'}
closable={false}
>
<div className={styles.meetingDisconnected}>
<InfoCircleOutlined style={{ marginRight: '10px' }} />...
</div>
</Modal>
</>
)
})
export default MeetingDisconnected

View File

@ -22,6 +22,7 @@ import UserVideo from '@/components/UserVideo';
import { role } from '@/config/role'; import { role } from '@/config/role';
import { fixWebmDuration } from "webm-duration-fix-buffer"; import { fixWebmDuration } from "webm-duration-fix-buffer";
import { getKeyOpenChildWindow, setKeyOpenChildWindow } from '@/utils/package/public'; import { getKeyOpenChildWindow, setKeyOpenChildWindow } from '@/utils/package/public';
import MeetingDisconnected from '@/components/MeetingDisconnected';
const { confirm } = Modal; const { confirm } = Modal;
const { exec } = require('child_process'); const { exec } = require('child_process');
const fs = require('fs').promises; const fs = require('fs').promises;
@ -34,6 +35,7 @@ const Meeting: React.FC = () => {
const invitingPersonnelRef = useRef<any>(); const invitingPersonnelRef = useRef<any>();
const stupWizardRef = useRef<any>(); const stupWizardRef = useRef<any>();
const equipmentManagementRef = useRef<any>(); const equipmentManagementRef = useRef<any>();
const meetingDisconnectedRef = useRef<any>();
const [isClicked, setIsClicked] = useState(false); const [isClicked, setIsClicked] = useState(false);
const [statusList, setStatusList] = useState({ const [statusList, setStatusList] = useState({
userList: false, userList: false,
@ -166,7 +168,8 @@ const Meeting: React.FC = () => {
const [_currentRequestSpeakType, setCurrentRequestSpeakType] = useState<'video' | 'audio' | ''>('') const [_currentRequestSpeakType, setCurrentRequestSpeakType] = useState<'video' | 'audio' | ''>('')
const [_mediaStream, setMediaStream] = useState<any>('') const [_mediaStream, setMediaStream] = useState<any>('')
const [isShare, setIsShare] = useState<any>(null) const [isShare, setIsShare] = useState<any>(null)
const [isSharePopConfirm, setIsSharePopConfirm] = useState<any>(false) const [isSharePopConfirm, setIsSharePopConfirm] = useState(false)
const [_isNetworkDisconnected, setIsNetworkDisconnected] = useState(false)
const [isShareUser, setIsShareUser] = useState<any>(null) const [isShareUser, setIsShareUser] = useState<any>(null)
const [currentLookUserStatus, setCurrentLookUserStatus] = useState<0 | 1 | 2 | 3 | 4>(1) const [currentLookUserStatus, setCurrentLookUserStatus] = useState<0 | 1 | 2 | 3 | 4>(1)
const [clickCurrentLookUserStatus, setClickCurrentLookUserStatus] = useState<boolean>(true) const [clickCurrentLookUserStatus, setClickCurrentLookUserStatus] = useState<boolean>(true)
@ -1037,6 +1040,14 @@ const Meeting: React.FC = () => {
const reconnectingCode = [2, 16, 11, 13, 14, 12] const reconnectingCode = [2, 16, 11, 13, 14, 12]
if (stateNumber === 4 && reconnectingCode.indexOf(reason) >= 0) { if (stateNumber === 4 && reconnectingCode.indexOf(reason) >= 0) {
message.error('网络断开,请检查网络') message.error('网络断开,请检查网络')
setIsScreenCapture(bool => {
if (bool) {
meetingDisconnectedRef.current.changeModal(true)
setIsNetworkDisconnected(true)
stopScreenCapture()
}
return bool
})
} }
}, },
onLocalVideoStateChanged: async (_source: VideoSourceType, _state: LocalVideoStreamState, reason: LocalVideoStreamReason) => { onLocalVideoStateChanged: async (_source: VideoSourceType, _state: LocalVideoStreamState, reason: LocalVideoStreamReason) => {
@ -1732,6 +1743,13 @@ const Meeting: React.FC = () => {
userId: userInfo.uid userId: userInfo.uid
}) })
} }
setIsNetworkDisconnected(bool => {
if (bool) {
meetingDisconnectedRef.current.changeModal(false)
allUserLook(userItem.screenShareId, userItem.userName)
}
return false
})
setIsScreenCapture(bool => { setIsScreenCapture(bool => {
if (bool) { if (bool) {
allUserLook(userItem.screenShareId, userItem.userName) allUserLook(userItem.screenShareId, userItem.userName)
@ -2858,6 +2876,7 @@ const Meeting: React.FC = () => {
<InvitingPersonnelModal ref={invitingPersonnelRef} /> <InvitingPersonnelModal ref={invitingPersonnelRef} />
<StupWizard ref={stupWizardRef} /> <StupWizard ref={stupWizardRef} />
<EquipmentManagement ref={equipmentManagementRef} /> <EquipmentManagement ref={equipmentManagementRef} />
<MeetingDisconnected ref={meetingDisconnectedRef} />
</> </>
) )
} }

View File

@ -351,6 +351,7 @@ $pagination-hover-background-color: #5575F2;
// ant-notification // ant-notification
.ant-notification { .ant-notification {
-webkit-app-region: no-drag; -webkit-app-region: no-drag;
.ant-notification-notice-wrapper { .ant-notification-notice-wrapper {
background-color: #1F2022; background-color: #1F2022;