From d7eaf1584dea43dfc2be77eca6e4a1ce1f021b37 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 19 Jul 2024 16:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                  |  7 ++-----
 src/utils/package/signalr.ts | 15 ++++++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index ec94919..42f40dc 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -10,7 +10,7 @@ import Meeting from '@/page/Meeting/index'
 import NotFound from '@/page/NotFound/index'
 import { storage } from '@/utils'
 import { Spin } from "antd";
-import { onSignalr, offSignalr } from "@/utils/package/signalr";
+import { onInvitation } from "@/utils/package/signalr";
 import JoinMeetingModal from "./components/JoinMeetingModal";
 
 const App: React.FC = () => {
@@ -61,7 +61,7 @@ const App: React.FC = () => {
     };
   }, []);
   useEffect(() => {
-    onSignalr((item: any) => {
+    onInvitation((item: any) => {
       switch (item.key) {
         case 'Invitation':
           window.electron.joinNotification({
@@ -72,9 +72,6 @@ const App: React.FC = () => {
           break;
       }
     })
-    return () => {
-      offSignalr()
-    }
   }, [])
   const handleResize = (): void => {
     setWindowSize({
diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts
index 1f23682..ec3da6e 100644
--- a/src/utils/package/signalr.ts
+++ b/src/utils/package/signalr.ts
@@ -16,6 +16,14 @@ export const startSignalr = () => {
     .catch((err: any) => console.error('Error while establishing connection: ', err));
 }
 
+export const onInvitation = (callBack: Function) => {
+  connection.on("Invitation", (roomNum: string, roomName: string, InviterName: string) => {
+    callBack({
+      key: 'Invitation',
+      roomNum, roomName, InviterName
+    })
+  });
+}
 export const onSignalr = (callBack: Function) => {
   if (connection) {
     connection.on("ReceiveMessage", (uid: string, userName: string, message: string) => {
@@ -46,12 +54,6 @@ export const onSignalr = (callBack: Function) => {
         type
       })
     });
-    connection.on("Invitation", (roomNum: string, roomName: string, InviterName: string) => {
-      callBack({
-        key: 'Invitation',
-        roomNum, roomName, InviterName
-      })
-    });
   }
 }
 export const offSignalr = () => {
@@ -60,7 +62,6 @@ export const offSignalr = () => {
     connection.off('RefreshUserList');
     connection.off('Operation');
     connection.off('ForceExitRoom');
-    connection.off('Invitation');
   }
 }
 export const onInvoke = async (str: string, data: any) => {