优化

main.js

@@ -202,6 +202,7 @@ app.on('ready', () => {
                 connection.off('ExitSharedScreen');
                 connection.off('SetSpeaker');
                 connection.off('ReceivedOperation');
+                connection.off('StopedSharedScreen');
             }
         });
         ipcMain.handle('onStop', (event) => {
@@ -221,7 +222,7 @@ app.on('ready', () => {
                     await connection.invoke(str, data.roomNum, data.msg)
                     break;
                 case 'sendOper':
-                    await connection.invoke(str, data.roomNum, data.type)
+                    await connection.invoke(str, data.roomNum, data.contentString)
                     break;
                 case 'getDrivers':
                     // 获取某个人的设备列表
@@ -281,10 +282,10 @@ app.on('ready', () => {
                     })
                 });
                 // 扩展操作
-                connection.on("Operation", (type) => {
+                connection.on("Operation", (contentString) => {
                     mainWindow.webContents.send('onSignalr', {
                         key: 'Operation',
-                        type
+                        contentString
                     })
                 });
                 // 移出会议
@@ -433,6 +434,13 @@ app.on('ready', () => {
                         contentString
                     })
                 });
+                // 共享人取消共享屏幕
+                connection.on("StopedSharedScreen", (ScreenShareId) => {
+                    mainWindow.webContents.send('onSignalr', {
+                        key: 'StopedSharedScreen',
+                        ScreenShareId
+                    })
+                });
             }
         });
         // 放大缩小退出窗口

src/api/Meeting/index.ts

@@ -171,7 +171,11 @@ export const PostSharedScreen = (roomNum: string) =>
     url: `/room/shared-screen?roomNum=${roomNum}`,
     method: 'post'
   })
-
+export const PostStopSharedScreen = (roomNum: string) =>
+  request({
+    url: `/room/stop-shared-screen?roomNum=${roomNum}`,
+    method: 'post'
+  })
 export const PostHomeVerLog = (data: any) =>
   request({
     url: `/home/ver-log`,

src/page/Meeting/index.tsx

@@ -8,7 +8,7 @@ import { SearchOutlined, EllipsisOutlined, ExclamationCircleFilled, FullscreenEx
 import { useLocation, useNavigate } from 'react-router-dom';
 import { thumbImageBufferToBase64 } from '@/utils/package/base64'
 import { storage } from '@/utils';
-import { GetRoomUser, PostOpenMicr, GetSharedScreen, PostOpenCamera, GetLeaveAll, PostRoomManager, DeleteRoomManager, GetRoomKickout, GetShowUser, PostShowUser, PostMuteAll, GetRoomUserItem, GetApplySpeak, PostSharedScreen } from '@/api/Meeting';
+import { GetRoomUser, PostOpenMicr, GetSharedScreen, PostOpenCamera, GetLeaveAll, PostRoomManager, DeleteRoomManager, GetRoomKickout, GetShowUser, PostShowUser, PostMuteAll, GetRoomUserItem, GetApplySpeak, PostSharedScreen, PostStopSharedScreen } from '@/api/Meeting';
 import ImageUrl from '@/utils/package/imageUrl'
 import { agora } from '@/utils/package/agora'
 import dayjs from 'dayjs';
@@ -723,7 +723,7 @@ const Meeting: React.FC = () => {
           break;
         // 扩展操作
         case 'Operation':
-          switch (item.type) {
+          switch (item.contentString) {
 
           }
           break;
@@ -1001,6 +1001,21 @@ const Meeting: React.FC = () => {
 
           }
           break;
+        // 共享人取消共享屏幕
+        case 'StopedSharedScreen':
+          setRoomUserList((newChatList: any) => {
+            setActiveSpeaker(res => {
+              let item = newChatList.find((item: any) => item.uid === res)
+              if (item && item.isRoom && item.isAdmin) {
+                renderVideo(res)
+              } else {
+                getShowUser()
+              }
+              return res
+            })
+            return newChatList
+          })
+          break;
       }
     })
     return () => {
@@ -1164,37 +1179,42 @@ const Meeting: React.FC = () => {
         timer = ''
       }
       timer = setTimeout(() => {
-        setRoomUserList((res: any) => {
+        setIsShare((req: any) => {
-          let userItem = res.find((item: any) => item.uid === userInfo.uid)
+          if (!req) {
-          if (!role.ID.includes(userInfo.roleId) && userItem && userItem.isRoomManager) {
+            setRoomUserList((res: any) => {
-            DeleteRoomManager({
+              let userItem = res.find((item: any) => item.uid === userInfo.uid)
-              roomId: state.roomId,
+              if (!role.ID.includes(userInfo.roleId) && userItem && userItem.isRoomManager) {
-              roomNum: state.channelId,
+                DeleteRoomManager({
-              userId: userInfo.uid
+                  roomId: state.roomId,
-            })
+                  roomNum: state.channelId,
-            confirm({
+                  userId: userInfo.uid
-              title: '提示',
+                })
-              icon: <ExclamationCircleFilled />,
+                confirm({
-              content: `由于您长时间未发言，已自动取消发言权限，是否重新申请发言？`,
+                  title: '提示',
-              centered: true,
+                  icon: <ExclamationCircleFilled />,
-              okText: '确定',
+                  content: `由于您长时间未发言，已自动取消发言权限，是否重新申请发言？`,
-              cancelText: '取消',
+                  centered: true,
-              async onOk() {
+                  okText: '确定',
-                GetApplySpeak(state.channelId).then(res => {
+                  cancelText: '取消',
-                  if (res.code === 200) {
+                  async onOk() {
-                    setIsClicked(true);
+                    GetApplySpeak(state.channelId).then(res => {
-                    message.success('申请发言成功')
+                      if (res.code === 200) {
+                        setIsClicked(true);
+                        message.success('申请发言成功')
+                      }
+                    })
+                  },
+                  onCancel() {
+
                   }
                 })
-              },
-              onCancel() {
-
               }
+              clearTimeout(timer)
+              timer = ''
+              return res
             })
           }
-          clearTimeout(timer)
+          return req
-          timer = ''
-          return res
         })
       }, 1000 * 60 * 5);
     } else {
@@ -2084,18 +2104,7 @@ const Meeting: React.FC = () => {
   // 设置全员看谁
   const allUserLook = async (uid: string, name: string, bool?: boolean): Promise<void> => {
     if (bool) {
-      setRoomUserList((newChatList: any) => {
+      await PostStopSharedScreen(state.channelId)
-        setActiveSpeaker(res => {
-          let item = newChatList.find((item: any) => item.uid === res)
-          if (item && item.isRoom && item.isAdmin) {
-            PostShowUser(state.channelId, item.uid, name)
-          } else {
-            PostShowUser(state.channelId, uid, name)
-          }
-          return res
-        })
-        return newChatList
-      })
     } else {
       await PostShowUser(state.channelId, uid, name)
     }

src/utils/package/agora.ts

@@ -446,8 +446,8 @@ export const agora = {
   startCameraCapture: async (bool: boolean = false) => {
     await rtcEngine.startCameraCapture(VideoSourceType.VideoSourceCamera, {
       format: {
-        width: bool ? 160 : 1280,
+        width: bool ? 160 : 1920,
-        height: bool ? 160 : 720,
+        height: bool ? 160 : 1080,
         fps: 15,
       }
     })