Эх сурвалжийг харах

调试版魔盒MachineId带上Test-前缀,合流单路而非主通道时,Nullreference的问题修复。

felix 1 жил өмнө
parent
commit
275e2e8ac6

+ 1 - 0
Vinno.FIS.Sonopost/Managers/FISManager.cs

@@ -76,6 +76,7 @@ namespace Vinno.FIS.Sonopost.Managers
             var currentVersion = Assembly.GetExecutingAssembly()?.GetName()?.Version.ToString();
 #if DEBUG
             currentVersion = "1.7.54.26288";
+            machineId = "Test-" + machineId;
 #endif
             var modelType = SonopostSystemSettings.Instance.ModelType;
             if (string.IsNullOrWhiteSpace(modelType))

+ 1 - 1
Vinno.vCloud.FIS.CrossPlatform.Windows/LiveVideo/RTC/RtcMergePusher.cs

@@ -34,7 +34,7 @@ namespace Vinno.vCloud.FIS.CrossPlatform.Windows.LiveVideo.RTC
                 _pusher = new TRTCPusher();
                 _pusher.FirstFrameSend += OnFirstFrameSend;
 
-                var userInfo = rtcParams.UserInfos?.FirstOrDefault(f => f.Category == EnumLiveChannelCategory.Main);
+                var userInfo = rtcParams.UserInfos?.FirstOrDefault(f => f.Category == EnumLiveChannelCategory.Main) ?? rtcParams.UserInfos?.FirstOrDefault(); ;
                 _pusher.EnterRoom(userInfo.UserId, (uint)rtcParams.RoomId, userInfo.UserSign, (uint)rtcParams.AppId, _videoResolution, MergeFrameRate, 3000, 2000, true, pushParams.IsMute, pushParams.MicDeviceId);
                 return base.StartPusher(pushParams, deviceInfos);
             }

+ 1 - 1
Vinno.vCloud.FIS.CrossPlatform.Windows/LiveVideo/RTC/RtcMergePusherV2.cs

@@ -34,7 +34,7 @@ namespace Vinno.vCloud.FIS.CrossPlatform.Windows.LiveVideo.RTC
                 _videoResolution = TRTCVideoResolution.TRTCVideoResolution_1920_1080;
                 _pusher = new TRTCPusher();
                 _pusher.FirstFrameSend += OnFirstFrameSend;
-                var userInfo = rtcParams.UserInfos?.FirstOrDefault(f => f.Category == EnumLiveChannelCategory.Main);
+                var userInfo = rtcParams.UserInfos?.FirstOrDefault(f => f.Category == EnumLiveChannelCategory.Main) ?? rtcParams.UserInfos?.FirstOrDefault();
                 _pusher.EnterRoom(userInfo.UserId, (uint)rtcParams.RoomId, userInfo.UserSign, (uint)rtcParams.AppId, _videoResolution, (uint)userInfo.VideoFps, (uint)userInfo.VideoBitrate, (uint)userInfo.MinVideoBitrate, true, pushParams.IsMute, pushParams.MicDeviceId);
                 return base.StartPusher(pushParams, deviceInfos);
             }

+ 1 - 1
Vinno.vCloud.FIS.CrossPlatform.Windows/LiveVideo/RTC/USRtcMergePusherV2.cs

@@ -34,7 +34,7 @@ namespace Vinno.vCloud.FIS.CrossPlatform.Windows.LiveVideo.RTC
                 _videoResolution = TRTCVideoResolution.TRTCVideoResolution_1280_720;
                 _pusher = new TRTCPusher();
                 _pusher.FirstFrameSend += OnFirstFrameSend;
-                var userInfo = rtcParams.UserInfos?.FirstOrDefault(f => f.Category == EnumLiveChannelCategory.Main);
+                var userInfo = rtcParams.UserInfos?.FirstOrDefault(f => f.Category == EnumLiveChannelCategory.Main) ?? rtcParams.UserInfos?.FirstOrDefault();
                 _pusher.EnterRoom(userInfo.UserId, (uint)rtcParams.RoomId, userInfo.UserSign, (uint)rtcParams.AppId, _videoResolution, (uint)userInfo.VideoFps, (uint)userInfo.VideoBitrate, (uint)userInfo.MinVideoBitrate, true, pushParams.IsMute, pushParams.MicDeviceId);
                 return base.StartPusher(pushParams, deviceInfos);
             }