This commit is contained in:
parent
486714bc10
commit
3a042e92fe
|
|
@ -410,6 +410,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.meetingContentBodyLeftSpeakerModeNoScrollbar{
|
.meetingContentBodyLeftSpeakerModeNoScrollbar{
|
||||||
|
width: 246px !important;
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2139,8 +2139,8 @@ const Meeting: React.FC = () => {
|
||||||
window.electron.createChildWindow('show')
|
window.electron.createChildWindow('show')
|
||||||
setKeyOpenChildWindow('shareScreenWindow', true)
|
setKeyOpenChildWindow('shareScreenWindow', true)
|
||||||
window.electron.setMainWindowSize({
|
window.electron.setMainWindowSize({
|
||||||
width: 270,
|
width: 250,
|
||||||
height: 160,
|
height: 200,
|
||||||
})
|
})
|
||||||
window.electron.setPosition('right')
|
window.electron.setPosition('right')
|
||||||
}
|
}
|
||||||
|
|
@ -2201,6 +2201,7 @@ const Meeting: React.FC = () => {
|
||||||
}
|
}
|
||||||
// 停止共享
|
// 停止共享
|
||||||
const stopScreenCapture = async (): Promise<void> => {
|
const stopScreenCapture = async (): Promise<void> => {
|
||||||
|
setMeetingMode('StandardMode')
|
||||||
const footerListTemplate = [...footerList]
|
const footerListTemplate = [...footerList]
|
||||||
await agora.leaveChannelEx(userInfo.screenShareId)
|
await agora.leaveChannelEx(userInfo.screenShareId)
|
||||||
agora.stopScreenCapture()
|
agora.stopScreenCapture()
|
||||||
|
|
@ -2701,18 +2702,11 @@ const Meeting: React.FC = () => {
|
||||||
<div style={{ top: '0px', borderRadius: '10px 10px 0 0' }} className={`${styles.meetingAbsoluteText}`}>{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}</div>
|
<div style={{ top: '0px', borderRadius: '10px 10px 0 0' }} className={`${styles.meetingAbsoluteText}`}>{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}</div>
|
||||||
<div style={{ bottom: '0px', borderRadius: '0 0 10px 10px' }} className={`${styles.meetingAbsoluteText}`} onClick={() => {
|
<div style={{ bottom: '0px', borderRadius: '0 0 10px 10px' }} className={`${styles.meetingAbsoluteText}`} onClick={() => {
|
||||||
setIsExpand(!isExpand)
|
setIsExpand(!isExpand)
|
||||||
// 临时方案
|
window.electron.setChildWindow({
|
||||||
window.electron.setMainWindowSize({
|
height: !isExpand ? 160 * 4 : 200,
|
||||||
width: 270,
|
width: 250,
|
||||||
height: !isExpand ? 160 * 4 : 160,
|
key: 'main'
|
||||||
})
|
})
|
||||||
window.electron.setPosition('right')
|
|
||||||
// 更新壳子
|
|
||||||
// window.electron.setChildWindow({
|
|
||||||
// height: !isExpand ? 160 * 4 : 160,
|
|
||||||
// width: 270,
|
|
||||||
// key: 'main'
|
|
||||||
// })
|
|
||||||
}}><span className='drag'>{isExpand ? '收起' : '查看参会者'}</span></div>
|
}}><span className='drag'>{isExpand ? '收起' : '查看参会者'}</span></div>
|
||||||
</div> : null}
|
</div> : null}
|
||||||
{contextMenu ? <div className={styles.meetingContentSwiperCardPopover} style={
|
{contextMenu ? <div className={styles.meetingContentSwiperCardPopover} style={
|
||||||
|
|
@ -2917,7 +2911,7 @@ const Meeting: React.FC = () => {
|
||||||
</div>}
|
</div>}
|
||||||
<div className={styles.meetingContent}>
|
<div className={styles.meetingContent}>
|
||||||
<div className={styles.meetingContentBody}>
|
<div className={styles.meetingContentBody}>
|
||||||
<div className={`${styles.meetingContentBodyLeft} drag`}>
|
<div className={`${styles.meetingContentBodyLeft} drag`} style={{ marginTop: isScreenCapture ? '20px' : '0' }}>
|
||||||
{isAdmin && currentLookUserAccount && !isScreenCapture ? getSettingIcon() : null}
|
{isAdmin && currentLookUserAccount && !isScreenCapture ? getSettingIcon() : null}
|
||||||
<div className={getMeetingContentBodyLeftModeClass(isAdmin)} id='videoView' style={meetingMode === 'SpeakerMode' && isVideoFullScreen ? { width: '0' } : {}}>
|
<div className={getMeetingContentBodyLeftModeClass(isAdmin)} id='videoView' style={meetingMode === 'SpeakerMode' && isVideoFullScreen ? { width: '0' } : {}}>
|
||||||
{roomUserList.map((item: any, index: number) => {
|
{roomUserList.map((item: any, index: number) => {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue