From cfa5a3b2a396f7f85e0e3b15da1608ba1cbdd0e2 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 27 Sep 2024 11:01:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 8141d4d..dd9c4a2 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -1212,10 +1212,10 @@ const Meeting: React.FC = () => {
       await getLeave()
     }
     await agora.leaveChannel()
-    if (Number(user.perms)) {
-      navigate('/home/index')
-    } else {
+    if (user.isAnonymous) {
       storage.setItem('userLogin', false)
+    } else {
+      navigate('/home/index')
     }
   }
   // 分享屏幕

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 2/3] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E7=8A=B6=E6=80=81?=
 =?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                  |  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) {
     // 邀请

From 7c4787670f36f2beac1ad5ed510a82048de9f2b1 Mon Sep 17 00:00:00 2001
From: youngq <yq5537@outlook.com>
Date: Fri, 27 Sep 2024 14:50:52 +0800
Subject: [PATCH 3/3] 1

---
 src/page/Meeting/index.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 1d19ec4..afc3bc7 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -232,31 +232,31 @@ const Meeting: React.FC = () => {
       case 0:
         setNetworkQuality({
           level: '断开连接',
-          text: '网络连接断开。'
+          text: '网络连接断开'
         })
         break;
       case 1:
         setNetworkQuality({
           level: '非常差',
-          text: '完全无法沟通。'
+          text: '完全无法沟通'
         })
         break;
       case 2:
         setNetworkQuality({
           level: '差',
-          text: '勉强能沟通但不顺畅，网络质量非常差，基本不能沟通。'
+          text: '勉强能沟通但不顺畅'
         })
         break;
       case 3:
         setNetworkQuality({
           level: '良好',
-          text: ' 用户主观感受有瑕疵但不影响沟通。'
+          text: ' 有瑕疵但不影响沟通'
         })
         break;
       case 4:
         setNetworkQuality({
           level: '佳',
-          text: '网络质量极好。'
+          text: '网络质量极好'
         })
         break;
     }
@@ -748,7 +748,7 @@ const Meeting: React.FC = () => {
               setCurrentEffective(0)
               break;
             default:
-              setCurrentEffective(storage.getItem('reconnect') ? 4 : 0)
+              setCurrentEffective(storage.getItem('reconnect') =='true'? 4 : 0)
               break;
           }
         }