{[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16].map(item => )}
- 自由者模式
+ 宫格模式
- 版本号:{version}
+ V{version}-
+ {buildTime}
+
{update ? new : null}
{update ?
diff --git a/src/page/Login/index.module.scss b/src/page/Login/index.module.scss
index df56c51..e6c1305 100644
--- a/src/page/Login/index.module.scss
+++ b/src/page/Login/index.module.scss
@@ -129,7 +129,7 @@
flex-shrink: 0;
color: #ccc;
text-align: right;
- font-size: 16px;
+ font-size: 14px;
}
}
}
diff --git a/src/page/Login/index.tsx b/src/page/Login/index.tsx
index 03d9011..11634ef 100644
--- a/src/page/Login/index.tsx
+++ b/src/page/Login/index.tsx
@@ -11,6 +11,7 @@ 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';
+import dayjs from 'dayjs';
const { confirm } = Modal;
const Login: React.FC = () => {
const navigate = useNavigate();
@@ -39,6 +40,7 @@ const Login: React.FC = () => {
nickName: '',
roomNum: '',
})
+ const [buildTime, setBuildTime] = useState('0')
const [nameModal, setNameModal] = useState(false)
const [env, setEnv] = useState('')
useEffect(() => {
@@ -50,6 +52,13 @@ const Login: React.FC = () => {
window.electron.getEnv().then(res => {
setEnv(res)
})
+ try {
+ const buildStr = document.getElementById('build-time')?.getAttribute('content');
+ const formattedTime = dayjs(Number(buildStr)).format('YYYYMMDDHHmm');
+ setBuildTime(formattedTime)
+ } catch {
+
+ }
if (storage.getItem('login')) {
const login = JSON.parse(storage.getItem('login') as string);
const data = {
@@ -204,7 +213,23 @@ const Login: React.FC = () => {
<>
diff --git a/src/page/Meeting/UserListWindow/index.module.scss b/src/page/Meeting/UserListWindow/index.module.scss
index 2cc7677..c8838c0 100644
--- a/src/page/Meeting/UserListWindow/index.module.scss
+++ b/src/page/Meeting/UserListWindow/index.module.scss
@@ -52,9 +52,15 @@
align-items: center;
>span {
- font-size: 14px;
+ display: flex;
+ flex-direction: column;
color: #F3F3F5;
margin-left: 4px;
+ font-size: 13px;
+
+ >span {
+ font-size: 12px;
+ }
}
>div {
diff --git a/src/page/Meeting/UserListWindow/index.tsx b/src/page/Meeting/UserListWindow/index.tsx
index 1630667..b7aa4a7 100644
--- a/src/page/Meeting/UserListWindow/index.tsx
+++ b/src/page/Meeting/UserListWindow/index.tsx
@@ -83,10 +83,10 @@ const UserListWindow: React.FC = () => {
- {env ? 
: null}
+ {env && (
+ )
{
+ switch (env) {
+ case 'xy':
+ return ImageUrl.icon53
+ case 'xatyz':
+ return ImageUrl.icon58
+ case 'my':
+ return ImageUrl.icon63
+ default:
+ return ImageUrl.icon1
+ }
+ })()}
+ alt=""
+ />
+ )}
@@ -319,7 +344,8 @@ const Login: React.FC = () => {
>
- 版本号：{version}
+ V{version}-
+ {buildTime}
检查摄像头是否正常、未被占用，或尝试重新加入频道。 {
stupWizardRef.current.changeModal(1);
}}>前往修改摄像头
,
@@ -1480,7 +1498,7 @@ const Meeting: React.FC = () => {
uid: userInfo.uid,
enableCamera: false
})
- message.error({
+ handleMessage().error({
content: 检查摄像头是否正常、未被占用，或尝试重新加入频道。 {
stupWizardRef.current.changeModal(1);
}}>前往修改摄像头
,
@@ -1581,7 +1599,14 @@ const Meeting: React.FC = () => {
item.isShow = true;
}
});
- setIsAdmin(res.filter((item: any) => (role.ID.includes(item.roleId) || item.isRoomManager) && item.isRoom).length)
+ const peoPleLength = res.filter((item: any) => (role.ID.includes(item.roleId) || item.isRoomManager) && item.isRoom).length
+ setIsAdmin(peoPleLength)
+ if (peoPleLength > 6) {
+ setIsScreenCapture(isScreenCaptureValue => {
+ setMeetingMode(isScreenCaptureValue ? 'SpeakerMode' : 'StandardMode')
+ return isScreenCaptureValue
+ })
+ }
return res
})
}
@@ -1713,16 +1738,18 @@ const Meeting: React.FC = () => {
})
}
// 渲染视频
- const renderVideo = async (uid: string = ''): Promise文件夹不存在 {
stupWizardRef.current.changeModal(3);
}}>前往设置
});
return;
} else {
- message.error(error);
+ handleMessage().error(error);
}
}
break;
case '录制中':
if (isClickedMediaSteam) {
- message.error('录制时长不足3秒，请稍后重试！');
+ handleMessage().error('录制时长不足3秒，请稍后重试！');
} else {
footerListTemplate[itemIndex][rowIndex].title = '录制'
footerListTemplate[itemIndex][rowIndex].active = false
@@ -2008,7 +2035,7 @@ const Meeting: React.FC = () => {
if (!isClicked) {
requestSpeak()
} else {
- message.error('申请太频繁了，请稍后重试！');
+ handleMessage().error('申请太频繁了，请稍后重试！');
}
break;
case '会议监控':
@@ -2114,7 +2141,7 @@ const Meeting: React.FC = () => {
setKeyOpenChildWindow('shareScreenWindow', true)
window.electron.setMainWindowSize({
width: 250,
- height: 160,
+ height: 230,
})
window.electron.setPosition('right')
}
@@ -2144,12 +2171,20 @@ const Meeting: React.FC = () => {
await PostStopSharedScreen(state.channelId)
} else {
await PostShowUser(state.channelId, uid, name)
+ await window.electron.onInvoke('sendOper', {
+ roomNum: state.channelId,
+ contentString: JSON.stringify({
+ mode: 'StandardMode',
+ type: 'mode',
+ msg: false
+ })
+ })
}
}
// 设置发言人
const postRoomManager = async (data: any): Promise {
setContextMenu('')
+ if (modeOpen) {
+ setModeOpen(false)
+ }
setIsNetworkQuality(false)
}}>
- {isScreenCapture ?
-
}
{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}
- {footerList[0][1].active ?
-
: null}
- {
+ {isScreenCapture ?
: null}
{contextMenu ?
+
+
+
+ {
+ setIsExpand(!isExpand)
+ window.electron.setChildWindow({
+ height: !isExpand ? 160 * 4 + 20 : 230,
+ width: 250,
+ key: 'main'
+ })
+ }}>
+ 
+ 
+
+
+ {currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}
+ {
setIsExpand(!isExpand)
window.electron.setChildWindow({
- height: isExpand ? 160 : 40,
+ height: !isExpand ? 160 * 4 + 20 : 230,
+ width: 250,
key: 'main'
})
- }}>{isExpand ? '展开' : '收起'}
+ }}>{isExpand ? '收起' : '查看参会者'} {
>移出会议 : null}
: null}
{contextHolder}
-
+ {isScreenCapture ? null :
+
- {isScreenCapture ? null : setIsNetworkQuality(false)}>
@@ -2766,35 +2895,40 @@ const Meeting: React.FC = () => {
{networkIcon(currentEffective)}
详情
- }
+
{changeCurrentSeconds()}
会议号：{state.channelId} 会议名称：{state.roomName}
-
-
+ : null}
- {
- setModeOpen(false)
- storage.setItem('meetingMode', 'StandardMode')
- }}>
- 
- 标准模式
-
- {
- setModeOpen(false)
- storage.setItem('meetingMode', 'SpeakerMode')
- }}>
- 
- 演讲模式
-
- {
- setModeOpen(false)
- }}>
- 取消
+
}
title=""
@@ -2803,24 +2937,35 @@ const Meeting: React.FC = () => {
onOpenChange={() => setModeOpen(true)}
>
+
+
+ {
+ setSyncView('FreedomMode')
+ }}>
+ 
+ 宫格模式
+
+ {
+ setSyncView('StandardMode')
+ }}>
+
+ 标准模式
+
+ {
+ setSyncView('SpeakerMode')
+ }}>
+
+ 演讲模式
+
- {meetingMode === 'StandardMode' ? : }
+ {meetingMode === 'StandardMode' ?
+ :
+ meetingMode === 'FreedomMode' ?
+ :
+ }
{getMeetingContentBodyLeftModeText()}
-
-
- {isAdmin && currentLookUserAccount ? getSettingIcon() : null}
-
+
setShowCaret(true)}
+ onMouseLeave={() => setShowCaret(false)}>
+ {isAdmin && currentLookUserAccount && !isScreenCapture ? getSettingIcon() : null}
+
{roomUserList.map((item: any, index: number) => {
return (item.isRoom && item.isAdmin ?
- {meetingContentUser(item)}
+ {meetingContentUser(item, false, isScreenCapture)}
{item.enableCamera ? null : meetingContentError(item)}
- {String(isShare) === item.screenShareId ? {
+ if (isScreenCapture) {
+ return
+ }
if (String(isShare) === item.screenShareId) {
renderVideo(item.screenShareId)
} else {
@@ -2828,6 +2973,9 @@ const Meeting: React.FC = () => {
}
}}
onContextMenu={(e: any) => {
+ if (isScreenCapture) {
+ return
+ }
if (role.ID.includes(userInfo.roleId)) {
setContextMenuStyle({
top: e.clientY,
@@ -2842,12 +2990,12 @@ const Meeting: React.FC = () => {
+ {String(isShare) === item.screenShareId && !isScreenCapture ?
{item.isRoomManager || role.ID.includes(item.roleId) ?
: null)
}
)}
- {hasScrollbar() ?
屏幕分享中
: null}
- {role.ID.includes(user.roleId) ?
+ {/*
+
*/}
+ {meetingMode !== "FreedomMode" && hasScrollbar() && showCaret ?
+
+
+
+
{meetingMode === "StandardMode" ?
: null}
- {currentLookUserStatus === 0 ?
- {
const container = document.getElementById('videoView') as HTMLElement;
container.scrollLeft -= 100
@@ -2956,15 +3110,15 @@ const Meeting: React.FC = () => {
container.scrollLeft += 100
}}>
: {
+
: {
const container = document.getElementById('videoView') as HTMLElement;
container.scrollTop += 100
}}>
}
+ {meetingMode !== "FreedomMode" && currentLookUserStatus === 0 ?
+
{
@@ -2974,8 +3128,8 @@ const Meeting: React.FC = () => {
setIsVideoFullScreen(true)} />}
{meetingContentUser(currentLookUserAccount, true)}
: null}
- {currentLookUserStatus === 1 ?
-
+ {meetingMode !== "FreedomMode" && currentLookUserStatus === 1 ?
+
{
+ {meetingMode !== "FreedomMode" && currentLookUserStatus === 2 ?
+
setIsVideoFullScreen(true)} />}
{meetingContentUser(currentLookUserAccount, true)}
: null}
- {currentLookUserStatus === 3 ?
-
+ {meetingMode !== "FreedomMode" && currentLookUserStatus === 3 ?
+
setIsVideoFullScreen(true)} />}
{meetingContentUser(currentLookUserAccount, true)}
: null}
- {currentLookUserStatus === 4 ?
-
+ {meetingMode !== "FreedomMode" && currentLookUserStatus === 4 ?
+
{statusList.userList ?
@@ -3070,10 +3224,10 @@ const Meeting: React.FC = () => {
@@ -3690,7 +3844,7 @@ const meetingContentUser = (item: any, bool?: boolean) => {
: ''}
}
-
+
{item.userName}
{role.ID.includes(item.roleId) || item.isRoomManager ? role.ID.includes(item.roleId) ? '(管理员)' : '(发言人)' : ''}
diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts
index 2c349a4..bd8a33d 100644
--- a/src/utils/package/imageUrl.ts
+++ b/src/utils/package/imageUrl.ts
@@ -86,6 +86,15 @@ import icon54 from '@/assets/icon54.png'
import icon55 from '@/assets/icon55.png'
import icon56 from '@/assets/icon56.png'
import icon56Active from '@/assets/icon56-active.png'
+import icon57 from '@/assets/icon57.png'
+import icon58 from '@/assets/icon58.png'
+import icon59 from '@/assets/icon59.png'
+import icon60 from '@/assets/icon60.png'
+import icon61 from '@/assets/icon61.png'
+import icon60Active from '@/assets/icon60-active.png'
+import icon61Active from '@/assets/icon61-active.png'
+import icon62 from '@/assets/icon62.png'
+import icon63 from '@/assets/icon63.png'
export default {
loading,
icon,
@@ -174,5 +183,14 @@ export default {
icon54,
icon55,
icon56,
- icon56Active
+ icon56Active,
+ icon57,
+ icon58,
+ icon59,
+ icon60,
+ icon61,
+ icon60Active,
+ icon61Active,
+ icon62,
+ icon63,
}
\ No newline at end of file
diff --git a/src/utils/package/public.ts b/src/utils/package/public.ts
index beac8d1..c2f44b4 100644
--- a/src/utils/package/public.ts
+++ b/src/utils/package/public.ts
@@ -62,6 +62,10 @@ export const getUpdateUrl = (env: string) => {
switch (env) {
case 'xy':
return 'https://meeting-api.23544.com/meeting/xysz'
+ case 'xatyz':
+ return 'https://meeting-api.23544.com/meeting/xatyz'
+ case 'my':
+ return 'https://meeting-api.23544.com/meeting/my'
case 'development':
return 'http://192.168.2.9:8827'
default:
@@ -75,6 +79,12 @@ export const getTitle = async () => {
case 'xy':
str = '湖北襄阳四中教研平台'
break;
+ case 'xatyz':
+ str = '西安铁一中教研平台'
+ break;
+ case 'my':
+ str = '绵阳中学人工智能教育发展共同体 · 教研平台'
+ break;
case 'development':
str = '智汇享'
break;
diff --git a/src/utils/package/update.js b/src/utils/package/update.js
index 4e10c9a..634f26f 100644
--- a/src/utils/package/update.js
+++ b/src/utils/package/update.js
@@ -3,6 +3,10 @@ module.exports = {
switch (env) {
case 'xy':
return 'https://meeting-api.23544.com/meeting/xysz'
+ case 'xatyz':
+ return 'https://meeting-api.23544.com/meeting/xatyz'
+ case 'my':
+ return 'https://meeting-api.23544.com/meeting/my'
case 'development':
return 'http://192.168.2.9:8827'
default:
@@ -13,6 +17,10 @@ module.exports = {
switch (env) {
case 'xy':
return '湖北襄阳四中教研平台'
+ case 'xatyz':
+ return '西安铁一中教研平台'
+ case 'my':
+ return '绵阳中学人工智能教育发展共同体 · 教研平台'
case 'development':
return '智汇享'
default:
@@ -23,6 +31,10 @@ module.exports = {
switch (env) {
case 'xy':
return 'icon54'
+ case 'xatyz':
+ return 'icon59'
+ case 'my':
+ return 'icon62'
case 'development':
return 'icon'
default:
diff --git a/vite.config.ts b/vite.config.ts
index c700f85..3d499eb 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,6 +3,7 @@ import react from '@vitejs/plugin-react'
import pxtovw from 'postcss-px-to-viewport-8-plugin'
import { resolve as resolvePath } from 'path'
import resolve from 'vite-plugin-resolve';
+import { createHtmlPlugin } from 'vite-plugin-html';
const loder_pxtovw = pxtovw({
viewportWidth: 1900,
viewportUnit: 'vw',
@@ -51,6 +52,20 @@ export default defineConfig({
base: './', // 这里更改打包相对绝对路径
plugins: [
react(),
+ createHtmlPlugin({
+ minify: false,
+ pages: [
+ {
+ template: 'index.html',
+ filename: 'index.html',
+ injectOptions: {
+ data: {
+ buildTime: +new Date()
+ }
+ }
+ }
+ ]
+ }),
resolve({
'agora-electron-sdk': `
const {