优化

main.js

@@ -186,6 +186,9 @@ app.on('ready', () => {
                 case 'hide':
                     mainWindow.hide()
                     break;
+                case 'show':
+                    mainWindow.show()
+                    break;
             }
         });
         // 导出是否全屏

src/components/Operation/index.tsx

@@ -1,7 +1,7 @@
 import styles from '@/components/Operation/index.module.scss'
 import ImageUrl from '@/utils/package/imageUrl';
 import { useEffect, useState } from "react";
-type OperationKeyType = 'minimize' | 'quit' | 'maximize' | 'unmaximize' | 'hide';
+type OperationKeyType = 'minimize' | 'quit' | 'maximize' | 'unmaximize' | 'hide' | 'show';
 type OperationType = {
   icon: string;
   key: OperationKeyType;

src/components/QuitTips/index.tsx

@@ -3,7 +3,7 @@ import { storage } from '@/utils';
 import { InfoCircleOutlined } from '@ant-design/icons';
 import { Button, Checkbox, Modal, Radio } from 'antd';
 import { useState, useImperativeHandle, forwardRef } from "react";
-type OperationKeyType = 'minimize' | 'quit' | 'maximize' | 'unmaximize' | 'hide';
+type OperationKeyType = 'minimize' | 'quit' | 'maximize' | 'unmaximize' | 'hide' | 'show';
 const QuitTips = forwardRef((props: any, ref: any) => {
   useImperativeHandle(ref, () => ({
     changeModal: () => {

src/page/Meeting/index.tsx

@@ -1486,6 +1486,7 @@ const Meeting: React.FC = () => {
       await allUserLook(user.screenShareId, user.userName)
       const isOpen = await getKeyOpenChildWindow('shareScreenWindow')
       setIsScreenCapture(true)
+      window.electron.setViewStatus('hide')
       if (!isOpen) {
         window.electron.createChildWindow({
           url: location.origin + `/#/shareScreenWindow`,
@@ -1553,8 +1554,9 @@ const Meeting: React.FC = () => {
     setFooterList(footerListTemplate)
     window.electron.closeChildWindow('shareScreenWindow')
     setKeyOpenChildWindow('shareScreenWindow', false)
-    if (isScreenCapture) {
+    setIsScreenCapture(bool => {
-      setIsScreenCapture(false)
+      if (bool) {
+        window.electron.setViewStatus('show')
         window.electron.getWindowSize().then((res: any) => {
           window.electron.setMainWindowSize({
             width: Math.ceil(res.width / 1.5),
@@ -1567,6 +1569,8 @@ const Meeting: React.FC = () => {
           })
         })
       }
+      return false
+    })
   }
   // 获取房间用户
   const getRoomUser = async (): Promise<void> => {

src/render.d.ts

@@ -2,7 +2,7 @@
 export interface IElectronAPI {
     setMainWindowSize: (config: any) => void;
     getWindowSize: () => any;
-    setViewStatus: (status: 'quit' | 'maximize' | 'minimize' | 'unmaximize' | 'hide') => void;
+    setViewStatus: (status: 'quit' | 'maximize' | 'minimize' | 'unmaximize' | 'hide' | 'show') => void;
     getIsMaximized: () => Promise<boolean>;
     setWriteText: (text: string) => void;
     onQuit: (callBack: Function) => void;