Commit 01abefe6 authored by 潘栩锋's avatar 潘栩锋 🚴

修复 下吹 全部按1, 其实是按1松0, 我都没写松0

parent bef65c81
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
OffLabel="停止" OffBrush="{StaticResource Color_off}" OffLabel="停止" OffBrush="{StaticResource Color_off}"
IsChecked="{Binding IsExAirOn}"> IsChecked="{Binding IsExAirOn}">
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:Set1Behavior Binding="{Binding IsExAirOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsExAirOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
</Grid> </Grid>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
IsChecked="{Binding IsGulpValveOn}" IsChecked="{Binding IsGulpValveOn}"
DataContext="{Binding IbcData}" > DataContext="{Binding IbcData}" >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:Set1Behavior Binding="{Binding IsGulpValveOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsGulpValveOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle}" Width="180" Margin="{StaticResource ControlMargin}" <flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle}" Width="180" Margin="{StaticResource ControlMargin}"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
IsChecked="{Binding IsWaterFanOn}" IsChecked="{Binding IsWaterFanOn}"
DataContext="{Binding WinderAccessory}" > DataContext="{Binding WinderAccessory}" >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:Set1Behavior Binding="{Binding IsWaterFanOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsWaterFanOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle}" Width="180" Margin="{StaticResource ControlMargin}" <flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle}" Width="180" Margin="{StaticResource ControlMargin}"
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
IsChecked="{Binding IsCushionFanOn}" IsChecked="{Binding IsCushionFanOn}"
DataContext="{Binding WinderAccessory}" > DataContext="{Binding WinderAccessory}" >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<flyctrl:Set1Behavior Binding="{Binding IsCushionFanOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsCushionFanOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
</UniformGrid> </UniformGrid>
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:ToggleBehavior Binding="{Binding IsT1OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT1OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:Set1Behavior Binding="{Binding IsT1CalenderRollerClosedSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT1CalenderRollerClosedSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<!--二牵引--> <!--二牵引-->
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:ToggleBehavior Binding="{Binding IsT2OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT2OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:Set1Behavior Binding="{Binding IsT2CalenderRollerClosedSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT2CalenderRollerClosedSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<!--内收卷--> <!--内收卷-->
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:ToggleBehavior Binding="{Binding IsT3OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT3OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:Set1Behavior Binding="{Binding IsT3CalenderRollerClosedSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT3CalenderRollerClosedSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<!--外收卷--> <!--外收卷-->
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:ToggleBehavior Binding="{Binding IsOnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
</Grid> </Grid>
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:Set1Behavior Binding="{Binding IsT1CalenderRollerClosedSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT1CalenderRollerClosedSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:ResetBehavior Binding="{Binding IsT2OnSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT2OnSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle}" Grid.Column="6" Grid.Row="2" <flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle}" Grid.Column="6" Grid.Row="2"
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
> >
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<!--状态切换--> <!--状态切换-->
<flyctrl:Set1Behavior Binding="{Binding IsT2CalenderRollerClosedSet}"/> <flyctrl:ResetBehavior Binding="{Binding IsT2CalenderRollerClosedSet}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
</flyctrl:NoToggleButton> </flyctrl:NoToggleButton>
......
...@@ -469,12 +469,14 @@ namespace FLY.Thick.Blowing.Server ...@@ -469,12 +469,14 @@ namespace FLY.Thick.Blowing.Server
public void Init(IFlyADClientAdv flyad) public void Init(IFlyADClientAdv flyad)
{ {
this.flyad = flyad; this.flyad = flyad;
this.flyad.IStatusChangedEvent += new FlyADBase.IStatusChangedEventHandler(flyad_IStatusChangedEvent);
FObjBase.PollModule.Current.Poll_Config(FObjBase.PollModule.POLL_CONFIG.ADD, OnPoll, TimeSpan.FromSeconds(1));
if (IsPlcMode) { if (IsPlcMode) {
Init_plc(); Init_plc();
} }
this.flyad.IStatusChangedEvent += new FlyADBase.IStatusChangedEventHandler(flyad_IStatusChangedEvent);
FObjBase.PollModule.Current.Poll_Config(FObjBase.PollModule.POLL_CONFIG.ADD, OnPoll, TimeSpan.FromSeconds(1));
} }
/// <summary> /// <summary>
/// ///
...@@ -784,13 +786,6 @@ namespace FLY.Thick.Blowing.Server ...@@ -784,13 +786,6 @@ namespace FLY.Thick.Blowing.Server
mRPosList.RAdd(new RPosData() { Time = now, SysTime = sysTime, Speed = speed, GlobalRPos = globalRPos }); mRPosList.RAdd(new RPosData() { Time = now, SysTime = sysTime, Speed = speed, GlobalRPos = globalRPos });
if (OrgRPosValidLv == OrgRPosValidLevel.Invalid)
{
OrgRPos = globalRPos;
//第1次, 赋值为第1个全局旋转脉冲
OrgRPosValidLv = OrgRPosValidLevel.JustListHeader;
}
//必须在 0~RPosOfR 范围内 //必须在 0~RPosOfR 范围内
Angle = GetAngleByGlobalRPos(GlobalRPos); Angle = GetAngleByGlobalRPos(GlobalRPos);
} }
......
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.7")] [assembly: AssemblyVersion("7.0.8")]
[assembly: AssemblyFileVersion("7.0.7")] [assembly: AssemblyFileVersion("7.0.8")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")] [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
{ {
"InstallZipVersion":"7.0.8", "InstallZipVersion":"7.0.8",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.0.8_20220519.7z" "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.0.8_20220525.7z"
} }
\ No newline at end of file
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