推流由先判断设备数量，改为先判断合流还是分流

Vinno.vCloud.Common.FIS/LiveVideos/LiveVideoPusherV2.cs

@@ -399,24 +399,24 @@ namespace Vinno.vCloud.Common.FIS.LiveVideos
             if (liveEventArgs.Protocol == EnumLiveProtocol.RTC)
             {
                 var rtcExtendedData = liveEventArgs.ExtendedData as RtcExtendedData;
-                if (rtcExtendedData.UserInfos.Count() <= 1)
+                if (liveEventArgs.PushMode == EnumLiveDataMode.MergeLive)
                 {
-                    return EnumPusherType.RtcSingle;
+                    if (liveEventArgs.ExtendedData.MergeType == EnumMergeType.Merge1280X720)
+                    {
+                        return EnumPusherType.USRtcMerge;
+                    }
+                    else if (liveEventArgs.ExtendedData.MergeType == EnumMergeType.Merge1920X1080)
+                    {
+                        return EnumPusherType.RtcMerge;
+                    }
                 }
-                else
+                else if (liveEventArgs.PushMode == EnumLiveDataMode.OnlyLive)
                 {
-                    if (liveEventArgs.PushMode == EnumLiveDataMode.MergeLive)
+                    if (rtcExtendedData.UserInfos.Count() <= 1)
                     {
-                        if (liveEventArgs.ExtendedData.MergeType == EnumMergeType.Merge1280X720)
-                        {
-                            return EnumPusherType.USRtcMerge;
-                        }
-                        else if (liveEventArgs.ExtendedData.MergeType == EnumMergeType.Merge1920X1080)
-                        {
-                            return EnumPusherType.RtcMerge;
-                        }
+                        return EnumPusherType.RtcSingle;
                     }
-                    else if (liveEventArgs.PushMode == EnumLiveDataMode.OnlyLive)
+                    else
                     {
                         return EnumPusherType.RtcMulti;
                     }
@@ -425,24 +425,25 @@ namespace Vinno.vCloud.Common.FIS.LiveVideos
             else if (liveEventArgs.Protocol == EnumLiveProtocol.Rtmp)
             {
                 var rtmpExtendedData = liveEventArgs.ExtendedData as RtmpExtendedData;
-                if (rtmpExtendedData.UserInfos.Count() <= 1)
+
+                if (liveEventArgs.PushMode == EnumLiveDataMode.MergeLive)
                 {
-                    return EnumPusherType.RtmpSingle;
+                    if (liveEventArgs.ExtendedData.MergeType == EnumMergeType.Merge1280X720)
+                    {
+                        return EnumPusherType.USRtmpMerge;
+                    }
+                    else if (liveEventArgs.ExtendedData.MergeType == EnumMergeType.Merge1920X1080)
+                    {
+                        return EnumPusherType.RtmpMerge;
+                    }
                 }
-                else
+                else if (liveEventArgs.PushMode == EnumLiveDataMode.OnlyLive)
                 {
-                    if (liveEventArgs.PushMode == EnumLiveDataMode.MergeLive)
+                    if (rtmpExtendedData.UserInfos.Count() <= 1)
                     {
-                        if (liveEventArgs.ExtendedData.MergeType == EnumMergeType.Merge1280X720)
-                        {
-                            return EnumPusherType.USRtmpMerge;
-                        }
-                        else if (liveEventArgs.ExtendedData.MergeType == EnumMergeType.Merge1920X1080)
-                        {
-                            return EnumPusherType.RtmpMerge;
-                        }
+                        return EnumPusherType.RtmpSingle;
                     }
-                    else if (liveEventArgs.PushMode == EnumLiveDataMode.OnlyLive)
+                    else
                     {
                         return EnumPusherType.RtmpMulti;
                     }