|
|
@@ -34,7 +34,7 @@ using WingInterfaceLibrary.DTO.RTC;
|
|
|
using Newtonsoft.Json;
|
|
|
using WingInterfaceLibrary.Notifications.Live;
|
|
|
using WingInterfaceLibrary.Enum.NotificationEnum;
|
|
|
-using WingInterfaceLibrary.Request.Examine;
|
|
|
+using WingInterfaceLibrary.DTO.LiveRoom;
|
|
|
using WingInterfaceLibrary.Request.DBRequest;
|
|
|
using WingInterfaceLibrary.DTO.Record;
|
|
|
using WingInterfaceLibrary.DTO.Consultation;
|
|
|
@@ -1123,8 +1123,8 @@ namespace WingDeviceService.Service
|
|
|
if (liveRoom != null)
|
|
|
{
|
|
|
|
|
|
- deviceMemberInfo = liveRoom.Members.FirstOrDefault(x => x.Id == deviceCode);
|
|
|
- if (deviceMemberInfo?.Status == LiveMemberStatusEnum.Joined)
|
|
|
+ deviceMemberInfo = liveRoom.Members.FirstOrDefault(x => x.Code == deviceCode);
|
|
|
+ if (deviceMemberInfo?.Status == LiveMemberStatus.Joined)
|
|
|
{
|
|
|
return new JoinDeviceLiveRoomResult
|
|
|
{
|
|
|
@@ -1153,16 +1153,16 @@ namespace WingDeviceService.Service
|
|
|
UserName = userInfo.AccountName,
|
|
|
});
|
|
|
|
|
|
- deviceMemberInfo = initiateResult.Members.FirstOrDefault(x => x.Id == deviceCode);
|
|
|
+ deviceMemberInfo = initiateResult.Members.FirstOrDefault(x => x.Code == deviceCode);
|
|
|
var message = new StartLiveToDeviceNotification
|
|
|
{
|
|
|
LiveRoomCode = initiateResult.RoomId,
|
|
|
RoomNo = initiateResult.RoomNo,
|
|
|
AppId = _sdkAppId,
|
|
|
- MergedChannel = deviceMemberInfo.MergedChannel,
|
|
|
- MergedVideoOutputWidth = deviceMemberInfo.MergedVideoOutputWidth,
|
|
|
- MergedVideoOutputHeight = deviceMemberInfo.MergedVideoOutputHeight,
|
|
|
- VideoDeviceOutputList = deviceMemberInfo.VideoDeviceInfos.ToList(),
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
};
|
|
|
await BroadcastNotificationAsync(liveRoom.RoomId, new List<string> { deviceCode }, message);
|
|
|
return new JoinDeviceLiveRoomResult
|
|
|
@@ -1190,7 +1190,7 @@ namespace WingDeviceService.Service
|
|
|
var liveRoom = liveRooms?.FirstOrDefault(x => x.Status == LiveRoomStatus.Initiating);
|
|
|
if (liveRoom != null)
|
|
|
{
|
|
|
- var deviceCode = liveRoom.DeviceInfos?.FirstOrDefault()?.Id;
|
|
|
+ var deviceCode = liveRoom.DeviceInfos?.FirstOrDefault()?.Code;
|
|
|
|
|
|
var removeViewerResult = await _rtcService.RemoveViewerAsync(new RemoveViewerRequest
|
|
|
{
|
