Skip to content

V
VIZ.H2V
Commit 352f4242 by liulongfei
Options

修复手动按钮是否可用异常问题

parent 780f3ea9
Showing with 7 additions and 10 deletions
VIZ.H2V.Module/NDIMainView/View/NDIMainView.xaml
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}" Grid.Row="0" Grid.Column="0" Margin="30"></local:NDIView> <local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}" Grid.Row="0" Grid.Column="0" Margin="30"></local:NDIView>
<!--<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" Grid.Row="0" Grid.Column="1" Margin="30"></local:NDIView> <local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" Grid.Row="0" Grid.Column="1" Margin="30"></local:NDIView>
<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" Grid.Row="1" Grid.Column="0" Margin="30"></local:NDIView> <local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" Grid.Row="1" Grid.Column="0" Margin="30"></local:NDIView>
<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_4}" Grid.Row="1" Grid.Column="1" Margin="30"></local:NDIView>--> <local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_4}" Grid.Row="1" Grid.Column="1" Margin="30"></local:NDIView>
</Grid> </Grid>
<!-- 底部 --> <!-- 底部 -->
<Border Grid.Row="2" Background="#ff12202d"> <Border Grid.Row="2" Background="#ff12202d">
......
VIZ.H2V.Module/NDIView/View/NDIView.xaml
...@@ -98,7 +98,8 @@ ...@@ -98,7 +98,8 @@
Style="{StaticResource RadioButton_NdiView}" IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}"> Style="{StaticResource RadioButton_NdiView}" IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}">
</RadioButton> </RadioButton>
<RadioButton Content="手动" Grid.Row="2" FontSize="16" Foreground="White" <RadioButton Content="手动" Grid.Row="2" FontSize="16" Foreground="White"
IsEnabled="{Binding Path=IsManualModeEnabled,Mode=OneWay}" IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}" IsEnabled="{Binding Path=IsManualModeEnabled,Mode=OneWay}"
IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiView}"> Style="{StaticResource RadioButton_NdiView}">
</RadioButton> </RadioButton>
</Grid> </Grid>
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
...@@ -191,11 +191,7 @@ namespace VIZ.H2V.Module ...@@ -191,11 +191,7 @@ namespace VIZ.H2V.Module
set set
{ {
viewStatus = value; viewStatus = value;
// 该属性在多个线程中进行修改，需要调整至UI线程处理 this.RaisePropertySaveChanged(nameof(ViewStatus));
WPFHelper.Invoke(() =>
{
this.RaisePropertyChanged(nameof(ViewStatus));
});
} }
} }
...@@ -343,14 +339,14 @@ namespace VIZ.H2V.Module ...@@ -343,14 +339,14 @@ namespace VIZ.H2V.Module
#region IsManualModeEnabled -- 手动模式是否可用 #region IsManualModeEnabled -- 手动模式是否可用
private bool isManualModeEnabled = true; private bool isManualModeEnabled;
/// <summary> /// <summary>
/// 手动模式是否可用 /// 手动模式是否可用
/// </summary> /// </summary>
public bool IsManualModeEnabled public bool IsManualModeEnabled
{ {
get { return isManualModeEnabled; } get { return isManualModeEnabled; }
set { isManualModeEnabled = value; this.RaisePropertyChanged(nameof(IsManualModeEnabled)); } set { isManualModeEnabled = value; this.RaisePropertySaveChanged(nameof(IsManualModeEnabled)); }
} }
#endregion #endregion
......
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