Skip to content

Commit

Permalink
1
Browse files Browse the repository at this point in the history
  • Loading branch information
ihewro committed Mar 1, 2020
1 parent 4c22925 commit bb479dd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ case class AvatarColumn(
//根据声音开启状态显示不同图标
val icon = HostOperateIcon("fas-microphone:16:white","fas-microphone-slash:16:white","取消静音","静音",
userInfo.isMic.get,userInfo,rootPane,
()=>toggleMic(),()=>Unit,HostOperateIconType.MIC,rmManager = rmManager)()
()=>Unit,()=>Unit,HostOperateIconType.MIC,rmManager = rmManager)()


gridPane.add(icon, 2, 0)
Expand All @@ -73,7 +73,7 @@ case class AvatarColumn(
//控制某个用户的视频消息
val videoIcon = HostOperateIcon("fas-video:16:white","fas-eye-slash:16:white","关闭视频","开启视频",
userInfo.isVideo.get,userInfo,rootPane,
()=>toggleVideo(),()=>Unit,HostOperateIconType.VIDEO,rmManager = rmManager)()
()=>Unit,()=>Unit,HostOperateIconType.VIDEO,rmManager = rmManager)()


gridPane.add(videoIcon, 3, 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import com.jfoenix.controls.JFXRippler
import javafx.scene.layout.Pane
import org.seekloud.geek.client.common.Constants.HostOperateIconType
import org.seekloud.geek.client.core.RmManager
import org.seekloud.geek.client.core.RmManager.Appoint4Host
import org.seekloud.geek.client.core.RmManager.{Appoint4Host, Shield}
import org.seekloud.geek.shared.ptcl.CommonProtocol.UserInfo
import org.seekloud.geek.shared.ptcl.WsProtocol.ChangePossessionReq
import org.seekloud.geek.shared.ptcl.WsProtocol.{ChangePossessionReq, ShieldReq}
import org.slf4j.LoggerFactory
/**
* User: hewro
Expand Down Expand Up @@ -51,11 +51,11 @@ case class HostOperateIcon(
case HostOperateIconType.MIC =>
// userInfo.isMic = Some(!userInfo.isMic.get)
log.info("roomid" + RmManager.roomInfo.get.roomId)
// rmManager ! Shield(ShieldReq(isForced = true,RmManager.roomInfo.get.roomId,userInfo.userId,isImage = userInfo.isVideo.get,isAudio = !userInfo.isMic.get))
rmManager ! Shield(ShieldReq(isForced = true,RmManager.roomInfo.get.roomId,userInfo.userId,isImage = userInfo.isVideo.get,isAudio = !userInfo.isMic.get))

case HostOperateIconType.VIDEO =>
//修改内存中该用户的静音状态
// rmManager ! Shield(ShieldReq(isForced = true,RmManager.roomInfo.get.roomId,userInfo.userId,isImage = !userInfo.isVideo.get,isAudio = userInfo.isMic.get))
rmManager ! Shield(ShieldReq(isForced = true,RmManager.roomInfo.get.roomId,userInfo.userId,isImage = !userInfo.isVideo.get,isAudio = userInfo.isMic.get))
// userInfo.isVideo = Some(!userInfo.isVideo.get)


Expand Down

0 comments on commit bb479dd

Please sign in to comment.