From 12bc3bf64108d4dd88b6580b21ad11bc24798812 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 22 Aug 2024 14:24:52 +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                  |  5 -----
 src/api/Meeting/index.ts     |  5 +++++
 src/page/Home/index.tsx      |  9 ---------
 src/page/Meeting/index.tsx   | 28 +++++++++++++++++-----------
 src/utils/package/signalr.ts |  8 ++++++++
 src/utils/request/request.ts |  7 +------
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index a4f6d36..d1e980a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -204,11 +204,6 @@ const App: React.FC = () => {
     const toSrc = (path: string): void => {
         switch (path) {
             case '/login':
-                window.electron.setMainWindowSize({
-                    width: 752,
-                    height: 520,
-                    key: 'login'
-                })
                 storage.removeItem('user')
                 navigate('/login')
                 break;
diff --git a/src/api/Meeting/index.ts b/src/api/Meeting/index.ts
index 4412fac..db5ed89 100644
--- a/src/api/Meeting/index.ts
+++ b/src/api/Meeting/index.ts
@@ -124,4 +124,9 @@ export const GetLeaveAll = (data: any) =>
   request({
     url: `/room/leave-all?roomNum=${data.roomNum}`,
     method: 'get'
+  })
+export const GetApplySpeak = (roomNum: string) =>
+  request({
+    url: `/room/apply-speak?roomNum=${roomNum}`,
+    method: 'get'
   })
\ No newline at end of file
diff --git a/src/page/Home/index.tsx b/src/page/Home/index.tsx
index b53188b..c8f4ec7 100644
--- a/src/page/Home/index.tsx
+++ b/src/page/Home/index.tsx
@@ -132,15 +132,6 @@ const Home: React.FC = () => {
               title="提示"
               description="确认退出吗？"
               onConfirm={() => {
-                try {
-                  window.electron.setMainWindowSize({
-                    width: 752,
-                    height: 520,
-                    key: 'login'
-                  })
-                } catch {
-
-                }
                 navigate('/login')
                 storage.removeItem('user')
               }}
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index cd8cd09..1283e12 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -8,7 +8,7 @@ import { SearchOutlined, EllipsisOutlined, ExclamationCircleFilled } from '@ant-
 import { useLocation, useNavigate } from 'react-router-dom';
 import { thumbImageBufferToBase64 } from '@/utils/package/base64'
 import { storage } from '@/utils';
-import { GetRoomUser, PostOpenMicr, PostOpenCamera, GetLeaveAll, PostRoomManager, DeleteRoomManager, GetRoomKickout, GetShowUser, PostShowUser, GetJoin, GetLeave, PostMuteAll, GetRoomUserItem } from '@/api/Meeting';
+import { GetRoomUser, PostOpenMicr, PostOpenCamera, GetLeaveAll, PostRoomManager, DeleteRoomManager, GetRoomKickout, GetShowUser, PostShowUser, GetJoin, GetLeave, PostMuteAll, GetRoomUserItem, GetApplySpeak } from '@/api/Meeting';
 import ImageUrl from '@/utils/package/ImageUrl'
 import agora from '@/utils/package/agora'
 import { onInvoke, onSignalr, offSignalr, onStart } from '@/utils/package/signalr';
@@ -153,11 +153,13 @@ const Meeting: React.FC = () => {
     let time = null as any;
     setUser(userInfo)
     setTimeout(() => {
-      window.electron.getIsMaximized().then((res: boolean) => {
-        if (!res) {
-          window.electron.setViewStatus('maximize')
-        }
-      })
+      if (location.hash.indexOf('/login') === -1) {
+        window.electron.getIsMaximized().then((res: boolean) => {
+          if (!res) {
+            window.electron.setViewStatus('maximize')
+          }
+        })
+      }
     }, 1000)
     setMeetingMode('StandardMode');
     agora.init(true)
@@ -372,8 +374,8 @@ const Meeting: React.FC = () => {
             }
           })
           break;
-        // 申请发言哦
-        case '申请发言哦':
+        // 申请发言
+        case 'ApplyToSpeak':
           api.open({
             message: '',
             description: <div>
@@ -807,9 +809,13 @@ const Meeting: React.FC = () => {
         sharedFilesModelRef.current.getData()
         break;
       case '申请发言':
-        footerListTemplate[itemIndex][rowIndex].title = '结束发言'
-        footerListTemplate[itemIndex][rowIndex].active = true
-        setFooterList(footerListTemplate)
+        GetApplySpeak(state.channelId).then(async (res) => {
+          if (res.code === 200) {
+            footerListTemplate[itemIndex][rowIndex].title = '结束发言'
+            footerListTemplate[itemIndex][rowIndex].active = true
+            setFooterList(footerListTemplate)
+          }
+        })
         break;
       case '结束发言':
         footerListTemplate[itemIndex][rowIndex].title = '申请发言'
diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts
index 206ca92..6d71483 100644
--- a/src/utils/package/signalr.ts
+++ b/src/utils/package/signalr.ts
@@ -144,6 +144,14 @@ export const onSignalr = (callBack: Function) => {
         user
       })
     });
+    // 申请发言
+    connection.on("ApplyToSpeak", (uid: string, uname: string) => {
+      callBack({
+        key: 'ApplyToSpeak',
+        uid,
+        uname
+      })
+    });
   }
 }
 export const offSignalr = () => {
diff --git a/src/utils/request/request.ts b/src/utils/request/request.ts
index f762699..9f6ca8e 100644
--- a/src/utils/request/request.ts
+++ b/src/utils/request/request.ts
@@ -60,7 +60,7 @@ class Request {
             message.error(resData.message)
           }
         }
-        if (resData.code === 1403) {
+        if (resData.code === 1403 || resData.code === 1000) {
           toLogin()
         }
         return resData
@@ -112,11 +112,6 @@ class Request {
   }
 }
 function toLogin() {
-  window.electron.setMainWindowSize({
-    width: 752,
-    height: 520,
-    key: 'login'
-  })
   storage.removeItem('user')
   location.href = location.origin + '/#/login'
 }