diff --git a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/FLY.FeedbackRenZiJia.UI.Client.csproj b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/FLY.FeedbackRenZiJia.UI.Client.csproj
index b09b8751aec7cd746fef7bd29bff59b6be7c6119..cd7f46e8f18b100c07350f5a813d220fae8dbcf0 100644
--- a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/FLY.FeedbackRenZiJia.UI.Client.csproj
+++ b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/FLY.FeedbackRenZiJia.UI.Client.csproj
@@ -310,6 +310,9 @@
</Resource>
</ItemGroup>
<ItemGroup>
+ <PackageReference Include="MahApps.Metro.IconPacks.Material">
+ <Version>3.2.0</Version>
+ </PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
diff --git a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgError/PgErrorAllTable.xaml b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgError/PgErrorAllTable.xaml
index 720ea1a9ad89846db9741e951f50e2e897d6459d..bd5ee94139f87d2295d51a82db746697c8aecaab 100644
--- a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgError/PgErrorAllTable.xaml
+++ b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgError/PgErrorAllTable.xaml
@@ -53,7 +53,7 @@
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Style="{StaticResource backPackStyle}" Fill="White"/>
- <iconPacks:PackIconMaterialDesign Kind="Clear" Style="{StaticResource iconPackStyle}" Foreground="#FFEE3232"/>
+ <iconPacks:PackIconMaterial Kind="Close" Style="{StaticResource iconPackStyle}" Foreground="#FFEE3232"/>
</Grid>
<TextBlock Text="清空" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
diff --git a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgError/PgErrorTable.xaml b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgError/PgErrorTable.xaml
index 2897a292bb8c093127dc0fa02050c4f26974be64..e4b595fbd353a54197e3488684479048b8bf1d54 100644
--- a/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgError/PgErrorTable.xaml
+++ b/Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgError/PgErrorTable.xaml
@@ -63,7 +63,7 @@
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Style="{StaticResource backPackStyle}" Fill="#FFEE3232" />
- <iconPacks:PackIconModern Kind="Reset" Style="{StaticResource iconPackStyle}" Foreground="White"/>
+ <iconPacks:PackIconMaterial Kind="TrayRemove" Style="{StaticResource iconPackStyle}" Foreground="White"/>
</Grid>
<TextBlock Text="å¤ä½" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
@@ -76,7 +76,7 @@
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Style="{StaticResource backPackStyle}" Fill="White"/>
- <iconPacks:PackIconOcticons Kind="Mute" Style="{StaticResource iconPackStyle}" Foreground="#FFEE3232" />
+ <iconPacks:PackIconMaterial Kind="VolumeMute" Style="{StaticResource iconPackStyle}" Foreground="#FFEE3232" />
</Grid>
<TextBlock Text="消音" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
diff --git a/Project.FLY.IBC/FLY.IBC.UI.Client/FLY.IBC.UI.Client.csproj b/Project.FLY.IBC/FLY.IBC.UI.Client/FLY.IBC.UI.Client.csproj
index c270e60890794ec5a8a54d19e36d418cb70c9abc..0aceeb8abeee567db75640b5db607b613543a1bc 100644
--- a/Project.FLY.IBC/FLY.IBC.UI.Client/FLY.IBC.UI.Client.csproj
+++ b/Project.FLY.IBC/FLY.IBC.UI.Client/FLY.IBC.UI.Client.csproj
@@ -213,6 +213,9 @@
</Resource>
</ItemGroup>
<ItemGroup>
+ <PackageReference Include="MahApps.Metro.IconPacks.Material">
+ <Version>3.2.0</Version>
+ </PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
diff --git a/Project.FLY.IBC/FLY.IBC/Server/IBCSystem.cs b/Project.FLY.IBC/FLY.IBC/Server/IBCSystem.cs
index baa4a72dcd175a4a5d063cbd7d3fe0667ed614e7..f51548f2cdf2a34e7e8949ae75321f6ca603c3dc 100644
--- a/Project.FLY.IBC/FLY.IBC/Server/IBCSystem.cs
+++ b/Project.FLY.IBC/FLY.IBC/Server/IBCSystem.cs
@@ -86,7 +86,7 @@ namespace FLY.IBC.Server
//--------------------------------------------------------------------------------
//报è¦é…ç½®
- errorConf = new ErrorConf(PLCos, this.warning);
+ errorConf = new ErrorConf(PLCos, this.warning, "IBC");
byte code = 0;
errorConf.AddErrorAction(
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/FLY.Integrated.UI.Client.csproj b/Project.FLY.Integrated/FLY.Integrated.UI.Client/FLY.Integrated.UI.Client.csproj
index 779f29ddf3a12362a5b2c6d6ebada3ad54880b64..6c35f56a2f13f2fc0a4bb6a593e2aa466a01a819 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/FLY.Integrated.UI.Client.csproj
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/FLY.Integrated.UI.Client.csproj
@@ -137,10 +137,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Themes\GeometryDict.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
<Page Include="Themes\Styles.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -252,7 +248,7 @@
<PackageReference Include="MahApps.Metro">
<Version>2.0.0-alpha0316</Version>
</PackageReference>
- <PackageReference Include="MahApps.Metro.IconPacks">
+ <PackageReference Include="MahApps.Metro.IconPacks.Material">
<Version>3.2.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/PgAccessorySetting.xaml.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Client/PgAccessorySetting.xaml.cs
index fe16848fcbad15c3cf387f7f2842e48fef426415..773e18ccddc837d637d5b9b318f800d0f4a2ffa0 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/PgAccessorySetting.xaml.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/PgAccessorySetting.xaml.cs
@@ -36,7 +36,7 @@ namespace FLY.Integrated.UI.Client
//注册属性更新计划
setPlan = new FLY.OBJComponents.Client.SetPLCUpdatePlan(
integratedSystemServiceClient.PLCos,
- integratedSystemServiceClient.IbcData,
+ integratedSystemServiceClient.Ibc,
new string[] {
"TractionVelocityInner",
"VelocityFactor",
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/PgIbcSetting.xaml.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Client/PgIbcSetting.xaml.cs
index 742bd80890f5f49b7165248e82ae9497a7cfdf9d..5e6efead0d8511a795df1a36a7d0ca33cf468356 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/PgIbcSetting.xaml.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/PgIbcSetting.xaml.cs
@@ -31,12 +31,12 @@ namespace FLY.Integrated.UI.Client
public void Init()
{
integratedSystemServiceClient = TDGage.Current.integratedSystemServiceClient;
- this.DataContext = integratedSystemServiceClient.IbcData;
+ this.DataContext = integratedSystemServiceClient.Ibc;
//注册属性更新计划
setPlan = new FLY.OBJComponents.Client.SetPLCUpdatePlan(
integratedSystemServiceClient.PLCos,
- integratedSystemServiceClient.IbcData,
+ integratedSystemServiceClient.Ibc,
new string[] {
"PIDResult",
"PIDAdjust",
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/SysParam.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Client/SysParam.cs
index 9c915719acde5b6ab819a82952e826b9d12f0cc1..88750a2ecb86e1233ce898954c7c592304723562 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/SysParam.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/SysParam.cs
@@ -1,4 +1,5 @@
using FLY.Integrated.UI.Client.UIModule;
+using Misc;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -28,14 +29,10 @@ namespace FLY.Integrated.UI.Client
}
#region 属性，æˆå‘˜å˜é‡çš„代ç†
- [JsonProperty]
- public string ServerAddr { get; set; }
- public IPEndPoint ServerEP {
- get {
- return Misc.StringConverter.ToIPEndPoint(ServerAddr);
- }
- }
+ [JsonProperty]
+ [JsonConverter(typeof(IPEndPointJsonConverter))]
+ public IPEndPoint ServerEP { get; set; }
[JsonProperty]
public IbcCtrlGraphParams GraphParams { get; } = new IbcCtrlGraphParams();
@@ -46,7 +43,7 @@ namespace FLY.Integrated.UI.Client
public SysParam()
{
- ServerAddr = "127.0.0.1:20003";
+ ServerEP = Misc.StringConverter.ToIPEndPoint("127.0.0.1:19003");
if (!Load())
Save();
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/GeometryDict.xaml b/Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/GeometryDict.xaml
deleted file mode 100644
index 7f68a66d20d962080ff610296b495fd2d6171d6d..0000000000000000000000000000000000000000
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/GeometryDict.xaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <Geometry x:Key="Geometry_origin">
- M512 150.016A361.984 361.984 0 1 1 150.016 512 362.496 362.496 0 0 1 512 150.016M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z
- M512 512m-229.376 0a229.376 229.376 0 1 0 458.752 0 229.376 229.376 0 1 0-458.752 0Z
- </Geometry>
- <Geometry x:Key="Geometry_light">
- M510.707071 140.282828C343.973495 140.282828 208.808081 275.448242 208.808081 442.181818c0 166.734869 135.165414 301.89899 301.89899 301.89899 166.734869 0 301.89899-135.164121 301.89899-301.89899 0-166.733576-135.164121-301.89899-301.89899-301.89899z
- m217.056969 314.181818c-18.531556 0-34.417778-15.896566-34.417777-31.79701 0-50.344081-18.531556-90.096485-55.59596-121.890909-37.064404-31.800889-76.774141-47.696162-119.135677-47.696161-21.178182 0-34.412606-13.252525-34.412606-34.450101 0-18.548364 13.234424-31.802182 34.412606-31.802182 63.539717 0 119.135677 21.202747 169.439677 63.597899 50.298828 42.397737 74.127515 100.693333 74.127515 172.240161 0 15.901737-13.239596 31.798303-34.417778 31.798303z
- </Geometry>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/Styles.xaml b/Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/Styles.xaml
index c3775d44fe05ddf0975d3c56b10786f0c829395c..5e1db9f5b6cf920f4006070e40c8773da3e0efd7 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/Styles.xaml
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/Styles.xaml
@@ -5,7 +5,6 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
- <ResourceDictionary Source="pack://application:,,,/FLY.Integrated.UI.Client;component/Themes/GeometryDict.xaml"/>
</ResourceDictionary.MergedDictionaries>
<SolidColorBrush x:Key="Color_title" Color="#FF464646"/>
@@ -44,7 +43,7 @@
<Setter Property="Foreground" Value="{DynamicResource Color_text_activity}"/>
</Style>
- <Style x:Key="TextBlockStyle_FieldHeaderEditable" TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeaderEditable}">
+ <!--<Style x:Key="TextBlockStyle_FieldHeaderEditable" TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeaderEditable}">
<Setter Property="Foreground" Value="{StaticResource AccentBaseColorBrush}"/>
</Style>
@@ -56,7 +55,7 @@
</Style>
<Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldContent" BasedOn="{StaticResource TextBlockStyle_FieldContent}">
<Setter Property="Foreground" Value="{StaticResource GrayBrush1}"/>
- </Style>
+ </Style>-->
<Style x:Key="AccentedSquareButtonStyle2" TargetType="Button" BasedOn="{StaticResource AccentedSquareButtonStyle}">
<Setter Property="FontSize" Value="18"/>
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/IbcCtrlGraph/IBCCtrlGraph.xaml.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/IbcCtrlGraph/IBCCtrlGraph.xaml.cs
index 4053e65307a16cad1251392073a117ec94bff724..fb1d24eef0dd1f588ecd3ca4a8325ae63e5d973e 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/IbcCtrlGraph/IBCCtrlGraph.xaml.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/IbcCtrlGraph/IBCCtrlGraph.xaml.cs
@@ -206,7 +206,7 @@ namespace FLY.Integrated.UI.Client.UIModule
};
//TODO 注册更新
- Misc.BindingOperations.SetBinding(integratedSystemClient.IbcData, "FilmWidthSet", this, "FilmWidthAxisYTarget");
+ Misc.BindingOperations.SetBinding(integratedSystemClient.Ibc, "FilmWidthSet", this, "FilmWidthAxisYTarget");
Update_filmwidth_y();
Update_d_y();
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/MenuSelect.xaml b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/MenuSelect.xaml
index a5185408ad9ddfb1adff6961e9338415a9d890ab..2653ce482451ce9ae6c44eed31cbc70b2a784f7c 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/MenuSelect.xaml
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/MenuSelect.xaml
@@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FLY.Integrated.UI.Client.UIModule"
+ xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d" >
<UserControl.Resources>
<ResourceDictionary>
@@ -35,15 +36,9 @@
</Style>
</ResourceDictionary>
</Grid.Resources>
- <Button Click="button_menu_click">
+ <Button Click="button_menu_click" Foreground="White">
<StackPanel >
- <Path Data="{StaticResource Geometry_fan}" RenderTransformOrigin="0.5,0.5" >
- <Path.RenderTransform>
- <TransformGroup>
- <RotateTransform Angle="45"/>
- </TransformGroup>
- </Path.RenderTransform>
- </Path>
+ <iconPacks:PackIconMaterial Kind="SealVariant" Height="36" Width="auto" HorizontalAlignment="Center"/>
<TextBlock Text="综åˆ" />
</StackPanel>
</Button>
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcDynArea.xaml.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcDynArea.xaml.cs
index 4558040be13c41553212c197935e65150c7dcd99..96b7679dc9006d761b5a44d4af2cf460530db752 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcDynArea.xaml.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcDynArea.xaml.cs
@@ -36,7 +36,7 @@ namespace FLY.Integrated.UI.Client.UIModule
{
integratedSystemServiceClient = TDGage.Current.integratedSystemServiceClient;
- this.DataContext = integratedSystemServiceClient.IbcData;
+ this.DataContext = integratedSystemServiceClient.Ibc;
grid_error.DataContext = props;
//创建窗å£è§‚察 报è¦åŽŸå› 列表
@@ -61,7 +61,7 @@ namespace FLY.Integrated.UI.Client.UIModule
//注册属性更新计划
setPlan = new FLY.OBJComponents.Client.SetPLCUpdatePlan(
integratedSystemServiceClient.PLCos,
- integratedSystemServiceClient.IbcData,
+ integratedSystemServiceClient.Ibc,
new string[] {
"FilmWidth",
"IsInletAirOn",
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/UcIbcPanel.xaml.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/UcIbcPanel.xaml.cs
index 4d9f9c33a684f1ea2941fe8497102c608c6400cb..9f2cc336f1ec567c57ed5b8060b07ed395b5495c 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/UcIbcPanel.xaml.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/UcIbcPanel.xaml.cs
@@ -31,12 +31,12 @@ namespace FLY.Integrated.UI.Client.UIModule
public void Init()
{
integratedSystemServiceClient = TDGage.Current.integratedSystemServiceClient;
- this.DataContext = integratedSystemServiceClient.IbcData;
+ this.DataContext = integratedSystemServiceClient.Ibc;
//注册属性更新计划
setPlan = new FLY.OBJComponents.Client.SetPLCUpdatePlan(
integratedSystemServiceClient.PLCos,
- integratedSystemServiceClient.IbcData,
+ integratedSystemServiceClient.Ibc,
new string[] {
"InletAirFreq",
"InletAirFreqSet",
@@ -60,7 +60,7 @@ namespace FLY.Integrated.UI.Client.UIModule
});
- integratedSystemServiceClient.IbcData.PropertyChanged += IbcData_PropertyChanged;
+ integratedSystemServiceClient.Ibc.PropertyChanged += IbcData_PropertyChanged;
}
private async void IbcData_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -70,12 +70,12 @@ namespace FLY.Integrated.UI.Client.UIModule
if (e.PropertyName == "FilmWidthSet")
{
await Task.Delay(1000);//1såŽè§¦å‘通知
- integratedSystemServiceClient.IbcData.IsFilmWidthChanged = true;
+ integratedSystemServiceClient.Ibc.IsFilmWidthChanged = true;
}
else if (e.PropertyName == "OutletAirFreqSet")
{
await Task.Delay(1000);//1såŽè§¦å‘通知
- integratedSystemServiceClient.IbcData.IsOutletAirFreqChanged = true;
+ integratedSystemServiceClient.Ibc.IsOutletAirFreqChanged = true;
}
}
@@ -89,36 +89,36 @@ namespace FLY.Integrated.UI.Client.UIModule
private void btnOutletAirPlusClick(object sender, RoutedEventArgs e)
{
- if (integratedSystemServiceClient.IbcData.OutletAirFreqSet < 49.9)
- integratedSystemServiceClient.IbcData.OutletAirFreqSet += 0.1f;
+ if (integratedSystemServiceClient.Ibc.OutletAirFreqSet < 49.9)
+ integratedSystemServiceClient.Ibc.OutletAirFreqSet += 0.1f;
}
private void btnOutletAirMinusClick(object sender, RoutedEventArgs e)
{
- if (integratedSystemServiceClient.IbcData.OutletAirFreqSet > 0.1)
- integratedSystemServiceClient.IbcData.OutletAirFreqSet -= 0.1f;
+ if (integratedSystemServiceClient.Ibc.OutletAirFreqSet > 0.1)
+ integratedSystemServiceClient.Ibc.OutletAirFreqSet -= 0.1f;
}
private void btnInletAirPlusClick(object sender, RoutedEventArgs e)
{
- if (integratedSystemServiceClient.IbcData.InletAirFreqSet < 49.9)
- integratedSystemServiceClient.IbcData.InletAirFreqSet += 0.1f;
+ if (integratedSystemServiceClient.Ibc.InletAirFreqSet < 49.9)
+ integratedSystemServiceClient.Ibc.InletAirFreqSet += 0.1f;
}
private void btnInletAirMinusClick(object sender, RoutedEventArgs e)
{
- if (integratedSystemServiceClient.IbcData.InletAirFreqSet > 0.1)
- integratedSystemServiceClient.IbcData.InletAirFreqSet -= 0.1f;
+ if (integratedSystemServiceClient.Ibc.InletAirFreqSet > 0.1)
+ integratedSystemServiceClient.Ibc.InletAirFreqSet -= 0.1f;
}
private void btnExCoolPlusClick(object sender, RoutedEventArgs e)
{
- if (integratedSystemServiceClient.IbcData.ExCoolFreqSet < 49.9)
- integratedSystemServiceClient.IbcData.ExCoolFreqSet += 0.1f;
+ if (integratedSystemServiceClient.Ibc.ExCoolFreqSet < 49.9)
+ integratedSystemServiceClient.Ibc.ExCoolFreqSet += 0.1f;
}
private void btnExCoolMinusClick(object sender, RoutedEventArgs e)
{
- if (integratedSystemServiceClient.IbcData.ExCoolFreqSet > 0.1)
- integratedSystemServiceClient.IbcData.ExCoolFreqSet -= 0.1f;
+ if (integratedSystemServiceClient.Ibc.ExCoolFreqSet > 0.1)
+ integratedSystemServiceClient.Ibc.ExCoolFreqSet -= 0.1f;
}
}
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/WdK123.xaml.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/WdK123.xaml.cs
index 07c16842591f595b0f4a334e015b6d4a5f7f7361..1d3045c220f8152a7d6c91b58fea6f625bffd494 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/WdK123.xaml.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcIbcPanel/WdK123.xaml.cs
@@ -29,13 +29,13 @@ namespace FLY.Integrated.UI.Client.UIModule
}
public void Init()
{
- grid_ibc.DataContext = TDGage.Current.integratedSystemServiceClient.IbcData;
+ grid_ibc.DataContext = TDGage.Current.integratedSystemServiceClient.Ibc;
var integratedSystemServiceClient = TDGage.Current.integratedSystemServiceClient;
setPlan = new FLY.OBJComponents.Client.SetPLCUpdatePlan(
integratedSystemServiceClient.PLCos,
- integratedSystemServiceClient.IbcData,
+ integratedSystemServiceClient.Ibc,
new string[] {
"BubbleCorrR",
"BubbleCorrA",
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml
index 9f4ca80299aea47b4913030d28640f5e4f7d79ff..e302a99a2ad19228850b3eacb79f8030a3ccce85 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml
@@ -9,7 +9,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:iCommon="clr-namespace:FLY.Integrated.Common;assembly=FLY.Integrated"
mc:Ignorable="d"
- d:DataContext="{d:DesignInstance iCommon:WinderAccessory}">
+ d:DataContext="{d:DesignInstance iCommon:WinderAccessory}" d:DesignWidth="1000">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -66,7 +66,7 @@
<StackPanel Margin="{StaticResource ControlMargin}">
<Button x:Name="btnRotateForw" Style="{StaticResource ButtonStyle_resizeIcon}">
<Grid>
- <Ellipse Fill="{StaticResource GrayBrush10}" Margin="10,14,10,6"/>
+ <Ellipse Fill="{StaticResource GrayBrush10}" Margin="6,10,6,2"/>
<iconPacks:PackIconMaterial Kind="RotateRight" />
</Grid>
</Button>
@@ -75,7 +75,7 @@
<StackPanel Margin="{StaticResource ControlMargin}">
<Button x:Name="btnRotateBackw" Style="{StaticResource ButtonStyle_resizeIcon}">
<Grid>
- <Ellipse Fill="{StaticResource GrayBrush10}" Margin="10,14,10,6"/>
+ <Ellipse Fill="{StaticResource GrayBrush10}" Margin="6,10,6,2"/>
<iconPacks:PackIconMaterial Kind="RotateLeft" />
</Grid>
</Button>
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml.cs
index 3eb23b8ecbeb696811435f5430e4e975fad093f2..0d1cb89320e1020dd35234b36b92de7d643f7a9f 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanel.xaml.cs
@@ -65,6 +65,7 @@ namespace FLY.Integrated.UI.Client.UIModule
private void btnFreqClick(object sender, RoutedEventArgs e)
{
WdFreq w = new WdFreq();
+ w.Init();
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
w.ShowDialog();
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanelStyle.xaml b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanelStyle.xaml
index 013ebbefaf239fb76a225618708ac5b349888ab1..77effe84e56c9dadc8f7ba531992803a21a5bd79 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanelStyle.xaml
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcRotaryPanel/UcRotaryPanelStyle.xaml
@@ -114,13 +114,14 @@
<Setter.Value>
<ControlTemplate TargetType="flyctrl:NoToggleButton">
<StackPanel Orientation="Horizontal">
- <Path x:Name="icon" Data="{StaticResource Geometry_light}" Stretch="Uniform" Width="30" Margin="2" Fill="{TemplateBinding OffBrush}"/>
+ <iconPacks:PackIconMaterial x:Name="icon" Kind="CircleOutline" Width="30" Height="{Binding Width,RelativeSource={RelativeSource Mode=Self}}" Margin="2" Foreground="{TemplateBinding OffBrush}"/>
<TextBlock x:Name="tbOnOff" Text="{TemplateBinding OffLabel}" Style="{StaticResource TextBlockStyle_FieldHeader}" Foreground="{StaticResource TextBrush}" FontSize="{StaticResource FontSize_title}"/>
</StackPanel>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
- <Setter TargetName="icon" Property="Fill" Value="{Binding OnBrush,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
+ <Setter TargetName="icon" Property="Foreground" Value="{Binding OnBrush,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
+ <Setter TargetName="icon" Property="Kind" Value="CircleSlice8"/>
<Setter TargetName="tbOnOff" Property="Text" Value="{Binding OnLabel,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
</Trigger>
</ControlTemplate.Triggers>
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcTractionPanel/UcTractionPanel.xaml b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcTractionPanel/UcTractionPanel.xaml
index 347d0a028dbde93e21c13dddc6b040cd033bf03a..43fb094148332740c39ea11b2eff2a44e30d6332 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcTractionPanel/UcTractionPanel.xaml
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/UcTractionPanel/UcTractionPanel.xaml
@@ -8,7 +8,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:iCommon="clr-namespace:FLY.Integrated.Common;assembly=FLY.Integrated"
mc:Ignorable="d"
- d:DataContext="{d:DesignInstance iCommon:WinderAccessory}">
+ d:DataContext="{d:DesignInstance iCommon:WinderAccessory}" d:DesignWidth="800">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -19,9 +19,9 @@
<Border Grid.Row="0" Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}" >
<Grid>
<Grid.ColumnDefinitions>
- <ColumnDefinition SharedSizeGroup="A"/>
- <ColumnDefinition SharedSizeGroup="A"/>
<ColumnDefinition Width="auto"/>
+ <ColumnDefinition Width="auto"/>
+ <ColumnDefinition/>
</Grid.ColumnDefinitions>
<Viewbox Margin="30,10">
<Grid >
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Server/FLY.Integrated.UI.Server.csproj b/Project.FLY.Integrated/FLY.Integrated.UI.Server/FLY.Integrated.UI.Server.csproj
index b28bacb99cb67453f9db4e08f8578519c7e732b3..0db131bb3e114629830407c0e6e64d28cbb68ec4 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Server/FLY.Integrated.UI.Server.csproj
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Server/FLY.Integrated.UI.Server.csproj
@@ -35,7 +35,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
- <ApplicationIcon>yellowstar.ico</ApplicationIcon>
+ <ApplicationIcon>ribbon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -133,9 +133,12 @@
<PackageReference Include="NLog">
<Version>4.6.8</Version>
</PackageReference>
+ <PackageReference Include="System.Data.SQLite">
+ <Version>1.0.112</Version>
+ </PackageReference>
</ItemGroup>
<ItemGroup>
- <Resource Include="yellowstar.ico" />
+ <Resource Include="ribbon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Server/MainWindow.xaml.cs b/Project.FLY.Integrated/FLY.Integrated.UI.Server/MainWindow.xaml.cs
index f23666d233016cc86510488e242224cbc18e628c..6919a050370648eea85d36d53a44db8b14fe69ee 100644
--- a/Project.FLY.Integrated/FLY.Integrated.UI.Server/MainWindow.xaml.cs
+++ b/Project.FLY.Integrated/FLY.Integrated.UI.Server/MainWindow.xaml.cs
@@ -36,7 +36,7 @@ namespace FLY.Integrated.UI.Server
FObjBase.PollModule.Current.Start();
gage = new FLY.Integrated.Server.TDGage("Gage1");
-
+ objProxy = new FLY.Integrated.Server.OBJProxy.OBJProxy(0, gage);
FLY.OBJComponents.Server.PLCProxySystem plsos =
gage.mData.PLCos as FLY.OBJComponents.Server.PLCProxySystem;
grid_plcos.DataContext = plsos;
diff --git a/Project.FLY.Integrated/FLY.Integrated.UI.Server/yellowstar.ico b/Project.FLY.Integrated/FLY.Integrated.UI.Server/ribbon.ico
similarity index 52%
rename from Project.FLY.Integrated/FLY.Integrated.UI.Server/yellowstar.ico
rename to Project.FLY.Integrated/FLY.Integrated.UI.Server/ribbon.ico
index e7d7ee2a0bdebf14d83419fb25e9ef2f139eb4c4..eeaa946ab6125aeb0a753c13c8e73601b30080e8 100644
Binary files a/Project.FLY.Integrated/FLY.Integrated.UI.Server/yellowstar.ico and b/Project.FLY.Integrated/FLY.Integrated.UI.Server/ribbon.ico differ
diff --git a/Project.FLY.Integrated/FLY.Integrated/Client/IntegratedSystemServiceClient.cs b/Project.FLY.Integrated/FLY.Integrated/Client/IntegratedSystemServiceClient.cs
index d2c481d97036318ffd86576ba6b94a5272b57503..96180cf4fdd4b69485567e8f652199348e782a2e 100644
--- a/Project.FLY.Integrated/FLY.Integrated/Client/IntegratedSystemServiceClient.cs
+++ b/Project.FLY.Integrated/FLY.Integrated/Client/IntegratedSystemServiceClient.cs
@@ -22,7 +22,7 @@ namespace FLY.Integrated.Client
/// <summary>
/// æ•°æ®
/// </summary>
- public IbcData IbcData { get; } = new IbcData();
+ public IbcData Ibc { get; } = new IbcData();
/// <summary>
/// 收å·
@@ -62,14 +62,14 @@ namespace FLY.Integrated.Client
syncPropServiceClient = new SyncPropServiceClient(
mServerID + 1,
new Dictionary<string, INotifyPropertyChanged> {
- {"IbcData", IbcData },
+ {"IbcData", Ibc },
{"Accessory", Accessory },
});
PLCos = new PLCProxySystemServiceClient(
OBJ_INTERFACE.OBJ_INTERFACE.IBC_OBJ_PLCOS_ID,
new Dictionary<string, INotifyPropertyChanged> {
- {"IbcData", IbcData },
+ {"IbcData", Ibc },
{"Accessory", Accessory }
});
diff --git a/Project.FLY.Integrated/FLY.Integrated/IService/IIntegratedSystemService.cs b/Project.FLY.Integrated/FLY.Integrated/IService/IIntegratedSystemService.cs
index 96170645dda01a10fcc529816b1143d982d9b048..c764091a852e99efdcb49fad2e3a07286826086d 100644
--- a/Project.FLY.Integrated/FLY.Integrated/IService/IIntegratedSystemService.cs
+++ b/Project.FLY.Integrated/FLY.Integrated/IService/IIntegratedSystemService.cs
@@ -15,7 +15,7 @@ namespace FLY.Integrated.IService
/// <summary>
/// æ•°æ®
/// </summary>
- IbcData IbcData { get; }
+ IbcData Ibc { get; }
/// <summary>
/// 收å·
diff --git a/Project.FLY.Integrated/FLY.Integrated/Server.OBJProxy/IntegratedSystem_OBJProxy.cs b/Project.FLY.Integrated/FLY.Integrated/Server.OBJProxy/IntegratedSystem_OBJProxy.cs
index 5485f0e23b0496905a0d54ae88e2509d1bc0079e..5de8f6130650bd4d490a0cd7057042054385b83c 100644
--- a/Project.FLY.Integrated/FLY.Integrated/Server.OBJProxy/IntegratedSystem_OBJProxy.cs
+++ b/Project.FLY.Integrated/FLY.Integrated/Server.OBJProxy/IntegratedSystem_OBJProxy.cs
@@ -28,7 +28,7 @@ namespace FLY.Integrated.Server.OBJProxy
objsys_idx, ID + 1,
new Dictionary<string, INotifyPropertyChanged>
{
- { "IbcData", data.IbcData},
+ { "IbcData", data.Ibc},
{ "Accessory", data.Accessory}
});
diff --git a/Project.FLY.Integrated/FLY.Integrated/Server/IntegratedSystem.cs b/Project.FLY.Integrated/FLY.Integrated/Server/IntegratedSystem.cs
index 90a61589ff0080110689bb64a315136e7e97c9af..0628a0aceee6903bdeb3f39ca86e2b9f9e35b51f 100644
--- a/Project.FLY.Integrated/FLY.Integrated/Server/IntegratedSystem.cs
+++ b/Project.FLY.Integrated/FLY.Integrated/Server/IntegratedSystem.cs
@@ -25,7 +25,7 @@ namespace FLY.Integrated.Server
/// <summary>
/// æ•°æ®
/// </summary>
- public IbcData IbcData { get; } = new IbcData();
+ public IbcData Ibc { get; } = new IbcData();
/// <summary>
/// 收å·
@@ -99,14 +99,14 @@ namespace FLY.Integrated.Server
//--------------------------------------------------------------------------------
//报è¦é…ç½®
- errorConf = new ErrorConf(PLCos, this.warning);
+ errorConf = new ErrorConf(PLCos, this.warning, "综åˆIBC");
byte code = 0;
errorConf.AddErrorAction(
Accessory, ref code);
errorConf.AddErrorAction(
- IbcData, ref code);
+ Ibc, ref code);
errorConf.InitError();
@@ -127,17 +127,17 @@ namespace FLY.Integrated.Server
if (!PLCos.IsConnectedWithPLC)
return null;
- if (IbcData.InletAirFreq < 2 && IbcData.OutletAirFreq < 2)//没有工作ï¼ï¼ï¼ï¼
+ if (Ibc.InletAirFreq < 2 && Ibc.OutletAirFreq < 2)//没有工作ï¼ï¼ï¼ï¼
return null;
//记录数æ®
return new Db_Width()
{
Time = DateTime.Now,
- FilmWidth = Math.Round(IbcData.FilmWidth, 1),
- InletAirFreq = Math.Round(IbcData.InletAirFreq, 1),
- OutletAirFreq = Math.Round(IbcData.OutletAirFreq, 1),
- ExCoolFreq = Math.Round(IbcData.ExCoolFreq, 1)
+ FilmWidth = Math.Round(Ibc.FilmWidth, 1),
+ InletAirFreq = Math.Round(Ibc.InletAirFreq, 1),
+ OutletAirFreq = Math.Round(Ibc.OutletAirFreq, 1),
+ ExCoolFreq = Math.Round(Ibc.ExCoolFreq, 1)
};
});
@@ -185,7 +185,7 @@ namespace FLY.Integrated.Server
}
//objname 转 obj
- PLCos.ObjNames.Add("IbcData", IbcData);
+ PLCos.ObjNames.Add("Ibc", Ibc);
PLCos.ObjNames.Add("Accessory", Accessory);
foreach (PLCGroup.PLCVariable var in plcgroup.Variables)
diff --git a/Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj b/Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj
index 8425c0de07ef9583ab6e2aa3e9967ed10ab068c6..f713d26762df05656c2c3bcd0117afcd2db5e788 100644
--- a/Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj
+++ b/Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj
@@ -430,7 +430,7 @@
<PackageReference Include="MahApps.Metro">
<Version>2.0.0-alpha0316</Version>
</PackageReference>
- <PackageReference Include="MahApps.Metro.IconPacks">
+ <PackageReference Include="MahApps.Metro.IconPacks.Material">
<Version>3.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmLight">
diff --git a/Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/FLY.Thick.BlowingScan.UI.Client.csproj b/Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/FLY.Thick.BlowingScan.UI.Client.csproj
index 94cb61dba4db49fba66c1eca3d9ed042f413d828..bcebff5700d7dbb8b28821676b1dba47168634cf 100644
--- a/Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/FLY.Thick.BlowingScan.UI.Client.csproj
+++ b/Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/FLY.Thick.BlowingScan.UI.Client.csproj
@@ -418,7 +418,7 @@
<PackageReference Include="MahApps.Metro">
<Version>2.0.0-alpha0316</Version>
</PackageReference>
- <PackageReference Include="MahApps.Metro.IconPacks">
+ <PackageReference Include="MahApps.Metro.IconPacks.Material">
<Version>3.2.0</Version>
</PackageReference>
<PackageReference Include="MathNet.Numerics">
diff --git a/Project.FLY.Weight/FLY.Weight.UI.Client/FLY.Weight.UI.Client.csproj b/Project.FLY.Weight/FLY.Weight.UI.Client/FLY.Weight.UI.Client.csproj
index 528d0b2e868e4c87f79f01b74c2b8d1c3c6a930b..82e06e7eadf0f6ccbfab8b428d2b5f6bbfff968c 100644
--- a/Project.FLY.Weight/FLY.Weight.UI.Client/FLY.Weight.UI.Client.csproj
+++ b/Project.FLY.Weight/FLY.Weight.UI.Client/FLY.Weight.UI.Client.csproj
@@ -369,6 +369,9 @@
<Resource Include="FodyWeavers.xml" />
</ItemGroup>
<ItemGroup>
+ <PackageReference Include="MahApps.Metro.IconPacks.Material">
+ <Version>3.2.0</Version>
+ </PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
diff --git a/Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs b/Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs
index ee6a41181a944da6a78e1223310eda1d20b726ac..10050820c4f35e5e04621a89dd1847e4a2170f62 100644
--- a/Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs
+++ b/Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs
@@ -106,7 +106,7 @@ namespace FLY.Weight.Server
//--------------------------------------------------------------------------------
//报è¦é…ç½®
- errorConf = new ErrorConf(PLCos, this.warning);
+ errorConf = new ErrorConf(PLCos, this.warning, "称é‡");
byte code = 0;
errorConf.AddErrorAction(
diff --git a/Project.FLY.Winder_20190413/FLY.Winder.UI.Client/FLY.Winder.UI.Client.csproj b/Project.FLY.Winder_20190413/FLY.Winder.UI.Client/FLY.Winder.UI.Client.csproj
index 84a6c3faddbc9df8a8d0910a837435e5268d70c0..bfc62d28faa47651fc703ea23dd71a55ccb9767f 100644
--- a/Project.FLY.Winder_20190413/FLY.Winder.UI.Client/FLY.Winder.UI.Client.csproj
+++ b/Project.FLY.Winder_20190413/FLY.Winder.UI.Client/FLY.Winder.UI.Client.csproj
@@ -281,7 +281,7 @@
<PackageReference Include="MahApps.Metro">
<Version>2.0.0-alpha0316</Version>
</PackageReference>
- <PackageReference Include="MahApps.Metro.IconPacks">
+ <PackageReference Include="MahApps.Metro.IconPacks.Material">
<Version>3.2.0</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
diff --git a/Project.FLY.Winder_20190413/FLY.Winder/Server/WinderSystem.cs b/Project.FLY.Winder_20190413/FLY.Winder/Server/WinderSystem.cs
index 76adf8fab9b0f6cc72ec3d940ca0d15b6e3a4dcb..7597d1124f33b1ccf4ebd4b42b175dfa30b524a7 100644
--- a/Project.FLY.Winder_20190413/FLY.Winder/Server/WinderSystem.cs
+++ b/Project.FLY.Winder_20190413/FLY.Winder/Server/WinderSystem.cs
@@ -65,7 +65,7 @@ namespace FLY.Winder.Server
//--------------------------------------------------------------------------------
//报è¦é…ç½®
- errorConf = new ErrorConf(PLCos, this.warning);
+ errorConf = new ErrorConf(PLCos, this.warning, "收å·");
byte code = 0;
//å射找出全部是报è¦çš„property
diff --git a/thick_public b/thick_public
index 4d71a26fe5ae07b6a1482759a1af79cbb692809c..780c96d8a665985b3f9c256e8afc9cf5941b39f3 160000
--- a/thick_public
+++ b/thick_public
@@ -1 +1 @@
-Subproject commit 4d71a26fe5ae07b6a1482759a1af79cbb692809c
+Subproject commit 780c96d8a665985b3f9c256e8afc9cf5941b39f3