From c6c900309ac884dc1510cd5751393b8ddf9d47f3 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 27 Sep 2024 14:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E7=8A=B6=E6=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                  |  5 +----
 src/page/Meeting/index.tsx   |  1 -
 src/utils/package/signalr.ts | 18 ++++++++----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 92a36d8..3c752f3 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -9,7 +9,7 @@ import Meeting from '@/page/Meeting/index'
 import NotFound from '@/page/NotFound/index'
 import { storage } from '@/utils'
 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 UpdateModal from "@/components/UpdateModal";
 import * as CryptoJS from 'crypto-js';
@@ -185,9 +185,6 @@ const App: React.FC = () => {
                     break;
             }
         })
-        onReconnected(async () => {
-            storage.setItem('reconnect', true)
-        })
     }
     const toSrc = (path: string): void => {
         window.electron.getWindowSize().then((res: any) => {
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index dd9c4a2..1d19ec4 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -759,7 +759,6 @@ const Meeting: React.FC = () => {
       onConnectionStateChanged: async (_connection: RtcConnection, stateNumber: ConnectionStateType, reason: ConnectionChangedReasonType) => {
         const reconnectingCode = [2, 16, 11, 13, 14, 12]
         if (stateNumber === 4 && reconnectingCode.indexOf(reason) >= 0) {
-          storage.setItem('reconnect', false)
           message.error('网络断开，请检查网络')
         }
       },
diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts
index b31353e..0f7dd9d 100644
--- a/src/utils/package/signalr.ts
+++ b/src/utils/package/signalr.ts
@@ -10,10 +10,15 @@ export const startSignalr = async () => {
       accessTokenFactory: () => user.token
     })
     .build();
-  await onStart()
+  onStart()
   storage.setItem('isSignalr', true)
-  connection.onclose(async () => {
-    await onStart()
+  storage.setItem('reconnect', true)
+  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) => {
   if (connection) {
     // 邀请