From d70f09f82d1fd9116ff3085de9869111bdc80bed Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 18 Oct 2024 13:51:34 +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

---
 main.js                                 |  3 +++
 src/page/Meeting/NoticeWindow/index.tsx |  7 +++--
 src/page/Meeting/index.tsx              | 36 +++++++++++--------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/main.js b/main.js
index 0d64de2..19a3bd4 100644
--- a/main.js
+++ b/main.js
@@ -338,6 +338,9 @@ app.on('ready', () => {
                 case 'chatSmallWindow':
                     childWindow[config.key].setBounds({ height: config.height })
                     break;
+                case 'noticeWindow':
+                    childWindow[config.key].setBounds({ width: config.width, height: config.height })
+                    break;
             }
         });
         // 隐藏主窗口
diff --git a/src/page/Meeting/NoticeWindow/index.tsx b/src/page/Meeting/NoticeWindow/index.tsx
index 4748d54..fb0fa36 100644
--- a/src/page/Meeting/NoticeWindow/index.tsx
+++ b/src/page/Meeting/NoticeWindow/index.tsx
@@ -79,8 +79,11 @@ const NoticeWindow: React.FC = () => {
       time = setInterval(() => {
         const dom = document.getElementsByClassName('ant-notification')
         if (dom.length === 0) {
-          window.electron.closeChildWindow('noticeWindow')
-          setKeyOpenChildWindow('noticeWindow', false)
+          window.electron.setChildWindow({
+            height: 0,
+            window: 0,
+            key: 'noticeWindow',
+          })
         }
       }, 1000)
     }, 4000);
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 2183654..ad030a8 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -627,29 +627,17 @@ const Meeting: React.FC = () => {
           break;
         // 申请发言
         case 'ApplyToSpeak':
-          const noticeWindow = await getKeyOpenChildWindow('noticeWindow')
           setIsScreenCapture(bool => {
             if (bool) {
-              if (noticeWindow) {
-                channel.postMessage({
-                  type: 'noticeItem',
-                  noticeItem: item
-                });
-              } else {
-                window.electron.createChildWindow({
-                  url: location.origin + `/#/noticeWindow`,
-                  width: 388,
-                  height: 150,
-                  key: 'noticeWindow',
-                })
-                setTimeout(() => {
-                  channel.postMessage({
-                    type: 'noticeItem',
-                    noticeItem: item
-                  });
-                }, 2000);
-                setKeyOpenChildWindow('noticeWindow', true)
-              }
+              window.electron.setChildWindow({
+                width: 388,
+                height: 150,
+                key: 'noticeWindow',
+              })
+              channel.postMessage({
+                type: 'noticeItem',
+                noticeItem: item
+              });
             } else {
               api.open({
                 message: '',
@@ -1545,6 +1533,12 @@ const Meeting: React.FC = () => {
           height: 30,
           key: 'currentSpeakUserWindow',
         })
+        window.electron.createChildWindow({
+          url: location.origin + `/#/noticeWindow`,
+          width: 388,
+          height: 150,
+          key: 'noticeWindow',
+        })
         setKeyOpenChildWindow('shareScreenWindow', true)
       }
     } else {