yangjie #14

Merged
yangqiang merged 3 commits from yangjie into master 2024-09-27 14:51:03 +08:00
3 changed files with 9 additions and 15 deletions
Showing only changes of commit c6c900309a - Show all commits

View File

@ -9,7 +9,7 @@ import Meeting from '@/page/Meeting/index'
import NotFound from '@/page/NotFound/index' import NotFound from '@/page/NotFound/index'
import { storage } from '@/utils' import { storage } from '@/utils'
import { message, Spin } from "antd"; import { message, Spin } from "antd";
import { onOtherSignalr, onReconnected, onStop, startSignalr } from "@/utils/package/signalr"; import { onOtherSignalr, onStop, startSignalr } from "@/utils/package/signalr";
import JoinMeetingModal from "@/components/JoinMeetingModal"; import JoinMeetingModal from "@/components/JoinMeetingModal";
import UpdateModal from "@/components/UpdateModal"; import UpdateModal from "@/components/UpdateModal";
import * as CryptoJS from 'crypto-js'; import * as CryptoJS from 'crypto-js';
@ -185,9 +185,6 @@ const App: React.FC = () => {
break; break;
} }
}) })
onReconnected(async () => {
storage.setItem('reconnect', true)
})
} }
const toSrc = (path: string): void => { const toSrc = (path: string): void => {
window.electron.getWindowSize().then((res: any) => { window.electron.getWindowSize().then((res: any) => {

View File

@ -759,7 +759,6 @@ const Meeting: React.FC = () => {
onConnectionStateChanged: async (_connection: RtcConnection, stateNumber: ConnectionStateType, reason: ConnectionChangedReasonType) => { onConnectionStateChanged: async (_connection: RtcConnection, stateNumber: ConnectionStateType, reason: ConnectionChangedReasonType) => {
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) {
storage.setItem('reconnect', false)
message.error('网络断开,请检查网络') message.error('网络断开,请检查网络')
} }
}, },

View File

@ -10,10 +10,15 @@ export const startSignalr = async () => {
accessTokenFactory: () => user.token accessTokenFactory: () => user.token
}) })
.build(); .build();
await onStart() onStart()
storage.setItem('isSignalr', true) storage.setItem('isSignalr', true)
connection.onclose(async () => { storage.setItem('reconnect', true)
await onStart() connection.onreconnected(async () => {
storage.setItem('reconnect', true)
});
connection.onreconnecting(async () => {
onStart()
storage.setItem('reconnect', false)
}); });
} }
@ -29,13 +34,6 @@ export const onStart = async (callBack?: Function) => {
} }
} }
} }
export const onReconnected = async (callBack: Function) => {
if (connection) {
connection.onreconnected(async (_newConnectionId: any) => {
callBack()
});
}
}
export const onOtherSignalr = (callBack: Function) => { export const onOtherSignalr = (callBack: Function) => {
if (connection) { if (connection) {
// 邀请 // 邀请