yangjie #31

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

View File

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

View File

@ -1,6 +1,5 @@
import styles from '@/components/MeetingDisconnected/index.module.scss' import styles from '@/components/MeetingDisconnected/index.module.scss'
import { InfoCircleOutlined } from '@ant-design/icons'; import { InfoCircleOutlined } from '@ant-design/icons';
import { Modal } from 'antd';
import { useState, useImperativeHandle, forwardRef } from "react"; import { useState, useImperativeHandle, forwardRef } from "react";
const MeetingDisconnected = forwardRef((props: any, ref: any) => { const MeetingDisconnected = forwardRef((props: any, ref: any) => {
useImperativeHandle(ref, () => ({ useImperativeHandle(ref, () => ({
@ -11,18 +10,9 @@ const MeetingDisconnected = forwardRef((props: any, ref: any) => {
const [isMeetingDisconnectedModal, setIsMeetingDisconnectedModal] = useState(false); const [isMeetingDisconnectedModal, setIsMeetingDisconnectedModal] = useState(false);
return ( return (
<> <>
<Modal {isMeetingDisconnectedModal ? <div className={styles.meetingDisconnected}>
title="" <InfoCircleOutlined style={{ marginRight: '10px', color: '#faad14' }} />...
open={isMeetingDisconnectedModal} </div> : null}
footer={null}
centered
width={'300px'}
closable={false}
>
<div className={styles.meetingDisconnected}>
<InfoCircleOutlined style={{ marginRight: '10px' }} />...
</div>
</Modal>
</> </>
) )
}) })

View File

@ -1040,9 +1040,9 @@ 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('网络断开,请检查网络')
meetingDisconnectedRef.current.changeModal(true)
setIsScreenCapture(bool => { setIsScreenCapture(bool => {
if (bool) { if (bool) {
meetingDisconnectedRef.current.changeModal(true)
setIsNetworkDisconnected(true) setIsNetworkDisconnected(true)
stopScreenCapture() stopScreenCapture()
} }
@ -1734,6 +1734,7 @@ const Meeting: React.FC = () => {
enableCamera: !footerList[0][1].active enableCamera: !footerList[0][1].active
}) })
message.success('网络已连接。') message.success('网络已连接。')
meetingDisconnectedRef.current.changeModal(false)
setRoomUserList((res: any) => { setRoomUserList((res: any) => {
let userItem = res.find((item: any) => item.uid === userInfo.uid) let userItem = res.find((item: any) => item.uid === userInfo.uid)
if (userItem.isRoomManager) { if (userItem.isRoomManager) {
@ -1745,7 +1746,6 @@ const Meeting: React.FC = () => {
} }
setIsNetworkDisconnected(bool => { setIsNetworkDisconnected(bool => {
if (bool) { if (bool) {
meetingDisconnectedRef.current.changeModal(false)
allUserLook(userItem.uid, userItem.userName) allUserLook(userItem.uid, userItem.userName)
} }
return false return false