From f0d65cab8b2f8148663280c084351f5883a0be15 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Wed, 21 Aug 2024 16:25:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Meeting/index.module.scss | 22 +++++++++-------
 src/page/Meeting/index.tsx         | 41 ++++++------------------------
 2 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss
index 4b51754..03ea97e 100644
--- a/src/page/Meeting/index.module.scss
+++ b/src/page/Meeting/index.module.scss
@@ -285,6 +285,19 @@
           }
         }
 
+        .meetingContentBodyLeftBlock {
+          position: absolute;
+          background-color: #1F2022;
+          z-index: 2;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 100%;
+          height: 100%;
+          top: 0;
+          left: 0
+        }
+
         @include meetingContent();
 
         .meetingContentOperation {
@@ -572,15 +585,6 @@
           }
         }
       }
-
-      .meetingContentBodyLeftBlock {
-        position: absolute;
-        background-color: #1F2022;
-        z-index: 2;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
     }
 
     .meetingContentFooter {
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 39e5696..a9dfe4c 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -140,7 +140,6 @@ const Meeting: React.FC = () => {
   const msgTips = '您不是管理员或发言人，无法开启此功能！'
   useEffect(() => {
     let time = null as any;
-    setSizeAndPosition()
     setUser(userInfo)
     setTimeout(() => {
       window.electron.getIsMaximized().then((res: boolean) => {
@@ -217,7 +216,6 @@ const Meeting: React.FC = () => {
     window.addEventListener('offline', handleNetworkChange);
     time = setInterval(() => {
       setCurrentSeconds(currentSeconds++)
-      setSizeAndPosition()
     }, 1000)
     return () => {
       window.removeEventListener('customStorageChange', handleCustomStorageChange);
@@ -449,29 +447,6 @@ const Meeting: React.FC = () => {
       return res
     })
   }
-  // 获取dom信息
-  const getElementSizeAndPosition = (element: HTMLElement): { width: number; height: number; top: number; left: number } => {
-    const width = element.offsetWidth;
-    const height = element.offsetHeight;
-    const rect = element.getBoundingClientRect();
-    const top = rect.top;
-    const left = rect.left;
-    return { width, height, top, left };
-  }
-  // 设置dom
-  const setSizeAndPosition = (): void => {
-    const meetingContentBodyLeftDom = document.getElementById('meetingContentBodyLeft') as HTMLElement;
-    const meetingContentBodyLeftBlock = document.getElementById('meetingContentBodyLeftBlock') as HTMLElement;
-    if (meetingContentBodyLeftDom) {
-      const info = getElementSizeAndPosition(meetingContentBodyLeftDom);
-      if (meetingContentBodyLeftBlock) {
-        meetingContentBodyLeftBlock.style.width = `${info.width}px`
-        meetingContentBodyLeftBlock.style.height = `${info.height}px`
-        meetingContentBodyLeftBlock.style.top = `${info.top}px`
-        meetingContentBodyLeftBlock.style.left = `0`
-      }
-    }
-  }
   // 刷新
   const refreshVideoView = async (userItem: any): Promise<void> => {
     if (userItem.uid === userInfo.uid) {
@@ -1136,7 +1111,7 @@ const Meeting: React.FC = () => {
         </div>
         <div className={styles.meetingContent}>
           <div className={styles.meetingContentBody}>
-            <div className={`${styles.meetingContentBodyLeft} drag`} id='meetingContentBodyLeft'>
+            <div className={`${styles.meetingContentBodyLeft} drag`}>
               <div className={getMeetingContentBodyLeftModeClass()} id='videoView'>
                 {roomUserList.map((item: any, index: number) => {
                   return (index <= 19 && item.isRoom && item.isAdmin ? <div
@@ -1282,11 +1257,11 @@ const Meeting: React.FC = () => {
                     {meetingContentUser(currentLookUserAccount, true)}
                     {currentLookUserAccount.enableCamera ? null : meetingContentError(currentLookUserAccount)}
                   </div> : null}
+                {isAdmin ? null : <div className={styles.meetingContentBodyLeftBlock}>
+                  <img src={ImageUrl.icon46} alt="" />
+                </div>}
               </div>
             </div>
-            {isAdmin ? null : <div className={styles.meetingContentBodyLeftBlock} id='meetingContentBodyLeftBlock'>
-              <img src={ImageUrl.icon46} alt="" />
-            </div>}
             {
               (statusList.userList || statusList.userChatList) ? (
                 <div className={styles.meetingContentBodyRight}>
@@ -1510,16 +1485,16 @@ const Meeting: React.FC = () => {
                               <div>
                                 <div><Avatar name={item.userName} /></div>
                                 {item.uid !== user.uid ?
-                                  <span>{item.userName} <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')}</span></span> :
-                                  <span> <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')} </span>{item.userName}</span>
+                                  <span>{item.userName} <span style={{ fontSize: '12px', color: '#ccc', marginLeft: '4px' }}>{dayjs(item.timestamp).format('HH:mm:ss')}</span></span> :
+                                  <span> <span style={{ fontSize: '12px', color: '#ccc', marginRight: '4px' }}>{dayjs(item.timestamp).format('HH:mm:ss')} </span>{item.userName}</span>
                                 }
 
                               </div>
                             </Popover> : <div>
                               <div><Avatar name={item.userName} /></div>
                               {item.uid !== user.uid ?
-                                <span>{item.userName} <span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')}</span></span> :
-                                <span><span style={{ fontSize: '12px', color: '#ccc' }}>{dayjs(item.timestamp).format('HH:mm:ss')} </span>{item.userName}</span>
+                                <span>{item.userName}<span style={{ fontSize: '12px', color: '#ccc', marginLeft: '4px' }}>{dayjs(item.timestamp).format('HH:mm:ss')}</span></span> :
+                                <span><span style={{ fontSize: '12px', color: '#ccc', marginRight: '4px' }}>{dayjs(item.timestamp).format('HH:mm:ss')} </span>{item.userName}</span>
                               }
                             </div>}
                             <div>{item.message}</div>