diff --git a/src/assets/icon60-active.png b/src/assets/icon60-active.png new file mode 100644 index 0000000..0839e5d Binary files /dev/null and b/src/assets/icon60-active.png differ diff --git a/src/assets/icon60.png b/src/assets/icon60.png new file mode 100644 index 0000000..1df0dc8 Binary files /dev/null and b/src/assets/icon60.png differ diff --git a/src/assets/icon61-active.png b/src/assets/icon61-active.png new file mode 100644 index 0000000..0201ddf Binary files /dev/null and b/src/assets/icon61-active.png differ diff --git a/src/assets/icon61.png b/src/assets/icon61.png new file mode 100644 index 0000000..4ba4c6f Binary files /dev/null and b/src/assets/icon61.png differ diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index 2b77ba7..080d1bc 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -104,6 +104,44 @@ left: 0; top: 0; + .meetingAbsoluteHeader { + position: absolute; + width: 100%; + left: 0; + z-index: 3; + display: flex; + flex-direction: column; + background-color: rgba(0, 0, 0, 0.5); + + >div { + width: 100%; + padding: 2px 10px; + box-sizing: border-box; + display: flex; + align-items: flex-start; + + >span { + display: flex; + align-items: center; + + >img { + height: 24px; + } + } + } + + >span { + font-size: 14px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + color: white; + width: 100%; + padding: 0 10px; + box-sizing: border-box; + } + } + .meetingAbsoluteText { position: absolute; width: 100%; @@ -409,12 +447,15 @@ height: 160px; } } - .meetingContentBodyLeftSpeakerModeNoScrollbar{ + + .meetingContentBodyLeftSpeakerModeNoScrollbar { width: 246px !important; + &::-webkit-scrollbar { display: none; } } + // 单画面模式 .meetingContentBodyLeftSingleScreenMode { width: 100%; diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 7882a69..65f1efa 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -2141,7 +2141,7 @@ const Meeting: React.FC = () => { setKeyOpenChildWindow('shareScreenWindow', true) window.electron.setMainWindowSize({ width: 250, - height: 200, + height: 230, }) window.electron.setPosition('right') } @@ -2723,15 +2723,30 @@ const Meeting: React.FC = () => { setIsNetworkQuality(false) }}> {isScreenCapture ?
-
{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}
+
+
+ { + 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 * 4 + 20 : 200, + height: !isExpand ? 160 * 4 + 20 : 230, width: 250, key: 'main' }) - }}>{isExpand ? '收起' : '查看参会者'}
+ }}>{isExpand ? '收起' : '查看参会者'}
: null} {contextMenu ?
{
setShowCaret(true)} onMouseLeave={() => setShowCaret(false)}> {isAdmin && currentLookUserAccount && !isScreenCapture ? getSettingIcon() : null} @@ -3095,7 +3110,7 @@ const Meeting: React.FC = () => { container.scrollLeft += 100 }}> -
:
{ +
:
{ const container = document.getElementById('videoView') as HTMLElement; container.scrollTop += 100 }}> diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts index d1d36c3..95aad5d 100644 --- a/src/utils/package/imageUrl.ts +++ b/src/utils/package/imageUrl.ts @@ -89,6 +89,10 @@ 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' export default { loading, icon, @@ -181,4 +185,8 @@ export default { icon57, icon58, icon59, + icon60, + icon61, + icon60Active, + icon61Active, } \ No newline at end of file