From c324aa6fa2d67717e6d38941cb69ceb1fa16c46b Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 23 Jul 2024 16:28:40 +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/page/Home/Index/index.tsx | 79 ++++++++++++++++++-----------------
 src/page/Meeting/index.tsx    | 12 +++---
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx
index c676f52..0eca984 100644
--- a/src/page/Home/Index/index.tsx
+++ b/src/page/Home/Index/index.tsx
@@ -64,10 +64,11 @@ const Index: React.FC = () => {
       }
     })
   }
-  const postRefresh = async (): Promise<void> => {
+  const postRefresh = async (callBack: Function): Promise<void> => {
     await PostRefresh(user.refresh_token).then(res => {
       if (res.code === 200) {
         storage.setItem('user', JSON.stringify(res.data))
+        callBack(res.data)
       }
     })
   }
@@ -126,19 +127,20 @@ const Index: React.FC = () => {
                       {/* <Button type="primary" danger>设置</Button> */}
                       <Button type="primary"
                         iconPosition={'end'}
-                        onClick={async () => {
-                          await postRefresh()
-                          await getRoomRtcToken(item.roomNum, (res: any) => {
-                            if (res) {
-                              navigate(`/meeting`, {
-                                state: {
-                                  channelId: item.roomNum,
-                                  token: res,
-                                  roomId: item.id,
-                                  roomName: item.roomName,
-                                }
-                              })
-                            }
+                        onClick={() => {
+                          postRefresh(() => {
+                            getRoomRtcToken(item.roomNum, (res: any) => {
+                              if (res) {
+                                navigate(`/meeting`, {
+                                  state: {
+                                    channelId: item.roomNum,
+                                    token: res,
+                                    roomId: item.id,
+                                    roomName: item.roomName,
+                                  }
+                                })
+                              }
+                            })
                           })
                         }}
                         icon={<img src={ImageUrl.icon9} alt="" />}
@@ -267,33 +269,34 @@ const Index: React.FC = () => {
             display: 'flex', justifyContent: 'center'
           }}>
             <Button type="primary" style={{ backgroundColor: '#31353A', marginRight: '14px' }} onClick={() => setJoinRoomModal(false)}>取消</Button>
-            <Button type="primary" className='m-ant-btn' onClick={async () => {
+            <Button type="primary" className='m-ant-btn' onClick={() => {
               if (!joinRoomFrom) {
                 return message.error('请输入房间号！')
               }
-              await postRefresh()
-              await isGetCheckoutRoomNum(joinRoomFrom, (bool: boolean) => {
-                if (bool) {
-                  getRoomRtcToken(joinRoomFrom, (token: string) => {
-                    if (token) {
-                      setJoinRoomModal(false)
-                      GetRoomInfo(joinRoomFrom).then(res => {
-                        if (res.code === 200) {
-                          navigate(`/meeting`, {
-                            state: {
-                              channelId: joinRoomFrom,
-                              token,
-                              roomId: res.data.id,
-                              roomName: res.data.roomName,
-                            }
-                          })
-                        }
-                      })
-                    }
-                  })
-                } else {
-                  message.error('房间号不存在！')
-                }
+              postRefresh(() => {
+                isGetCheckoutRoomNum(joinRoomFrom, (bool: boolean) => {
+                  if (bool) {
+                    getRoomRtcToken(joinRoomFrom, (token: string) => {
+                      if (token) {
+                        setJoinRoomModal(false)
+                        GetRoomInfo(joinRoomFrom).then(res => {
+                          if (res.code === 200) {
+                            navigate(`/meeting`, {
+                              state: {
+                                channelId: joinRoomFrom,
+                                token,
+                                roomId: res.data.id,
+                                roomName: res.data.roomName,
+                              }
+                            })
+                          }
+                        })
+                      }
+                    })
+                  } else {
+                    message.error('房间号不存在！')
+                  }
+                })
               })
             }}>加入</Button>
           </div>
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index bfec6b1..ad1c212 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -330,10 +330,12 @@ const Meeting: React.FC = () => {
     }
   }
   // 退出房间
-  const leaveChannel = async (): Promise<void> => {
-    await onInvoke('levelChannel', {
-      roomNum: state.channelId
-    })
+  const leaveChannel = async (bool?: boolean): Promise<void> => {
+    if (!bool) {
+      await onInvoke('levelChannel', {
+        roomNum: state.channelId
+      })
+    }
     agora.leaveChannel()
     navigate('/home/index')
   }
@@ -734,7 +736,7 @@ const Meeting: React.FC = () => {
                                   roomNum: state.channelId,
                                   type: 1,
                                 })
-                                leaveChannel()
+                                leaveChannel(true)
                               }}>全员结束会议</div>
                               <div onClick={() => leaveChannel()}>仅自己离开</div>
                               <div onClick={() => { setOpen(false) }}>取消</div>