Compare commits

..

No commits in common. "1a2dac990354d334924189193f9ceea95198b1bb" and "cfdf042eaf79b1c00f7ccd7b075425c396cf33c5" have entirely different histories.

4 changed files with 2 additions and 54 deletions

View File

@ -1,12 +0,0 @@
.meetingDisconnected {
position: absolute;
left: 50%;
transform: translate(-50%, 80px);
top: 0;
color: white;
font-size: 24px;
z-index: 5;
background-color: #07090B;
padding: 20px 40px;
border-radius: 20px;
}

View File

@ -1,20 +0,0 @@
import styles from '@/components/MeetingDisconnected/index.module.scss'
import { InfoCircleOutlined } from '@ant-design/icons';
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 (
<>
{isMeetingDisconnectedModal ? <div className={styles.meetingDisconnected}>
<InfoCircleOutlined style={{ marginRight: '10px', color: '#faad14' }} />...
</div> : null}
</>
)
})
export default MeetingDisconnected

View File

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

View File

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