diff --git a/WGShare.API/Controllers/Frontend/RoomController.cs b/WGShare.API/Controllers/Frontend/RoomController.cs index 491c4ae..7556f42 100644 --- a/WGShare.API/Controllers/Frontend/RoomController.cs +++ b/WGShare.API/Controllers/Frontend/RoomController.cs @@ -414,7 +414,8 @@ namespace WGShare.API.Controllers.Frontend if (RedisHelper.Instance.HGet(RedisKeyConstant.SessionManage.GetChannelShowUserKey(TenantId), roomNum) == uid) { - // 如果已经是全员观看他了,则不做处理 + // 如果已经是全员观看他了, 直接通知其他房间用户 + await _hubContext.Clients.Group(roomNum).ShowUser(uid, uname, UId, UserName); return; } // 设置房间全员观看用户 diff --git a/WGShare.API/Hubs/IMessageClient.cs b/WGShare.API/Hubs/IMessageClient.cs index 8aa358d..822a8aa 100644 --- a/WGShare.API/Hubs/IMessageClient.cs +++ b/WGShare.API/Hubs/IMessageClient.cs @@ -47,7 +47,7 @@ namespace WGShare.API.Hubs /// /// /// - Task Operation(int type); + Task Operation(string contentString); /// /// 更新视图 diff --git a/WGShare.API/Hubs/SessionManageHub.cs b/WGShare.API/Hubs/SessionManageHub.cs index f1f000a..accdf9d 100644 --- a/WGShare.API/Hubs/SessionManageHub.cs +++ b/WGShare.API/Hubs/SessionManageHub.cs @@ -293,9 +293,9 @@ namespace WGShare.API.Hubs /// /// [HubMethodName("sendOper")] - public async Task SendOperation(string roomNum, int type) + public async Task SendOperation(string roomNum, string contentString) { - await Clients.Group(roomNum).Operation(type); + await Clients.Group(roomNum).Operation(contentString); } /// diff --git a/WGShare.API/WGShare.API.xml b/WGShare.API/WGShare.API.xml index 4766f06..b62a0f5 100644 --- a/WGShare.API/WGShare.API.xml +++ b/WGShare.API/WGShare.API.xml @@ -311,6 +311,12 @@ + + + 共享人取消共享屏幕 + + + 分享上传文件 @@ -613,7 +619,7 @@ - + 客户端操作 @@ -632,6 +638,12 @@ + + + 共享人取消共享屏幕 + + + 用户加入频道回调 @@ -772,7 +784,7 @@ - + 发送客户端指令