1. 全部使用 material 图标库

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>

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>

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>

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>

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(

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">

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",

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",

Project.FLY.Integrated/FLY.Integrated.UI.Client/SysParam.cs

 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();
 

Project.FLY.Integrated/FLY.Integrated.UI.Client/Themes/GeometryDict.xaml

-<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

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"/>

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();

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>

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",

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;
         }
     }
 

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",

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>

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();
 

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>

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 >

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

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;

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 }
                 });
 

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>
         ///  收卷

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}
                 });
 

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)

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">

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">

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>

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(

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">

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

thick_public @ 780c96d8

-Subproject commit 4d71a26fe5ae07b6a1482759a1af79cbb692809c
+Subproject commit 780c96d8a665985b3f9c256e8afc9cf5941b39f3