Compare commits
No commits in common. "7c31c67f9d19d3786b34686bdbbea299f4bffed3" and "505dd4229406176e23c96168e31f00ecced93ddb" have entirely different histories.
7c31c67f9d
...
505dd42294
|
|
@ -342,7 +342,7 @@ namespace WGShare.API.Controllers.Frontend
|
||||||
userInfo.EnableMicr = enableMicr;
|
userInfo.EnableMicr = enableMicr;
|
||||||
RedisHelper.Instance.HSet(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, roomNum), uid, userInfo);
|
RedisHelper.Instance.HSet(RedisKeyConstant.SessionManage.GetChannelUserKey(TenantId, roomNum), uid, userInfo);
|
||||||
|
|
||||||
//_logger.LogInformation($@"开闭麦克分,推送一次,roomNum:{roomNum},enableMicr:{enableMicr},uid:{uid}");
|
_logger.LogInformation($@"开闭麦克分,推送一次,roomNum:{roomNum},enableMicr:{enableMicr},uid:{uid}");
|
||||||
// 通知所有人该用户麦克风状态
|
// 通知所有人该用户麦克风状态
|
||||||
await _hubContext.Clients.Group(roomNum).OperMicr(userInfo, UId);
|
await _hubContext.Clients.Group(roomNum).OperMicr(userInfo, UId);
|
||||||
}
|
}
|
||||||
|
|
@ -414,8 +414,7 @@ namespace WGShare.API.Controllers.Frontend
|
||||||
|
|
||||||
if (RedisHelper.Instance.HGet(RedisKeyConstant.SessionManage.GetChannelShowUserKey(TenantId), roomNum) == uid)
|
if (RedisHelper.Instance.HGet(RedisKeyConstant.SessionManage.GetChannelShowUserKey(TenantId), roomNum) == uid)
|
||||||
{
|
{
|
||||||
// 如果已经是全员观看他了, 直接通知其他房间用户
|
// 如果已经是全员观看他了,则不做处理
|
||||||
await _hubContext.Clients.Group(roomNum).ShowUser(uid, uname, UId, UserName);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// 设置房间全员观看用户
|
// 设置房间全员观看用户
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ namespace WGShare.API.Hubs
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="type"></param>
|
/// <param name="type"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task Operation(string contentString);
|
Task Operation(int type);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 更新视图
|
/// 更新视图
|
||||||
|
|
|
||||||
|
|
@ -293,9 +293,9 @@ namespace WGShare.API.Hubs
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HubMethodName("sendOper")]
|
[HubMethodName("sendOper")]
|
||||||
public async Task SendOperation(string roomNum, string contentString)
|
public async Task SendOperation(string roomNum, int type)
|
||||||
{
|
{
|
||||||
await Clients.Group(roomNum).Operation(contentString);
|
await Clients.Group(roomNum).Operation(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -311,12 +311,6 @@
|
||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:WGShare.API.Controllers.Frontend.RoomController.StopedSharedScreen(System.String)">
|
|
||||||
<summary>
|
|
||||||
共享人取消共享屏幕
|
|
||||||
</summary>
|
|
||||||
<returns></returns>
|
|
||||||
</member>
|
|
||||||
<member name="M:WGShare.API.Controllers.Frontend.RoomController.AddFile(WGShare.Domain.DTOs.File.ShareFileInputDTO)">
|
<member name="M:WGShare.API.Controllers.Frontend.RoomController.AddFile(WGShare.Domain.DTOs.File.ShareFileInputDTO)">
|
||||||
<summary>
|
<summary>
|
||||||
分享上传文件
|
分享上传文件
|
||||||
|
|
@ -619,7 +613,7 @@
|
||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:WGShare.API.Hubs.IMessageClient.Operation(System.String)">
|
<member name="M:WGShare.API.Hubs.IMessageClient.Operation(System.Int32)">
|
||||||
<summary>
|
<summary>
|
||||||
客户端操作
|
客户端操作
|
||||||
</summary>
|
</summary>
|
||||||
|
|
@ -638,12 +632,6 @@
|
||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:WGShare.API.Hubs.IMessageClient.StopedSharedScreen(System.String)">
|
|
||||||
<summary>
|
|
||||||
共享人取消共享屏幕
|
|
||||||
</summary>
|
|
||||||
<returns></returns>
|
|
||||||
</member>
|
|
||||||
<member name="M:WGShare.API.Hubs.IMessageClient.UserJoined(WGShare.Domain.Entities.ChannelUserInfo)">
|
<member name="M:WGShare.API.Hubs.IMessageClient.UserJoined(WGShare.Domain.Entities.ChannelUserInfo)">
|
||||||
<summary>
|
<summary>
|
||||||
用户加入频道回调
|
用户加入频道回调
|
||||||
|
|
@ -784,7 +772,7 @@
|
||||||
<param name="rooNum"></param>
|
<param name="rooNum"></param>
|
||||||
<param name="msg"></param>
|
<param name="msg"></param>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:WGShare.API.Hubs.SessionManageHub.SendOperation(System.String,System.String)">
|
<member name="M:WGShare.API.Hubs.SessionManageHub.SendOperation(System.String,System.Int32)">
|
||||||
<summary>
|
<summary>
|
||||||
发送客户端指令
|
发送客户端指令
|
||||||
</summary>
|
</summary>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue