From f70074aa6ddf7bbad08e6048b1bc727dfc588dc2 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Tue, 11 Feb 2025 10:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E4=BA=AB=E5=B0=8F=E7=AA=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96&=E4=BC=9A=E8=AE=AE=E7=AE=AD?=
 =?UTF-8?q?=E5=A4=B4=E5=A4=A7=E4=BA=8E6=E4=BA=BA=E6=98=BE=E7=A4=BA&?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E5=81=B6=E7=8E=B0=E6=97=A0=E6=8F=90=E7=A4=BA?=
 =?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/Meeting/ShareScreenWindow/index.tsx |  8 ++++----
 src/page/Meeting/index.tsx                   | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/page/Meeting/ShareScreenWindow/index.tsx b/src/page/Meeting/ShareScreenWindow/index.tsx
index 25984a4..ac6780f 100644
--- a/src/page/Meeting/ShareScreenWindow/index.tsx
+++ b/src/page/Meeting/ShareScreenWindow/index.tsx
@@ -153,11 +153,11 @@ const ShareScreenWindow: React.FC = () => {
     <>
       <div className={styles.shareScreenWindow} style={{ width: isExpand ? '100%' : '100%' }}>
         <div className={styles.shareScreenWindowTitle}>
-          <span>{changeCurrentSeconds(timeStr)} 共享中
+          <span>{changeCurrentSeconds(timeStr)}
             {networkIcon(currentEffective)}
             <span style={{ color: 'white', marginLeft: '30px' }}>
-              <span style={{ marginRight: '10px' }}>网络质量：{networkQuality.level}</span>
-              <span>延迟：{networkOther.lastmileDelay}ms</span>
+              {/* <span >网络质量：{networkQuality.level}</span> */}
+              <span style={{ marginRight: '6px' }}>延迟:{networkOther.lastmileDelay}ms</span>
             </span>
           </span>
           {isExpand ? <span className='drag' style={{ flexShrink: 0 }} onClick={() => {
@@ -223,7 +223,7 @@ const ShareScreenWindow: React.FC = () => {
         <div className={`${styles.shareScreenWindowExpand} drag`} onClick={() => {
           setIsExpand(!isExpand)
           window.electron.setChildWindow({
-            width: isExpand ? 440 : 440 / 2,
+            width: isExpand ? 440 : 440 / 1.6,
             key: 'shareScreenWindow',
           })
         }}>
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index d6d287e..05eb526 100644
--- a/src/page/Meeting/index.tsx
+++ b/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, 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 } from '@/api/Meeting';
 import ImageUrl from '@/utils/package/imageUrl'
 import { agora } from '@/utils/package/agora'
 import dayjs from 'dayjs';
@@ -1688,8 +1688,15 @@ const Meeting: React.FC = () => {
       case '共享屏幕':
         await getUserRoomInfo().then(async (res) => {
           if (res) {
-            getDesktopCapturerVideo()
-            setIsSharedScreenModal(true)
+            GetSharedScreen(state.channelId).then(req => {
+              if (req.code === 200) {
+                if (res.data) {
+                  setIsShare(res.data)
+                }
+                getDesktopCapturerVideo()
+                setIsSharedScreenModal(true)
+              }
+            })
           } else {
             message.error(msgTips)
           }
@@ -2591,7 +2598,7 @@ const Meeting: React.FC = () => {
               {isAdmin && currentLookUserAccount ? getSettingIcon() : null}
               <div className={getMeetingContentBodyLeftModeClass()} id='videoView' style={meetingMode === 'SpeakerMode' && isVideoFullScreen ? { width: '0' } : {}}>
                 {roomUserList.map((item: any, index: number) => {
-                  return (index <= 19 && item.isRoom && item.isAdmin ? <div
+                  return (item.isRoom && item.isAdmin ? <div
                     id={item.uid}
                     className={`${styles.meetingContentSwiperCard} intersectionObserver-view`}
                     key={index}
@@ -2714,7 +2721,7 @@ const Meeting: React.FC = () => {
                   </div> : null)
                 }
                 )}
-                {roomUserList.length > 6 ? <div>
+                {isAdmin > 6 ? <div>
                   {meetingMode === "StandardMode" ? <div className={`${styles.meetingContentSwiperCaret}`} style={{ left: '20px', top: '66px' }} onClick={() => {
                     const container = document.getElementById('videoView') as HTMLElement;
                     container.scrollLeft -= 100