jeremy 1 жил өмнө
parent
commit
3b9bd9b91a

+ 2 - 1
WingRtcService/RtcRoomManager.cs

@@ -5,6 +5,7 @@ using WingServerCommon.Interfaces.Cache;
 using WingInterfaceLibrary.DTO.LiveRoom;
 using WingServerCommon.Log;
 using WingInterfaceLibrary.Notifications.Live;
+using Newtonsoft.Json;
 
 namespace WingRtcService
 {
@@ -79,7 +80,7 @@ namespace WingRtcService
                         }
                         if (room.DeviceInfos != null && room.DeviceInfos.Any(d => d.Code == deviceCode && d.Status == LiveMemberStatus.Joined))
                         {
-                            Logger.WriteLineWarn($"RTCService GetInitiatingRoomByDeviceCode Exist Room, RoomId: {room.LiveRoomCode}, deviceCode: {deviceCode}");
+                            Logger.WriteLineWarn($"RTCService GetInitiatingRoomByDeviceCode Exist Room, RoomId: {room.LiveRoomCode}, room: { JsonConvert.SerializeObject(room) }, deviceCode: {deviceCode}");
                             return room;
                         }
                     }

+ 10 - 0
WingRtcService/RtcService.Live.cs

@@ -11,6 +11,7 @@ using WingServerCommon.Interfaces.Cache;
 using WingServerCommon.Utilities;
 using WingServerCommon.Log;
 using WingInterfaceLibrary.Request;
+using Newtonsoft.Json;
 
 namespace WingRtcService
 {
@@ -160,8 +161,11 @@ namespace WingRtcService
             var roomId = request.LiveRoomCode;
             var initiatorCode = request.InitiatorCode;
             var room = _rtcRoomManager.Get(roomId);
+            
+            Logger.WriteLineInfo($"RTCService InitiateAsync 1, room:{ JsonConvert.SerializeObject(room) }");
             var deviceCode = room.DeviceInfos.FirstOrDefault()?.Code ?? string.Empty;
             var existedRoom = _rtcRoomManager.GetInitiatingRoomByDeviceCode(deviceCode, room.LiveRoomCode);
+            Logger.WriteLineInfo($"RTCService InitiateAsync 2, existedRoom:{JsonConvert.SerializeObject(existedRoom)}");
             var rtcRoomId = room.RtcRoomId;
             var existedLiveRooms = new List<LiveMemberDTO>();
             if (rtcRoomId == 0 || room.Status != LiveRoomStatus.Initiating)
@@ -170,6 +174,8 @@ namespace WingRtcService
                 {
                     rtcRoomId = existedRoom.RtcRoomId;
                     existedLiveRooms = existedRoom.GetRoomMemberInfos() ?? new List<LiveMemberDTO>();
+                    
+                    Logger.WriteLineInfo($"RTCService InitiateAsync 3, existedRoom:{JsonConvert.SerializeObject(existedRoom)}");
                 }
                 else
                 {
@@ -179,6 +185,8 @@ namespace WingRtcService
                     };
                     var getRoomIdResult = await GetRoomIdAsync(getRoomIdRequest);
                     rtcRoomId = (int)getRoomIdResult.RoomId;
+                    
+                    Logger.WriteLineInfo($"RTCService InitiateAsync 4, getRoomIdResult:{JsonConvert.SerializeObject(getRoomIdResult)}");
                 }
             }
             var deviceTokenInfo = CacheMaintenance.Instance.Get<ITokensManager>().Where(x => x.ClientId == deviceCode).FirstOrDefault();
@@ -390,7 +398,9 @@ namespace WingRtcService
             {
                 //删掉超声机
                 RemoveLiveMemberAsync(roomId, liveMember, room.InitiatorCode);
+                Logger.WriteLineInfo($"RtcRoom LeaveAsync 1, roomId:{roomId}, room:{ JsonConvert.SerializeObject(room) }");
                 room.DeviceInfos.Remove(liveMember);
+                Logger.WriteLineInfo($"RtcRoom LeaveAsync 2, roomId:{roomId}, room:{ JsonConvert.SerializeObject(room) }");
                 syncInfo.OperatorCode = request.DeviceCode;
                 syncInfo.ReferCodes = new List<string>() { request.UserCode };
                 await SyncToMasterAsync(SyncTypeEnum.LeaveDevice, roomId, room.Name, syncInfo);