+ 
+
:
+ 微信中长按图片识别小程序码
+ 加入会议 +
+ + 加入会议 +
+
+ }
+ >
+
+ 
+
+
+ 语音激励
+ 开启语音激励后，会优先显示正在说话的与会成员。
+
+ }
+ title=""
+ >
+ {
+ setting.voiceStimulation = e.target.value;
+ storage.setItem('setting', JSON.stringify(setting))
+ setVoiceStimulation(e.target.value)
+ }} style={{ flexShrink: 0, margin: '10px 0' }} value={voiceStimulation}>
+ 开启
+ 关闭
+
+
@@ -213,23 +245,25 @@ const VideoComponents = () => {
}, [darkLightEnhancement]);
useEffect(() => {
if (typeof virtualBackground.sourceIndex === 'number') {
- if (import.meta.env.VITE_ENV === 'development') {
- window.electron.getAppPath().then((res: string) => {
- const imagePath = path.join(res, 'src', 'assets', 'virtualBackground', `${virtualBackground.sourceIndex + 1}.png`);
+ window.electron.getEnv().then(res=>{
+ if (res === 'development') {
+ window.electron.getAppPath().then((res: string) => {
+ const imagePath = path.join(res, 'src', 'assets', 'virtualBackground', `${virtualBackground.sourceIndex + 1}.png`);
+ agora.enableVirtualBackground(virtualBackground.isVirtualBackground, {
+ source: imagePath,
+ background_source_type: 2,
+ color: Number(virtualBackground.color),
+ })
+ })
+ } else {
+ const imagePath = path.join((process as any).resourcesPath, 'images', `${virtualBackground.sourceIndex + 1}.png`);
agora.enableVirtualBackground(virtualBackground.isVirtualBackground, {
source: imagePath,
background_source_type: 2,
color: Number(virtualBackground.color),
})
- })
- } else {
- const imagePath = path.join((process as any).resourcesPath, 'images', `${virtualBackground.sourceIndex + 1}.png`);
- agora.enableVirtualBackground(virtualBackground.isVirtualBackground, {
- source: imagePath,
- background_source_type: 2,
- color: Number(virtualBackground.color),
- })
- }
+ }
+ })
} else {
agora.enableVirtualBackground(virtualBackground.isVirtualBackground, {
background_source_type: 1,
@@ -696,7 +730,18 @@ const AudioComponents = () => {
ecordingVolume: e,
})
}} disabled={!audioDeviceManager.ecordingItem} />
+ {/* || audioDeviceManager.autoEcordingVolume */}
+ {/*
+ {
+ setting.autoEcordingVolume = e.target.checked;
+ storage.setItem('setting', JSON.stringify(setting))
+ setAudioDeviceManager({
+ ...audioDeviceManager,
+ autoEcordingVolume: e.target.checked
+ })
+ }} checked={audioDeviceManager.autoEcordingVolume}>自动调整麦克风音量
+
*/}
- {
- setting.autoEcordingVolume = e.target.checked;
- storage.setItem('setting', JSON.stringify(setting))
- setAudioDeviceManager({
- ...audioDeviceManager,
- autoEcordingVolume: e.target.checked
- })
- }} checked={audioDeviceManager.autoEcordingVolume}>自动调整麦克风音量
-
*/}
diff --git a/src/components/UpdateModal/index.tsx b/src/components/UpdateModal/index.tsx
index cf5adf4..7a72508 100644
--- a/src/components/UpdateModal/index.tsx
+++ b/src/components/UpdateModal/index.tsx
@@ -1,45 +1,106 @@
import styles from '@/components/UpdateModal/index.module.scss'
import ImageUrl from '@/utils/package/imageUrl';
-import { getUpdateUrl } from '@/utils/package/public';
+import { getUpdateUrl, isVersion } from '@/utils/package/public';
+import { ExclamationCircleFilled } from '@ant-design/icons';
import { Button, Flex, Modal, Progress } from 'antd';
-import { forwardRef, useImperativeHandle, useState, memo } from "react";
+import { forwardRef, useImperativeHandle, useState, memo, useEffect } from "react";
+const { confirm } = Modal;
-const UpdateModal = forwardRef((props: any, ref: any) => {
+const UpdateModal = forwardRef((_props: any, ref: any) => {
useImperativeHandle(ref, () => ({
changeModal: (data: any) => {
- let dataJson = JSON.parse(data)
- getContent()
- if (dataJson.type === '0') { // 打开弹窗
- setIsUpdateModal(true)
- } else if (dataJson.type === '1') { // 下载中 返回进度值
- setProgress(dataJson.value.toFixed(2))
- } else if (dataJson.type === '2') { // 下载完成
- setProgress(100)
+ if (JSON.stringify(data).includes('Error') || JSON.stringify(data).includes('{}')) {
+ setIsError(res => {
+ if (res) {
+ setIsError(false)
+ confirm({
+ keyboard: false,
+ title: '提示',
+ icon: {
- setBaseImage('')
- if (e) {
- GetQrcode(item.roomNum, import.meta.env.VITE_ENV === 'development' ? 'trial' : 'release').then(res => {
- if (res.code === 200) {
- setBaseImage(res.data)
- }
- })
- }
- }}
- content={
- baseImage ?
-
+
@@ -67,7 +128,7 @@ const UpdateModal = forwardRef((props: any, ref: any) => {
style={{ width: '100%', height: '40px', marginBottom: '10px' }}
className={`m-ant-btn`}
>立即更新
- {import.meta.env.VITE_ENV === "development" ?
: progress < 100 ?
setIsUpdateModal(false)}>暂不更新
: null}
+ {env === "development" ? setIsUpdateModal(false)}>暂不更新
: null}
下载进度：{progress}%
diff --git a/src/components/UserName/index.tsx b/src/components/UserName/index.tsx
index e60c209..6189dbb 100644
--- a/src/components/UserName/index.tsx
+++ b/src/components/UserName/index.tsx
@@ -47,6 +47,10 @@ const UserName = forwardRef((props: any, ref: any) => {
onClick={async () => {
const stateInfo = await JSON.parse(storage.getItem('stateInfo') as string);
if (info.userName) {
+ if (info.userName.length > 10) {
+ message.error('用户名称最多10个字！')
+ return
+ }
PutAlterUname({
nickName: info.userName,
roomNum: stateInfo.channelId,
diff --git a/src/page/Home/Index/index.module.scss b/src/page/Home/Index/index.module.scss
index f8603d3..58b0224 100644
--- a/src/page/Home/Index/index.module.scss
+++ b/src/page/Home/Index/index.module.scss
@@ -121,14 +121,6 @@
font-size: 14px;
}
}
-
- >div:nth-child(2) {
- cursor: pointer;
-
- >img {
- width: 16px;
- }
- }
}
>div:nth-child(2) {
diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx
index a745085..7f4bac8 100644
--- a/src/page/Home/Index/index.tsx
+++ b/src/page/Home/Index/index.tsx
@@ -2,7 +2,7 @@ import styles from '@/page/Home/Index/index.module.scss'
import { useEffect, useState, useRef } from "react";
import Operation from '@/components/Operation';
import { Button, Input, Modal, Pagination, Empty, message, Popover, Popconfirm, DatePicker, Select, Radio } from "antd";
-import { GetRoom, PostRoom, GetCheckoutRoomNum, GetRoomRtcToken, DeleteRoom, GetRecord, PostRoomInfo, GetQrcode } from '@/api/Home/Index';
+import { GetRoom, PostRoom, GetCheckoutRoomNum, GetRoomRtcToken, DeleteRoom, GetRecord, PostRoomInfo } from '@/api/Home/Index';
import ImageUrl from '@/utils/package/imageUrl'
import { ExclamationCircleFilled, ReloadOutlined } from '@ant-design/icons';
import JoinSetting from '@/components/JoinSetting';
@@ -14,6 +14,10 @@ import dayjs from 'dayjs';
import StupWizard from '@/components/StupWizard';
import { GetSubDpList } from '@/api/Home/User';
import FeedBackModel from '@/components/FeedBackModel';
+import { PostHomeVerLog } from '@/api/Meeting';
+import Code from '@/components/Code';
+import { isVersion } from "@/utils/package/public";
+
const { setInterval, clearInterval } = require('timers');
const fs = require('fs').promises;
const { exec } = require('child_process');
@@ -46,7 +50,6 @@ const Index: React.FC = () => {
const [timeData, setTimeData] = useState([]);
const [isCreateRoom, setIsCreateRoom] = useState(false);
const [allowAnonymous, setAllowAnonymous] = useState(true);
- const [baseImage, setBaseImage] = useState('');
const userInfo = JSON.parse(storage.getItem('user') as string)
useEffect(() => {
setUser(userInfo)
@@ -245,35 +248,7 @@ const Index: React.FC = () => {
{item.roomNum}
-
-
-
:
- 微信中长按图片识别小程序码
- 加入会议 -
- - 加入会议 -
-
- }
- >
-
-
-
-
{role.ID.includes(userInfo.roleId) ? {
-
- 版本号：{version}
+
}
>
+
+ 版本号:{version}
+ {update ? new : null}
+
+ {update ?
+
+
: null}
}
>
diff --git a/src/page/Login/index.tsx b/src/page/Login/index.tsx
index e722f49..03d9011 100644
--- a/src/page/Login/index.tsx
+++ b/src/page/Login/index.tsx
@@ -4,11 +4,14 @@ import { useEffect, useState } from "react";
import { useNavigate } from 'react-router-dom';
import { Input, Button, Checkbox, message, Modal } from "antd"
import { storage } from '@/utils'
-import { GetCheckUser, PostAnonLogin, PostLogin } from '@/api/Login'
+import { GetCheckOnline, GetCheckUser, PostAnonLogin, PostLogin } from '@/api/Login'
import * as CryptoJS from 'crypto-js';
import ImageUrl from '@/utils/package/imageUrl'
import { v4 as uuidv4 } from 'uuid';
import { GetCheckoutRoomNum, GetRoomInfo, GetRoomRtcToken } from '@/api/Home/Index';
+import { ExclamationCircleFilled } from '@ant-design/icons';
+import { isVersion } from '@/utils/package/public';
+const { confirm } = Modal;
const Login: React.FC = () => {
const navigate = useNavigate();
const [accountPasswordStatus, setAccountPasswordStatus] = useState(false);
@@ -37,13 +40,16 @@ const Login: React.FC = () => {
roomNum: '',
})
const [nameModal, setNameModal] = useState(false)
-
+ const [env, setEnv] = useState('')
useEffect(() => {
window.electron.setMainWindowSize({
width: 752,
height: 520,
key: 'login'
})
+ window.electron.getEnv().then(res => {
+ setEnv(res)
+ })
if (storage.getItem('login')) {
const login = JSON.parse(storage.getItem('login') as string);
const data = {
@@ -100,7 +106,32 @@ const Login: React.FC = () => {
}
GetCheckUser(operation.account).then(res => {
if (res.code === 200) {
- res.data ? setAccountPasswordStatus(true) : message.error('账号不存在!')
+ if (res.data) {
+ GetCheckOnline(operation.account).then(req => {
+ if (req.code === 200) {
+ if (req.data) {
+ confirm({
+ title: '提示',
+ icon:
- 
+ {env ? 
: null}
@@ -315,47 +346,58 @@ const Login: React.FC = () => {
if (!anonInfo.nickName) {
return message.error('请输入参会昵称！')
}
+ if (anonInfo.nickName.length > 10) {
+ return message.error('参会昵称最多10个字！')
+ }
storage.setItem('loading', true)
- PostAnonLogin(anonInfo).then(async (res) => {
- if (res.code == 200) {
- storage.setItem('user', JSON.stringify(res.data))
- storage.setItem('userLogin', true)
- await window.electron.startSignalr(res.data)
- getRoomRtcToken(anonInfo.roomNum, (options: any) => {
- if (options) {
- GetRoomInfo(anonInfo.roomNum).then(async (res) => {
- if (res.code === 200) {
- setTimeout(() => {
+ isVersion((bool: boolean) => {
+ storage.setItem('loading', false)
+ if (bool) {
+ window.electron.onDownload('3')
+ } else {
+ storage.setItem('loading', true)
+ PostAnonLogin(anonInfo).then(async (res) => {
+ if (res.code == 200) {
+ storage.setItem('user', JSON.stringify(res.data))
+ storage.setItem('userLogin', true)
+ await window.electron.startSignalr(res.data)
+ getRoomRtcToken(anonInfo.roomNum, (options: any) => {
+ if (options) {
+ GetRoomInfo(anonInfo.roomNum).then(async (res) => {
+ if (res.code === 200) {
+ setTimeout(() => {
+ storage.setItem('loading', false)
+ window.electron.getWindowSize().then((res: any) => {
+ window.electron.setMainWindowSize({
+ width: Math.ceil(res.width / 1.5),
+ height: Math.ceil(res.height / 1.3),
+ })
+ })
+ navigate(`/meeting`, {
+ state: {
+ channelId: anonInfo.roomNum,
+ token: options.token,
+ tokenA: options.tokenA,
+ roomId: res.data.id,
+ roomName: res.data.roomName,
+ enableMicr: false,
+ enableCamera: false,
+ }
+ })
+ }, 2000)
+ } else {
+ storage.setItem('loading', false)
+ }
+ }).catch(() => {
storage.setItem('loading', false)
- window.electron.getWindowSize().then((res: any) => {
- window.electron.setMainWindowSize({
- width: Math.ceil(res.width / 1.5),
- height: Math.ceil(res.height / 1.3),
- })
- })
- navigate(`/meeting`, {
- state: {
- channelId: anonInfo.roomNum,
- token: options.token,
- tokenA: options.tokenA,
- roomId: res.data.id,
- roomName: res.data.roomName,
- enableMicr: false,
- enableCamera: false,
- }
- })
- }, 2000)
- } else {
- storage.setItem('loading', false)
+ })
}
- }).catch(() => {
- storage.setItem('loading', false)
})
}
+ }).catch(() => {
+ storage.setItem('loading', false)
})
}
- }).catch(() => {
- storage.setItem('loading', false)
})
}}>进入
diff --git a/src/page/Meeting/ChatBigWindow/index.module.scss b/src/page/Meeting/ChatBigWindow/index.module.scss
index 6b65512..6c6b70b 100644
--- a/src/page/Meeting/ChatBigWindow/index.module.scss
+++ b/src/page/Meeting/ChatBigWindow/index.module.scss
@@ -46,6 +46,8 @@
font-size: 14px;
color: #F3F3F5;
margin-left: 4px;
+ display: flex;
+ align-items: center;
}
>div {}
@@ -77,6 +79,8 @@
>span {
font-size: 14px;
color: #F3F3F5;
+ display: flex;
+ align-items: center;
}
>div {
diff --git a/src/page/Meeting/ChatBigWindow/index.tsx b/src/page/Meeting/ChatBigWindow/index.tsx
index e87418b..a777ce3 100644
--- a/src/page/Meeting/ChatBigWindow/index.tsx
+++ b/src/page/Meeting/ChatBigWindow/index.tsx
@@ -206,19 +206,30 @@ const ChatBigWindow: React.FC = () => {
>移出会议 : null}
用户不在房间内
}>
-
+
+ :
{item.message}
diff --git a/src/page/Meeting/ChatSmallWindow/index.module.scss b/src/page/Meeting/ChatSmallWindow/index.module.scss
index a5de0b3..b0dd6c1 100644
--- a/src/page/Meeting/ChatSmallWindow/index.module.scss
+++ b/src/page/Meeting/ChatSmallWindow/index.module.scss
@@ -31,7 +31,7 @@
display: flex;
>span:nth-child(1) {
- white-space: nowrap;
+ word-break: break-all;
color: #ff970f;
}
diff --git a/src/page/Meeting/NoticeWindow/index.tsx b/src/page/Meeting/NoticeWindow/index.tsx
index 6a00b7b..58930d2 100644
--- a/src/page/Meeting/NoticeWindow/index.tsx
+++ b/src/page/Meeting/NoticeWindow/index.tsx
@@ -21,7 +21,10 @@ const NoticeWindow: React.FC = () => {
api.open({
message: '',
description:
- {noticeItem.uname}申请发言
+
+
{noticeItem.uname}
+ 申请发言
+