Skip to content

H
hemei
Commit 7d34cd0d authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修复 收卷V4 无法写入电机启动

parent 941dc691
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 53 deletions
Project.FLY.Winder/FLY.Winder.UI.Client/UiModule/V4/MainPanelV4.xaml
View file @ 7d34cd0d
...@@ -337,14 +337,15 @@ ...@@ -337,14 +337,15 @@
</StackPanel> </StackPanel>
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="1" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="1"
IsChecked="{Binding Accessory.IsTraction1On}" IsChecked="{Binding IsTraction1On}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}" OnBrush="{StaticResource Color_on}"
DataContext="{Binding Accessory}"
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Accessory.IsTraction1OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsTraction1OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<!--二牵引--> <!--二牵引-->
...@@ -383,20 +384,22 @@ ...@@ -383,20 +384,22 @@
<flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="2" <flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="2"
IsChecked="{Binding Accessory.IsTraction2Manual}" IsChecked="{Binding IsTraction2Manual}"
OffLabel="自动" OffBrush="{StaticResource Color_on}" OffLabel="自动" OffBrush="{StaticResource Color_on}"
OnLabel="手动" OnBrush="{StaticResource Color_off}" OnLabel="手动" OnBrush="{StaticResource Color_off}"
DataContext="{Binding Accessory}"
/> />
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="2" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="2"
IsChecked="{Binding Accessory.IsTraction2On}" IsChecked="{Binding IsTraction2On}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}"> OnBrush="{StaticResource Color_on}"
DataContext="{Binding Accessory}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Accessory.IsTraction2OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsTraction2OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -437,20 +440,22 @@ ...@@ -437,20 +440,22 @@
<flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="3" <flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="3"
IsChecked="{Binding Accessory.IsTraction2Manual}" IsChecked="{Binding IsTraction2Manual}"
OffLabel="自动" OffBrush="{StaticResource Color_on}" OffLabel="自动" OffBrush="{StaticResource Color_on}"
OnLabel="手动" OnBrush="{StaticResource Color_off}" OnLabel="手动" OnBrush="{StaticResource Color_off}"
DataContext="{Binding Accessory}"
/> />
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="3" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="3"
IsChecked="{Binding Accessory.IsTraction3On}" IsChecked="{Binding IsTraction3On}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}"> OnBrush="{StaticResource Color_on}"
DataContext="{Binding Accessory}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Accessory.IsTraction3OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsTraction3OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -494,14 +499,15 @@ ...@@ -494,14 +499,15 @@
/> />
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="4" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="4"
IsChecked="{Binding Items[0].IsOn}" IsChecked="{Binding IsOn}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}" OnBrush="{StaticResource Color_on}"
DataContext="{Binding Items[0]}"
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[0].IsOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -541,20 +547,22 @@ ...@@ -541,20 +547,22 @@
Text="A" /> Text="A" />
</StackPanel> </StackPanel>
<flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="5" <flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="5"
IsChecked="{Binding Items[1].IsManual}" IsChecked="{Binding IsManual}"
OffLabel="自动" OffBrush="{StaticResource Color_on}" OffLabel="自动" OffBrush="{StaticResource Color_on}"
OnLabel="手动" OnBrush="{StaticResource Color_off}" OnLabel="手动" OnBrush="{StaticResource Color_off}"
DataContext="{Binding Items[1]}"
/> />
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="5" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="5"
IsChecked="{Binding Items[1].IsOn}" IsChecked="{Binding IsOn}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}" OnBrush="{StaticResource Color_on}"
DataContext="{Binding Items[1]}"
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[1].IsOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
</Grid> </Grid>
...@@ -716,10 +724,11 @@ ...@@ -716,10 +724,11 @@
Text="mm"/> Text="mm"/>
</StackPanel> </StackPanel>
<Button Grid.Column="1" <Button Grid.Column="1"
Style="{StaticResource ButtonStyle_resizeIcon}" Margin="5,00" VerticalAlignment="Bottom" Style="{StaticResource ButtonStyle_resizeIcon}" Margin="5,00" VerticalAlignment="Bottom"
Foreground="{StaticResource Color_warning}"> Foreground="{StaticResource Color_warning}"
DataContext="{Binding Items[0]}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[0].DiameterReset}"/> <flyctrl:ResetBehavior Binding="{Binding DiameterReset}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid> <Grid>
<Rectangle Width="40" Height="40" Fill="White"/> <Rectangle Width="40" Height="40" Fill="White"/>
...@@ -822,10 +831,11 @@ ...@@ -822,10 +831,11 @@
Text="mm"/> Text="mm"/>
</StackPanel> </StackPanel>
<Button Grid.Column="1" <Button Grid.Column="1"
Style="{StaticResource ButtonStyle_resizeIcon}" Margin="5,0" VerticalAlignment="Bottom" Style="{StaticResource ButtonStyle_resizeIcon}" Margin="5,0" VerticalAlignment="Bottom"
Foreground="{StaticResource Color_warning}"> Foreground="{StaticResource Color_warning}"
DataContext="{Binding Items[1]}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[1].DiameterReset}"/> <flyctrl:ResetBehavior Binding="{Binding DiameterReset}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid> <Grid>
<Rectangle Width="40" Height="40" Fill="White"/> <Rectangle Width="40" Height="40" Fill="White"/>
...@@ -972,14 +982,17 @@ ...@@ -972,14 +982,17 @@
</StackPanel> </StackPanel>
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="1" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="1"
IsChecked="{Binding Accessory.IsTraction1On}" IsChecked="{Binding IsTraction1On}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}" OnBrush="{StaticResource Color_on}"
DataContext="{Binding Accessory}"
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Accessory.IsTraction1OnSet}"/> <!--ResetBehavior Binding.Path 不支持多级属性，不能写 Accessory.IsTraction1OnSet-->
<!--ResetBehavior 会获取 DataContext-->
<flyctrl:ResetBehavior Binding="{Binding IsTraction1OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<!--二牵引--> <!--二牵引-->
...@@ -1018,52 +1031,56 @@ ...@@ -1018,52 +1031,56 @@
<flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="2" <flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="2"
IsChecked="{Binding Accessory.IsTraction2Manual}" IsChecked="{Binding IsTraction2Manual}"
OffLabel="自动" OffBrush="{StaticResource Color_on}" OffLabel="自动" OffBrush="{StaticResource Color_on}"
OnLabel="手动" OnBrush="{StaticResource Color_off}" OnLabel="手动" OnBrush="{StaticResource Color_off}"
DataContext="{Binding Accessory}"
/> />
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="2" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="2"
IsChecked="{Binding Accessory.IsTraction2On}" IsChecked="{Binding IsTraction2On}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}"> OnBrush="{StaticResource Color_on}"
DataContext="{Binding Accessory}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Accessory.IsTraction2OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsTraction2OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<!--三牵引--> <!--三牵引-->
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="1" Grid.Row="3" Visibility="{Binding Accessory.HasT3,Converter={StaticResource visbilityconv}}"> <StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="1" Grid.Row="3" Visibility="{Binding HasT3,Converter={StaticResource visbilityconv}}"
DataContext="{Binding Accessory}">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}"
Foreground="{StaticResource Color_text_activity}" Foreground="{StaticResource Color_text_activity}"
Background="{StaticResource Color_text_activity_background}" Background="{StaticResource Color_text_activity_background}"
Text="{Binding Accessory.Traction3TensionKgSet,StringFormat={}{0:F1}}" /> Text="{Binding Traction3TensionKgSet,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}"
FontSize="{StaticResource FontSize_unit}" FontSize="{StaticResource FontSize_unit}"
Foreground="{StaticResource Color_unit}" Foreground="{StaticResource Color_unit}"
Text="kg" /> Text="kg" />
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="2" Grid.Row="3" Visibility="{Binding Accessory.HasT3,Converter={StaticResource visbilityconv}}"> <StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="2" Grid.Row="3" Visibility="{Binding HasT3,Converter={StaticResource visbilityconv}}"
DataContext="{Binding Accessory}">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" <TextBlock Style="{StaticResource Styles.Text.FieldContent}"
FontSize="{StaticResource FontSize_text_large}" FontSize="{StaticResource FontSize_text_large}"
Foreground="{StaticResource Color_text}" Foreground="{StaticResource Color_text}"
Text="{Binding Accessory.Traction3TensionKg,StringFormat={}{0:F1}}" /> Text="{Binding Traction3TensionKg,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}"
FontSize="{StaticResource FontSize_unit}" FontSize="{StaticResource FontSize_unit}"
Foreground="{StaticResource Color_unit}" Foreground="{StaticResource Color_unit}"
Text="kg" /> Text="kg" />
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="3" Grid.Row="3" Visibility="{Binding Accessory.HasT3,Converter={StaticResource visbilityconv}}"> <StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="3" Grid.Row="3" Visibility="{Binding HasT3,Converter={StaticResource visbilityconv}}"
DataContext="{Binding Accessory}">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" <TextBlock Style="{StaticResource Styles.Text.FieldContent}"
FontSize="{StaticResource FontSize_text_large}" FontSize="{StaticResource FontSize_text_large}"
Foreground="{StaticResource Color_text}" Foreground="{StaticResource Color_text}"
Text="{Binding Accessory.Traction3Current,StringFormat={}{0:F1}}" /> Text="{Binding Traction3Current,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}"
FontSize="{StaticResource FontSize_unit}" FontSize="{StaticResource FontSize_unit}"
Foreground="{StaticResource Color_unit}" Foreground="{StaticResource Color_unit}"
...@@ -1071,21 +1088,23 @@ ...@@ -1071,21 +1088,23 @@
</StackPanel> </StackPanel>
<flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="3" Visibility="{Binding Accessory.HasT3,Converter={StaticResource visbilityconv}}" <flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="3" Visibility="{Binding HasT3,Converter={StaticResource visbilityconv}}"
IsChecked="{Binding Accessory.IsTraction2Manual}" IsChecked="{Binding IsTraction2Manual}"
OffLabel="自动" OffBrush="{StaticResource Color_on}" OffLabel="自动" OffBrush="{StaticResource Color_on}"
OnLabel="手动" OnBrush="{StaticResource Color_off}" OnLabel="手动" OnBrush="{StaticResource Color_off}"
DataContext="{Binding Accessory}"
/> />
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="3" Visibility="{Binding Accessory.HasT3,Converter={StaticResource visbilityconv}}" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="3" Visibility="{Binding HasT3,Converter={StaticResource visbilityconv}}"
IsChecked="{Binding Accessory.IsTraction3On}" IsChecked="{Binding IsTraction3On}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}"> OnBrush="{StaticResource Color_on}"
DataContext="{Binding Accessory}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Accessory.IsTraction3OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsTraction3OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -1123,20 +1142,22 @@ ...@@ -1123,20 +1142,22 @@
Text="A" /> Text="A" />
</StackPanel> </StackPanel>
<flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="4" <flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="4"
IsChecked="{Binding Items[0].IsManual}" IsChecked="{Binding IsManual}"
OffLabel="自动" OffBrush="{StaticResource Color_on}" OffLabel="自动" OffBrush="{StaticResource Color_on}"
OnLabel="手动" OnBrush="{StaticResource Color_off}" OnLabel="手动" OnBrush="{StaticResource Color_off}"
DataContext="{Binding Items[0]}"
/> />
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="4" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="4"
IsChecked="{Binding Items[0].IsOn}" IsChecked="{Binding IsOn}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}" OnBrush="{StaticResource Color_on}"
DataContext="{Binding Items[0]}"
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[0].IsOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -1176,20 +1197,22 @@ ...@@ -1176,20 +1197,22 @@
Text="A" /> Text="A" />
</StackPanel> </StackPanel>
<flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="5" <flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="5"
IsChecked="{Binding Items[1].IsManual}" IsChecked="{Binding IsManual}"
OffLabel="自动" OffBrush="{StaticResource Color_on}" OffLabel="自动" OffBrush="{StaticResource Color_on}"
OnLabel="手动" OnBrush="{StaticResource Color_off}" OnLabel="手动" OnBrush="{StaticResource Color_off}"
DataContext="{Binding Items[1]}"
/> />
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="5" <flyctrl:NoToggleButton Grid.Column="5" Grid.Row="5"
IsChecked="{Binding Items[1].IsOn}" IsChecked="{Binding IsOn}"
OffLabel="停止" OffLabel="停止"
OffBrush="{StaticResource Color_off}" OffBrush="{StaticResource Color_off}"
OnLabel="运行" OnLabel="运行"
OnBrush="{StaticResource Color_on}" OnBrush="{StaticResource Color_on}"
DataContext="{Binding Items[1]}"
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[1].IsOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
</Grid> </Grid>
...@@ -1354,9 +1377,10 @@ ...@@ -1354,9 +1377,10 @@
</StackPanel> </StackPanel>
<Button Grid.Column="1" <Button Grid.Column="1"
Style="{StaticResource ButtonStyle_resizeIcon}" Margin="5,00" VerticalAlignment="Bottom" Style="{StaticResource ButtonStyle_resizeIcon}" Margin="5,00" VerticalAlignment="Bottom"
Foreground="{StaticResource Color_warning}"> Foreground="{StaticResource Color_warning}"
DataContext="{Binding Items[0]}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[0].DiameterReset}"/> <flyctrl:ResetBehavior Binding="{Binding DiameterReset}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid> <Grid>
<Rectangle Width="40" Height="40" Fill="White"/> <Rectangle Width="40" Height="40" Fill="White"/>
...@@ -1461,9 +1485,10 @@ ...@@ -1461,9 +1485,10 @@
</StackPanel> </StackPanel>
<Button Grid.Column="1" <Button Grid.Column="1"
Style="{StaticResource ButtonStyle_resizeIcon}" Margin="5,0" VerticalAlignment="Bottom" Style="{StaticResource ButtonStyle_resizeIcon}" Margin="5,0" VerticalAlignment="Bottom"
Foreground="{StaticResource Color_warning}"> Foreground="{StaticResource Color_warning}"
DataContext="{Binding Items[1]}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[1].DiameterReset}"/> <flyctrl:ResetBehavior Binding="{Binding DiameterReset}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid> <Grid>
<Rectangle Width="40" Height="40" Fill="White"/> <Rectangle Width="40" Height="40" Fill="White"/>
......
Project.FLY.Winder/FLY.Winder.UI.Client/UiModule/V4/MainPanelV4.xaml.cs
View file @ 7d34cd0d
...@@ -62,20 +62,23 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -62,20 +62,23 @@ namespace FLY.Winder.UI.Client.UiModule
nameof(WinderAccessory.Traction1Current), nameof(WinderAccessory.Traction1Current),
nameof(WinderAccessory.IsTraction1On), nameof(WinderAccessory.IsTraction1On),
//nameof(WinderAccessory.IsTraction1OnSet),//按1松0的不要注册读取
nameof(WinderAccessory.IsTraction2Manual), nameof(WinderAccessory.IsTraction2Manual),
nameof(WinderAccessory.Traction2TensionKgSet), nameof(WinderAccessory.Traction2TensionKgSet),
nameof(WinderAccessory.Traction2TensionKg), nameof(WinderAccessory.Traction2TensionKg),
nameof(WinderAccessory.Traction2Current), nameof(WinderAccessory.Traction2Current),
nameof(WinderAccessory.IsTraction2Manual), nameof(WinderAccessory.IsTraction2Manual),
nameof(WinderAccessory.IsTraction2On), nameof(WinderAccessory.IsTraction2On),
//nameof(WinderAccessory.IsTraction2OnSet),//按1松0的不要注册读取
nameof(WinderAccessory.IsTraction3Manual), nameof(WinderAccessory.IsTraction3Manual),
nameof(WinderAccessory.Traction3TensionKgSet), nameof(WinderAccessory.Traction3TensionKgSet),
nameof(WinderAccessory.Traction3TensionKg), nameof(WinderAccessory.Traction3TensionKg),
nameof(WinderAccessory.Traction3Current), nameof(WinderAccessory.Traction3Current),
nameof(WinderAccessory.IsTraction3Manual), nameof(WinderAccessory.IsTraction3Manual),
nameof(WinderAccessory.IsTraction3On) nameof(WinderAccessory.IsTraction3On),
//nameof(WinderAccessory.IsTraction3OnSet),//按1松0的不要注册读取
}); });
...@@ -96,6 +99,7 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -96,6 +99,7 @@ namespace FLY.Winder.UI.Client.UiModule
nameof(WinderInsideOutside.Current), nameof(WinderInsideOutside.Current),
nameof(WinderInsideOutside.IsManual), nameof(WinderInsideOutside.IsManual),
nameof(WinderInsideOutside.IsOn), nameof(WinderInsideOutside.IsOn),
//nameof(WinderInsideOutside.IsOnSet),//按1松0的不要注册读取
nameof(WinderInsideOutside.CenterInitDia), nameof(WinderInsideOutside.CenterInitDia),
nameof(WinderInsideOutside.CenterDia), nameof(WinderInsideOutside.CenterDia),
...@@ -105,7 +109,15 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -105,7 +109,15 @@ namespace FLY.Winder.UI.Client.UiModule
nameof(WinderInsideOutside.CenterTensionSet), nameof(WinderInsideOutside.CenterTensionSet),
nameof(WinderInsideOutside.EPInitPressure), nameof(WinderInsideOutside.EPInitPressure),
nameof(WinderInsideOutside.EPAirPressure), nameof(WinderInsideOutside.EPAirPressure),
nameof(WinderInsideOutside.CenterOutputRatio) nameof(WinderInsideOutside.CenterOutputRatio),
nameof(WinderInsideOutside.IsSurfaceWindGet),
nameof(WinderInsideOutside.IsCenterWindGet),
nameof(WinderInsideOutside.IsCsWindGet),
//nameof(WinderInsideOutside.IsSurfaceWindSet),//按1松0的不要注册读取
//nameof(WinderInsideOutside.IsCenterWindSet),//按1松0的不要注册读取
//nameof(WinderInsideOutside.IsCsWindSet)//按1松0的不要注册读取
}); });
} }
} }
......
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