Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
01abefe6
Commit
01abefe6
authored
May 25, 2022
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 下吹 全部按1, 其实是按1松0, 我都没写松0
parent
bef65c81
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
26 deletions
+22
-26
ExAirPanel.xaml
...ownBlowing.UI.Client/UiModule/WinderPanel/ExAirPanel.xaml
+1
-1
OtherPanelV3.xaml
...nBlowing.UI.Client/UiModule/WinderPanel/OtherPanelV3.xaml
+3
-3
VelocityCtrlPanelV3.xaml
...g.UI.Client/UiModule/WinderPanel/VelocityCtrlPanelV3.xaml
+7
-7
VelocityCtrlPanelV4.xaml
...g.UI.Client/UiModule/WinderPanel/VelocityCtrlPanelV4.xaml
+3
-3
BlowingDetect.cs
...Y.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
+4
-9
AssemblyInfo.cs
...LY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
+2
-2
hemeiInstallZipVersionInfo.json
脚本/hemeiInstallZipVersionInfo.json
+2
-1
No files found.
Project.FLY.DownBlowing/FLY.DownBlowing.UI.Client/UiModule/WinderPanel/ExAirPanel.xaml
View file @
01abefe6
...
@@ -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:
Set1
Behavior Binding="{Binding IsExAirOnSet}"/>
<flyctrl:
Reset
Behavior Binding="{Binding IsExAirOnSet}"/>
</i:Interaction.Behaviors>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</flyctrl:NoToggleButton>
</Grid>
</Grid>
...
...
Project.FLY.DownBlowing/FLY.DownBlowing.UI.Client/UiModule/WinderPanel/OtherPanelV3.xaml
View file @
01abefe6
...
@@ -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:
Set1
Behavior Binding="{Binding IsGulpValveOnSet}"/>
<flyctrl:
Reset
Behavior 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:
Set1
Behavior Binding="{Binding IsWaterFanOnSet}"/>
<flyctrl:
Reset
Behavior 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:
Set1
Behavior Binding="{Binding IsCushionFanOnSet}"/>
<flyctrl:
Reset
Behavior Binding="{Binding IsCushionFanOnSet}"/>
</i:Interaction.Behaviors>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</flyctrl:NoToggleButton>
</UniformGrid>
</UniformGrid>
...
...
Project.FLY.DownBlowing/FLY.DownBlowing.UI.Client/UiModule/WinderPanel/VelocityCtrlPanelV3.xaml
View file @
01abefe6
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
>
>
<i:Interaction.Behaviors>
<i:Interaction.Behaviors>
<!--状态切换-->
<!--状态切换-->
<flyctrl:
Toggle
Behavior Binding="{Binding IsT1OnSet}"/>
<flyctrl:
Reset
Behavior 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:
Set1
Behavior Binding="{Binding IsT1CalenderRollerClosedSet}"/>
<flyctrl:
Reset
Behavior 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:
Toggle
Behavior Binding="{Binding IsT2OnSet}"/>
<flyctrl:
Reset
Behavior 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:
Set1
Behavior Binding="{Binding IsT2CalenderRollerClosedSet}"/>
<flyctrl:
Reset
Behavior 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:
Toggle
Behavior Binding="{Binding IsT3OnSet}"/>
<flyctrl:
Reset
Behavior 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:
Set1
Behavior Binding="{Binding IsT3CalenderRollerClosedSet}"/>
<flyctrl:
Reset
Behavior 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:
Toggle
Behavior Binding="{Binding IsOnSet}"/>
<flyctrl:
Reset
Behavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</flyctrl:NoToggleButton>
</Grid>
</Grid>
...
...
Project.FLY.DownBlowing/FLY.DownBlowing.UI.Client/UiModule/WinderPanel/VelocityCtrlPanelV4.xaml
View file @
01abefe6
...
@@ -106,7 +106,7 @@
...
@@ -106,7 +106,7 @@
>
>
<i:Interaction.Behaviors>
<i:Interaction.Behaviors>
<!--状态切换-->
<!--状态切换-->
<flyctrl:
Set1
Behavior Binding="{Binding IsT1CalenderRollerClosedSet}"/>
<flyctrl:
Reset
Behavior 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:
Set1
Behavior Binding="{Binding IsT2CalenderRollerClosedSet}"/>
<flyctrl:
Reset
Behavior Binding="{Binding IsT2CalenderRollerClosedSet}"/>
</i:Interaction.Behaviors>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</flyctrl:NoToggleButton>
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
View file @
01abefe6
...
@@ -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
);
}
}
...
...
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @
01abefe6
...
@@ -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")]
脚本/hemeiInstallZipVersionInfo.json
View file @
01abefe6
{
{
"InstallZipVersion"
:
"7.0.8"
,
"InstallZipVersion"
:
"7.0.8"
,
"InstallZipUrl"
:
"http://server.flyautomation.net:8889/download/和美安装包_v7.0.8_202205
19
.7z"
"InstallZipUrl"
:
"http://server.flyautomation.net:8889/download/和美安装包_v7.0.8_202205
25
.7z"
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment