Commit 661c1d35 by liulongfei

1. 修复NDI流选空时的逻辑问题

parent cb9d3722
...@@ -187,8 +187,6 @@ namespace VIZ.H2V.Module ...@@ -187,8 +187,6 @@ namespace VIZ.H2V.Module
private void LoadNdiStreamInfo() private void LoadNdiStreamInfo()
{ {
NDIStream ndiStream = VideoStreamManager.Get<NDIStream>(this.ViewKey); NDIStream ndiStream = VideoStreamManager.Get<NDIStream>(this.ViewKey);
if (ndiStream.StreamInfos == null || ndiStream.StreamInfos.Count == 0)
return;
List<NDIStreamInfoModel> list = new List<NDIStreamInfoModel>(); List<NDIStreamInfoModel> list = new List<NDIStreamInfoModel>();
NDIStreamInfoModel none = new NDIStreamInfoModel(); NDIStreamInfoModel none = new NDIStreamInfoModel();
...@@ -196,16 +194,19 @@ namespace VIZ.H2V.Module ...@@ -196,16 +194,19 @@ namespace VIZ.H2V.Module
NDIStreamInfoModel selected = none; NDIStreamInfoModel selected = none;
foreach (NDIStreamInfo info in ndiStream.StreamInfos) if (ndiStream.StreamInfos != null && ndiStream.StreamInfos.Count > 0)
{ {
NDIStreamInfoModel model = new NDIStreamInfoModel(); foreach (NDIStreamInfo info in ndiStream.StreamInfos)
model.FullName = info.FullName;
if (model.FullName == ndiStream.RemoteSenderName)
{ {
selected = model; NDIStreamInfoModel model = new NDIStreamInfoModel();
model.FullName = info.FullName;
if (model.FullName == ndiStream.RemoteSenderName)
{
selected = model;
}
list.Add(model);
} }
list.Add(model);
} }
this.NDIStreamInfos = list; this.NDIStreamInfos = list;
...@@ -361,7 +362,7 @@ namespace VIZ.H2V.Module ...@@ -361,7 +362,7 @@ namespace VIZ.H2V.Module
&& p.IsSendToCrop == true && p.IsSendToCrop == true
&& p.ViewKey != this.ViewKey); && p.ViewKey != this.ViewKey);
if (viewConfig == null) if (viewConfig == null || string.IsNullOrWhiteSpace(viewConfig.StreamName))
return true; return true;
this.IsSendToCrop = false; this.IsSendToCrop = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment