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
0de2b554
Commit
0de2b554
authored
Jul 01, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化 IBC MainPanel 与 MainPanel2 属性名都改为 nameof
parent
7ba9b19c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
34 deletions
+21
-34
MainPanel2.xaml
Project.FLY.IBC/FLY.IBC.UI.Client/UIModule/MainPanel2.xaml
+1
-4
MainPanel.xaml
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/MainPanel.xaml
+1
-4
MainPanel.xaml.cs
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/MainPanel.xaml.cs
+19
-26
No files found.
Project.FLY.IBC/FLY.IBC.UI.Client/UIModule/MainPanel2.xaml
View file @
0de2b554
...
@@ -49,9 +49,6 @@
...
@@ -49,9 +49,6 @@
</Setter.Value>
</Setter.Value>
</Setter>
</Setter>
</Style>
</Style>
<local:ToggleButtonText x:Key="tbt_inletAir" IsCheckText="运行" NoCheckText="停止"/>
<local:ToggleButtonText x:Key="tbt_outletAir" IsCheckText="运行" NoCheckText="停止"/>
<local:ToggleButtonText x:Key="tbt_IBC" IsCheckText="自动" NoCheckText="手动"/>
</ResourceDictionary>
</ResourceDictionary>
</UserControl.Resources>
</UserControl.Resources>
...
...
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/MainPanel.xaml
View file @
0de2b554
...
@@ -49,9 +49,6 @@
...
@@ -49,9 +49,6 @@
</Setter.Value>
</Setter.Value>
</Setter>
</Setter>
</Style>
</Style>
<local:ToggleButtonText x:Key="tbt_inletAir" IsCheckText="运行" NoCheckText="停止"/>
<local:ToggleButtonText x:Key="tbt_outletAir" IsCheckText="运行" NoCheckText="停止"/>
<local:ToggleButtonText x:Key="tbt_IBC" IsCheckText="自动" NoCheckText="手动"/>
</ResourceDictionary>
</ResourceDictionary>
</UserControl.Resources>
</UserControl.Resources>
...
...
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/MainPanel.xaml.cs
View file @
0de2b554
...
@@ -47,24 +47,20 @@ namespace FLY.IBC.UI.Client.UiModule
...
@@ -47,24 +47,20 @@ namespace FLY.IBC.UI.Client.UiModule
ibcSystemService
.
PLCos
,
ibcSystemService
.
PLCos
,
ibcSystemService
.
Item
,
ibcSystemService
.
Item
,
new
string
[]
{
new
string
[]
{
"IsIBCAuto"
,
nameof
(
IBC
.
Common
.
IBCData
.
IsIBCAuto
),
"FilmWidth"
,
nameof
(
IBC
.
Common
.
IBCData
.
FilmWidth
),
"FilmWidthSet"
,
nameof
(
IBC
.
Common
.
IBCData
.
FilmWidthSet
),
"IsFilmWidthChanged"
,
nameof
(
IBC
.
Common
.
IBCData
.
IsFilmWidthChanged
),
"ErrorCorrection"
,
nameof
(
IBC
.
Common
.
IBCData
.
ErrorCorrection
),
"IsInletAirOn"
,
nameof
(
IBC
.
Common
.
IBCData
.
IsInletAirOn
),
"InletAirFreq"
,
nameof
(
IBC
.
Common
.
IBCData
.
InletAirFreq
),
"InletAirFreqSet"
,
nameof
(
IBC
.
Common
.
IBCData
.
InletAirFreqSet
),
"IsOutletAirOn"
,
nameof
(
IBC
.
Common
.
IBCData
.
IsOutletAirOn
),
"OutletAirFreq"
,
nameof
(
IBC
.
Common
.
IBCData
.
OutletAirFreq
),
"OutletAirFreqSet"
,
nameof
(
IBC
.
Common
.
IBCData
.
OutletAirFreqSet
),
"IsOutletAirFreqChanged"
,
nameof
(
IBC
.
Common
.
IBCData
.
IsOutletAirFreqChanged
)
"IsDownOutletAirOn"
,
"DownOutletAirFreq"
,
"DownOutletAirFreqSet"
,
});
});
container
.
BuildUp
(
ibcCtrlGraph
);
container
.
BuildUp
(
ibcCtrlGraph
);
...
@@ -73,20 +69,21 @@ namespace FLY.IBC.UI.Client.UiModule
...
@@ -73,20 +69,21 @@ namespace FLY.IBC.UI.Client.UiModule
private
async
void
Item_PropertyChanged
(
object
sender
,
System
.
ComponentModel
.
PropertyChangedEventArgs
e
)
private
async
void
Item_PropertyChanged
(
object
sender
,
System
.
ComponentModel
.
PropertyChangedEventArgs
e
)
{
{
if
((
ibcSystemService
is
IbcSystemServiceClient
)
&&
((
ibcSystemService
as
IbcSystemServiceClient
).
IsInPushValue
))
if
((
ibcSystemService
is
IbcSystemServiceClient
)
&&
((
ibcSystemService
as
IbcSystemServiceClient
).
IsInPushValue
))
return
;
return
;
if
(
e
.
PropertyName
==
"FilmWidthSet"
)
if
(
e
.
PropertyName
==
nameof
(
IBC
.
Common
.
IBCData
.
FilmWidthSet
))
{
{
await
Task
.
Delay
(
1000
);
//1s后触发通知
await
Task
.
Delay
(
1000
);
//1s后触发通知
ibcSystemService
.
Item
.
IsFilmWidthChanged
=
true
;
ibcSystemService
.
Item
.
IsFilmWidthChanged
=
true
;
}
}
else
if
(
e
.
PropertyName
==
"OutletAirFreqSet"
)
else
if
(
e
.
PropertyName
==
nameof
(
IBC
.
Common
.
IBCData
.
OutletAirFreqSet
)
)
{
{
await
Task
.
Delay
(
1000
);
//1s后触发通知
await
Task
.
Delay
(
1000
);
//1s后触发通知
ibcSystemService
.
Item
.
IsOutletAirFreqChanged
=
true
;
ibcSystemService
.
Item
.
IsOutletAirFreqChanged
=
true
;
}
}
}
}
private
void
button_inletAir_plus_Click
(
object
sender
,
RoutedEventArgs
e
)
private
void
button_inletAir_plus_Click
(
object
sender
,
RoutedEventArgs
e
)
{
{
if
(
ibcSystemService
.
Item
.
InletAirFreqSet
<
49.9
)
if
(
ibcSystemService
.
Item
.
InletAirFreqSet
<
49.9
)
...
@@ -118,11 +115,7 @@ namespace FLY.IBC.UI.Client.UiModule
...
@@ -118,11 +115,7 @@ namespace FLY.IBC.UI.Client.UiModule
w
.
ShowDialog
();
w
.
ShowDialog
();
}
}
}
}
public
class
ToggleButtonText
{
public
string
IsCheckText
{
get
;
set
;
}
public
string
NoCheckText
{
get
;
set
;
}
}
public
class
UiModule2_MainPanel
:
IUiModule2
public
class
UiModule2_MainPanel
:
IUiModule2
{
{
...
...
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