Commit 597c6690 by liulongfei

隐藏部分按钮

parent 9ee8557f
......@@ -36,7 +36,14 @@ namespace VIZ.H2V.Connection
package.height = height;
package.timecode = timeCode;
manager.SendJson(package);
try
{
manager.SendJson(package);
}
catch
{
// 发送裁切信息如果报错则不处理
}
}
}
}
......@@ -166,7 +166,7 @@ namespace VIZ.H2V.Module
#region IsShowLocalStream -- 是否仅显示本机输入源
private bool isShowLocalStream = true;
private bool isShowLocalStream = false;
/// <summary>
/// 是否仅显示本机输入源
/// </summary>
......
......@@ -266,36 +266,10 @@
</Border>
<!-- 显示边线 -->
<Border ToolTip="显示边线" Background="Transparent" Margin="0,0,10,0">
<CheckBox Style="{StaticResource CheckBox_IsBorderShow}" Width="32" Height="32"
IsEnabled="{Binding Path=ViewStatus,Converter={StaticResource NDIViewStatus2IsEnabledConverter}}"
IsChecked="{Binding Path=AlgorithmConfig.IsShowBorder,Mode=TwoWay}">
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Checked">
<behaviors:InvokeCommandAction Command="{Binding IsBorderShowChangedCommand}" />
</behaviors:EventTrigger>
<behaviors:EventTrigger EventName="Unchecked">
<behaviors:InvokeCommandAction Command="{Binding IsBorderShowChangedCommand}" />
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
</CheckBox>
</Border>
<!-- 隐藏该功能,算法已经弃用 -->
<!-- 启用边线过滤 -->
<Border ToolTip="启用边线过滤" Background="Transparent" Margin="0,0,0,0">
<CheckBox Style="{StaticResource CheckBox_IsBorderEnabled}" Width="32" Height="32"
IsEnabled="{Binding Path=ViewStatus,Converter={StaticResource NDIViewStatus2IsEnabledConverter}}"
IsChecked="{Binding Path=AlgorithmConfig.IsBorderEnabled,Mode=TwoWay}">
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Checked">
<behaviors:InvokeCommandAction Command="{Binding IsBorderEnabledChangedCommand}" />
</behaviors:EventTrigger>
<behaviors:EventTrigger EventName="Unchecked">
<behaviors:InvokeCommandAction Command="{Binding IsBorderEnabledChangedCommand}" />
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
</CheckBox>
</Border>
<!-- 隐藏该功能,算法已经弃用 -->
</StackPanel>
</Grid>
......
......@@ -44,6 +44,10 @@ namespace VIZ.H2V.Module
// -----------------------------------------------------------------
// 客户端
string clientIP = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, string>(p => p.UDP_BINDING_IP);
if (string.IsNullOrWhiteSpace(clientIP))
{
clientIP = NetHelper.GetLocalFirstIPv4Address();
}
int clientPort = ApplicationDomainEx.IniStorage.GetValue<UdpConfig, int>(p => p.UDP_BINDING_PORT);
conn.Binding(clientIP, clientPort);
......
......@@ -66,8 +66,8 @@ NAVIGATION3D_PROFILE_NAME=VIZ.H2V
; === UDP ===
; ============================================================
[UDP]
;UDP本机绑定IP
UDP_BINDING_IP=127.0.0.1
;UDP本机绑定IP, 如果该值不配置,那么会获取本机的第一个IPV4地址
UDP_BINDING_IP=
;UDP本机绑定端口
UDP_BINDING_PORT=8101
; ============================================================
......
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