diff --git a/index.html b/index.html index 304fe77..e3ab5f4 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,6 @@
- \ No newline at end of file diff --git a/main.js b/main.js index 594d454..0625a47 100644 --- a/main.js +++ b/main.js @@ -138,21 +138,17 @@ app.on('ready', () => { }); // 下载文件并放置选择的文件夹 ipcMain.handle('dwFile', (event, url) => { - // dialog.showOpenDialog(mainWindow, { - // properties: ['openDirectory'] - // }).then(result => { - // if (!result.canceled) { - // const selectedPath = result.filePaths[0]; - // win.webContents.on('will-download', (event, item, webContents) => { - // console.log('Selected download folder:', selectedPath); - // console.log(url); - // item.setSavePath(`${selectedPath}/${url}`); - // item.resume(); - // }); - // } - // }).catch(err => { + dialog.showOpenDialog(mainWindow, { + properties: ['openDirectory'] + }).then(result => { + if (!result.canceled) { + const selectedPath = result.filePaths[0]; + console.log('Selected download folder:', selectedPath); + console.log(url); + } + }).catch(err => { - // }); + }); }); // 导出是否全屏 ipcMain.handle('getIsMaximized', () => { diff --git a/src/App.tsx b/src/App.tsx index 1030b05..d5b876b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -63,10 +63,12 @@ const App: React.FC = () => { width: window.innerWidth, height: window.innerHeight, }); - window.electron.getIsMaximized().then((res: boolean) => { - const dom = document.getElementById('root') as any; - dom.style.borderRadius = res ? '0px' : '10px' - }) + try { + window.electron.getIsMaximized().then((res: boolean) => { + const dom = document.getElementById('root') as any; + dom.style.borderRadius = res ? '0px' : '10px' + }) + } catch { } }; const handleCustomStorageChange = (e: any): void => { if (e.key === 'loading') { diff --git a/src/assets/videoImg.png b/src/assets/videoImg.png deleted file mode 100644 index 3d259a1..0000000 Binary files a/src/assets/videoImg.png and /dev/null differ diff --git a/src/components/Operation/index.tsx b/src/components/Operation/index.tsx index 725bdcb..6f3ef2a 100644 --- a/src/components/Operation/index.tsx +++ b/src/components/Operation/index.tsx @@ -1,4 +1,5 @@ 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'; type OperationType = { @@ -14,7 +15,7 @@ const Operation: React.FC = () => { height: window.innerHeight, }); const [operationList, setOperationList] = useState([{ - icon: '/src/assets/icon17.png', + icon: ImageUrl.icon17, key: 'minimize', title: '最小化', onClick: (key: OperationKeyType) => { @@ -23,7 +24,7 @@ const Operation: React.FC = () => { show: true, }, { - icon: '/src/assets/icon20.png', + icon: ImageUrl.icon20, key: 'maximize', title: '最大化', onClick: (key: OperationKeyType) => { @@ -32,7 +33,7 @@ const Operation: React.FC = () => { show: true, }, { - icon: '/src/assets/icon19.png', + icon: ImageUrl.icon19, key: 'unmaximize', title: '还原大小', onClick: (key: OperationKeyType) => { @@ -41,7 +42,7 @@ const Operation: React.FC = () => { show: false, }, { - icon: '/src/assets/icon18.png', + icon: ImageUrl.icon18, key: 'quit', title: '关闭', onClick: (key: OperationKeyType) => { @@ -66,9 +67,11 @@ const Operation: React.FC = () => { }, []); const getIsMaximized = (): void => { - window.electron.getIsMaximized().then((res: boolean) => { - changeOperationList(res ? 'maximize' : 'unmaximize') - }) + try { + window.electron.getIsMaximized().then((res: boolean) => { + changeOperationList(res ? 'maximize' : 'unmaximize') + }) + } catch { } } const changeOperationList = (str: OperationKeyType): void => { diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index 483c8a9..161b4d1 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -4,6 +4,7 @@ import Operation from '@/components/Operation'; import { useNavigate } from 'react-router-dom'; import { Button, Input, Modal, Pagination, Empty, message } from "antd"; import { GetRoom, PostRomm, GetCheckoutRoomNum, GetRoomRtcToken, GetRoomInfo } from '@/api/Home/Index'; +import ImageUrl from '@/utils/package/imageUrl' const Index: React.FC = () => { const navigate = useNavigate(); const [list, setList] = useState({ @@ -67,7 +68,7 @@ const Index: React.FC = () => {
@@ -99,14 +100,14 @@ const Index: React.FC = () => {
{item.roomName}
- + {item.onlineUserCount}人
copyRoomNum(item.roomNum)} title='复制房间号'> {item.roomNum} - +
@@ -126,7 +127,7 @@ const Index: React.FC = () => { } }) }} - icon={} + icon={} className='m-ant-btn'> 进入 diff --git a/src/page/Home/User/index.tsx b/src/page/Home/User/index.tsx index 86fa208..1870246 100644 --- a/src/page/Home/User/index.tsx +++ b/src/page/Home/User/index.tsx @@ -5,6 +5,7 @@ import { Button, Input, Table, Pagination, Modal, message, Select } from "antd"; import { SearchOutlined } from '@ant-design/icons'; import { GetUserList, PostUser, PutUser, DeleteUser, PutUserPwd, GetRoleDpList } from '@/api/Home/User'; import * as CryptoJS from 'crypto-js'; +import ImageUrl from '@/utils/package/imageUrl'; const { Column } = Table const User: React.FC = () => { const [selectedRowKeys, setSelectedRowKeys] = useState([]); @@ -95,12 +96,12 @@ const User: React.FC = () => { } }) }} - icon={} + icon={} className='m-ant-btn'> 添加用户
@@ -219,7 +221,7 @@ const Login: React.FC = () => {
-
+
*/}
diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index d72ffcb..3f213c1 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -117,7 +117,7 @@ .meetingContentSwiperCardVdeio { width: 100%; height: 100%; - background: black url('/src/assets/error.png') no-repeat center/30%; + background: black; } } } @@ -132,7 +132,7 @@ .meetingContentVideoDom { width: 100%; height: 100%; - background: black url('/src/assets/error.png') no-repeat center/30%; + background: black; } } diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 5e27013..15ad22e 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -13,6 +13,7 @@ import { thumbImageBufferToBase64 } from '@/utils/package/base64' import { storage } from '@/utils'; import { GetRoomFile, PostRoomFile, DeleteRoomFile, GetRoomUpFileurl, GetRoomFileDwUrl } from '@/api/Meeting'; import axios from 'axios'; +import ImageUrl from '@/utils/package/imageUrl' const { Column } = Table const Meeting: React.FC = () => { const navigate = useNavigate(); @@ -34,56 +35,59 @@ const Meeting: React.FC = () => { [ { title: '关闭声音', - icon: '/src/assets/icon22', + icon: ImageUrl.icon22, + iconActive: ImageUrl.icon22Active, active: false, }, { title: '关闭视频', - icon: '/src/assets/icon23', + icon: ImageUrl.icon23, + iconActive: ImageUrl.icon23Active, active: false, }, ], [ { title: '共享屏幕', - icon: '/src/assets/icon24', + icon: ImageUrl.icon24, active: false, }, { title: '共享文件', - icon: '/src/assets/icon25', + icon: ImageUrl.icon25, active: false, }, { title: '邀请人员', - icon: '/src/assets/icon26', + icon: ImageUrl.icon26, active: false, }, { title: '录制', - icon: '/src/assets/icon27', + icon: ImageUrl.icon27, + iconActive: ImageUrl.icon27Active, active: false, }, { title: '设置向导', - icon: '/src/assets/icon28', + icon: ImageUrl.icon28, active: false, }, { title: '结束', - icon: '/src/assets/icon29', + icon: ImageUrl.icon29, active: false, }, ], [ { title: '成员列表', - icon: '/src/assets/icon30', + icon: ImageUrl.icon30, active: false, }, { title: '聊天', - icon: '/src/assets/icon31', + icon: ImageUrl.icon31, active: false, }, ], @@ -330,7 +334,7 @@ const Meeting: React.FC = () => {
成员列表 - { + { setStatusList({ userList: false, userChatList: false, @@ -342,12 +346,12 @@ const Meeting: React.FC = () => { {list.map((item: number) =>
-
+
潇潇主持人
- - + +
)} @@ -361,7 +365,7 @@ const Meeting: React.FC = () => {
聊天 - { + { setStatusList({ userList: false, userChatList: false, @@ -372,7 +376,7 @@ const Meeting: React.FC = () => { {list.map((item: number) =>
-
+
潇潇
哈哈哈哈
@@ -418,12 +422,12 @@ const Meeting: React.FC = () => { onOpenChange={() => setOpen(true)} >
- + {row.title}
:
changeStatusList(row, itemIndex, rowIndex)} key={rowIndex}> - + {row.title}
) @@ -495,7 +499,7 @@ const Meeting: React.FC = () => {
视频预览：
@@ -504,11 +508,11 @@ const Meeting: React.FC = () => { {stepsStatus ?
您可以对着麦克风说话，试听表克风的输入质量
- +
- +
- +
@@ -730,10 +734,10 @@ const meetingContentUser = () => { <>
- +
- + 张大龙
diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts new file mode 100644 index 0000000..7195767 --- /dev/null +++ b/src/utils/package/imageUrl.ts @@ -0,0 +1,92 @@ +import avatar from '@/assets/avatar.png' +import error from '@/assets/error.png' +import icon from '@/assets/icon.png' +import icon1 from '@/assets/icon1.png' +import icon2 from '@/assets/icon2.png' +import icon3 from '@/assets/icon3.png' +import icon4 from '@/assets/icon4.png' +import icon5 from '@/assets/icon5.png' +import icon6 from '@/assets/icon6.png' +import icon7 from '@/assets/icon7.png' +import icon8 from '@/assets/icon8.png' +import icon9 from '@/assets/icon9.png' +import icon10 from '@/assets/icon10.png' +import icon11 from '@/assets/icon11.png' +import icon12 from '@/assets/icon12.png' +import icon12Active from '@/assets/icon12-active.png' +import icon13 from '@/assets/icon13.png' +import icon13Active from '@/assets/icon13-active.png' +import icon14 from '@/assets/icon14.png' +import icon15 from '@/assets/icon15.png' +import icon15Active from '@/assets/icon15-active.png' +import icon16 from '@/assets/icon16.png' +import icon16Active from '@/assets/icon16-active.png' +import icon17 from '@/assets/icon17.png' +import icon18 from '@/assets/icon18.png' +import icon19 from '@/assets/icon19.png' +import icon20 from '@/assets/icon20.png' +import icon21 from '@/assets/icon21.png' +import icon22 from '@/assets/icon22.png' +import icon22Active from '@/assets/icon22-active.png' +import icon23 from '@/assets/icon23.png' +import icon23Active from '@/assets/icon23-active.png' +import icon24 from '@/assets/icon24.png' +import icon25 from '@/assets/icon25.png' +import icon26 from '@/assets/icon26.png' +import icon27 from '@/assets/icon27.png' +import icon27Active from '@/assets/icon27-active.png' +import icon28 from '@/assets/icon28.png' +import icon29 from '@/assets/icon29.png' +import icon30 from '@/assets/icon30.png' +import icon31 from '@/assets/icon31.png' +import icon32 from '@/assets/icon32.png' +import icon33 from '@/assets/icon33.png' +import icon34 from '@/assets/icon34.png' +import icon35 from '@/assets/icon35.png' +export default { + avatar, + error, + icon, + icon1, + icon2, + icon3, + icon4, + icon5, + icon6, + icon7, + icon8, + icon9, + icon10, + icon11, + icon12, + icon12Active, + icon13, + icon13Active, + icon14, + icon15, + icon15Active, + icon16, + icon16Active, + icon17, + icon18, + icon19, + icon20, + icon21, + icon22, + icon22Active, + icon23, + icon23Active, + icon24, + icon25, + icon26, + icon27, + icon27Active, + icon28, + icon29, + icon30, + icon31, + icon32, + icon33, + icon34, + icon35, +} \ No newline at end of file