From 7a75abc22c87e872b28774935cda05bec7cd8d74 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 19 Jul 2024 16:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                                     |  2 +-
 src/components/InvitingPersonnelModal/index.tsx | 15 +++++++++++++--
 src/components/JoinMeetingModal/index.tsx       |  4 ++++
 src/page/Meeting/index.tsx                      |  2 +-
 src/utils/package/signalr.ts                    | 14 ++++++++------
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 42f40dc..6fd1780 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -72,7 +72,7 @@ const App: React.FC = () => {
           break;
       }
     })
-  }, [])
+  }, [navigate])
   const handleResize = (): void => {
     setWindowSize({
       width: window.innerWidth,
diff --git a/src/components/InvitingPersonnelModal/index.tsx b/src/components/InvitingPersonnelModal/index.tsx
index 2637c54..3f82746 100644
--- a/src/components/InvitingPersonnelModal/index.tsx
+++ b/src/components/InvitingPersonnelModal/index.tsx
@@ -6,6 +6,7 @@ import { SearchOutlined } from '@ant-design/icons';
 import { GetUserList } from '@/api/Home/User';
 import { useLocation } from 'react-router-dom';
 import { PostRoomInvite } from '@/api/Meeting';
+import { storage } from '@/utils';
 const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {
   useImperativeHandle(ref, () => ({
     changeInvitingPersonnelModal: () => {
@@ -164,8 +165,18 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {
             <Button type="primary" onClick={() => { setIsInvitingPersonnelModal(false) }} style={{ backgroundColor: '#31353A', marginRight: '14px' }}>取消</Button>
             <Button type="primary" className='m-ant-btn' onClick={() => {
               if (checkedList.length) {
-                PostRoomInvite(state.roomId, checkedList.map((item: any) => item.id))
-                setIsInvitingPersonnelModal(false)
+                let userInfo = JSON.parse(storage.getItem('user') as string)
+                let me = checkedList.find((item: any) => item.id === userInfo.uid)
+                if (me) {
+                  message.error('您不能邀请自己')
+                } else {
+                  PostRoomInvite(state.roomId, checkedList.map((item: any) => item.id)).then(res => {
+                    if (res.code === 200) {
+                      message.success('邀请成功')
+                      setIsInvitingPersonnelModal(false)
+                    }
+                  })
+                }
               } else {
                 message.error('请选择人员')
               }
diff --git a/src/components/JoinMeetingModal/index.tsx b/src/components/JoinMeetingModal/index.tsx
index 241b373..18ac020 100644
--- a/src/components/JoinMeetingModal/index.tsx
+++ b/src/components/JoinMeetingModal/index.tsx
@@ -52,6 +52,10 @@ const JoinMeetingModal = forwardRef((props: any, ref: any) => {
               <span>拒绝</span>
             </div>
             <div onClick={() => {
+              if (location.hash.indexOf('/meeting') !== -1) {
+                setIsJoinMeetingModal(false)
+                return message.error('您已经在房间中了，请退出房间重试。')
+              }
               isGetCheckoutRoomNum(info.roomNum, (bool: boolean) => {
                 if (bool) {
                   getRoomRtcToken(info.roomNum, (token: string) => {
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 9e5afb9..395e51a 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -638,7 +638,7 @@ const Meeting: React.FC = () => {
                         }
                         )}
                       </div>
-                      <div className={`${styles.meetingUserListFooter} drag`}>
+                      <div className={`${styles.meetingUserListFooter} drag`} onClick={() => invitingPersonnelRef.current.changeInvitingPersonnelModal()}>
                         <div>邀请</div>
                         <div onClick={() => postOpenMicr(false, true)}>全员静音</div>
                       </div>
diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts
index ec3da6e..714a71d 100644
--- a/src/utils/package/signalr.ts
+++ b/src/utils/package/signalr.ts
@@ -17,12 +17,14 @@ export const startSignalr = () => {
 }
 
 export const onInvitation = (callBack: Function) => {
-  connection.on("Invitation", (roomNum: string, roomName: string, InviterName: string) => {
-    callBack({
-      key: 'Invitation',
-      roomNum, roomName, InviterName
-    })
-  });
+  if (connection) {
+    connection.on("Invitation", (roomNum: string, roomName: string, InviterName: string) => {
+      callBack({
+        key: 'Invitation',
+        roomNum, roomName, InviterName
+      })
+    });
+  }
 }
 export const onSignalr = (callBack: Function) => {
   if (connection) {