Commit 1c46b56e authored by liujiaxin's avatar liujiaxin

添加iframe和白板功能同步

parent dd6f71f4
...@@ -13,7 +13,7 @@ const useStyles = makeStyles({ ...@@ -13,7 +13,7 @@ const useStyles = makeStyles({
style1 : { style1 : {
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
width: 'calc(100% - 280px)', width: '100%', // 'calc(100% - 280px)'
height: '100%' height: '100%'
}, },
style2 : { style2 : {
......
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
width: 58px; width: 58px;
margin-right: 10px; margin-right: 10px;
} }
.media-btn>.icon.disabled{
cursor: not-allowed;
}
.agora-video-view.show-placeholder { .agora-video-view.show-placeholder {
.video-profile { .video-profile {
...@@ -132,4 +135,4 @@ ...@@ -132,4 +135,4 @@
flex: 1 flex: 1
} }
} }
} }
\ No newline at end of file
...@@ -246,7 +246,13 @@ return ( ...@@ -246,7 +246,13 @@ return (
<span className="media-btn"> <span className="media-btn">
<Icon onClick={onAudioClick} className={audio ? "icon-speaker-on" : "icon-speaker-off"} data={"audio"} /> <Icon onClick={onAudioClick} className={audio ? "icon-speaker-on" : "icon-speaker-off"} data={"audio"} />
<Icon onClick={onVideoClick} className={video ? "icons-camera-unmute-s" : "icons-camera-mute-s"} data={"video"} /> <Icon onClick={onVideoClick} className={video ? "icons-camera-unmute-s" : "icons-camera-mute-s"} data={"video"} />
</span> : null} </span> :
<span className="media-btn">
<Icon className={audio ? "icon-speaker-on disabled" : "icon-speaker-off disabled"} data={"audio"} />
<Icon className={video ? "icons-camera-unmute-s disabled" : "icons-camera-mute-s disabled"} data={"video"} />
</span>
}
</div> </div>
: null : null
} }
...@@ -255,4 +261,4 @@ return ( ...@@ -255,4 +261,4 @@ return (
) )
} }
export default React.memo(VideoPlayer); export default React.memo(VideoPlayer);
\ No newline at end of file
...@@ -523,7 +523,9 @@ export class RoomStore { ...@@ -523,7 +523,9 @@ export class RoomStore {
}) })
const upUser = downUser[Math.floor(Math.random() * downUser.length)] const upUser = downUser[Math.floor(Math.random() * downUser.length)]
// console.log('upUser', upUser) // console.log('upUser', upUser)
this.stageUp(`${upUser.uid}`) if (upUser) {
this.stageUp(`${upUser.uid}`)
}
} }
async setCurrentTool (tool: TOOL_TYPE) { async setCurrentTool (tool: TOOL_TYPE) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment