调整

Service/DeviceService.cs

@@ -1112,12 +1112,12 @@ namespace WingDeviceService.Service
                 DeviceCode = deviceCode
             });
             var liveRoom = liveRooms?.FirstOrDefault(x => x.Status == LiveRoomStatus.Initiating);
-            WingInterfaceLibrary.DTO.RTC.LiveMemberDTO deviceMemberInfo;
+            LiveMemberDTO deviceMemberInfo;
             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
                     {
@@ -1146,16 +1146,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(),
+                // 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
@@ -1183,7 +1183,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
                 {