From 9aaf69b7d779d9372411f3e70554b271bdd8ba2b Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Mon, 21 Oct 2024 17:54:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=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 | 17 ++++++-----------
 src/page/Meeting/index.tsx                   |  6 ++----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/page/Meeting/ShareScreenWindow/index.tsx b/src/page/Meeting/ShareScreenWindow/index.tsx
index 91112d0..82f6d24 100644
--- a/src/page/Meeting/ShareScreenWindow/index.tsx
+++ b/src/page/Meeting/ShareScreenWindow/index.tsx
@@ -93,15 +93,8 @@ const ShareScreenWindow: React.FC = () => {
       }
     })
     return () => {
-      setTimeStr(res => {
-        channel.postMessage({
-          type: 'shareScreenWindowTime',
-          shareScreenWindowTime: res
-        });
-        clearInterval(timeout)
-        channel.close();
-        return res
-      })
+      clearInterval(timeout)
+      channel.close();
     };
   }, []);
   const changeCurrentSeconds = (time: number): string => {
@@ -144,7 +137,8 @@ const ShareScreenWindow: React.FC = () => {
           <span>{changeCurrentSeconds(timeStr)} 共享中</span>
           {isExpand ? <span className='drag' onClick={() => {
             channel.postMessage({
-              type: 'shareScreenWindowClose'
+              type: 'shareScreenWindowClose',
+              shareScreenWindowClose: timeStr
             });
           }}>结束共享</span> : <span style={{ visibility: 'hidden' }}>结束共享</span>}
         </div>
@@ -208,7 +202,8 @@ const ShareScreenWindow: React.FC = () => {
           </div>
           <Button type="primary" style={{ backgroundColor: '#FF5219', marginRight: '14px' }} size={'small'} onClick={() => {
             channel.postMessage({
-              type: 'shareScreenWindowClose'
+              type: 'shareScreenWindowClose',
+              shareScreenWindowClose: timeStr
             });
           }}>
             结束共享
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 0d3bc21..08d9750 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -208,7 +208,7 @@ const Meeting: React.FC = () => {
       const {
         type,
         shareScreenWindowfooterListsTitle,
-        shareScreenWindowTime,
+        shareScreenWindowClose,
         userListWindowPostOpenMicr,
         userListWindowPostOpenCamera,
         userListWindowDeleteRoomManager,
@@ -237,12 +237,10 @@ const Meeting: React.FC = () => {
           }))
           break;
         case 'shareScreenWindowClose':
+          setCurrentSeconds(shareScreenWindowClose)
           await stopScreenCapture()
           await allUserLook(userInfo.uid, userInfo.userName)
           break;
-        case 'shareScreenWindowTime':
-          setCurrentSeconds(shareScreenWindowTime)
-          break;
         case 'shareScreenWindowfooterListsTitle':
           switch (shareScreenWindowfooterListsTitle) {
             case '静音':