Style 改名

Project.FLY.ControlLibrary/FLY.ControlLibrary/MyMessageBox.xaml

@@ -19,9 +19,7 @@
         <StackPanel Orientation="Vertical" Margin="5" MinWidth="400">
             <Border Height="40"/>
             <TextBlock x:Name="textblock_message" Text="message" FontSize="40" Margin="10" MinHeight="100"/>
-            <Button Style="{StaticResource ButtonStyle_empty}" HorizontalAlignment="Right" BorderThickness="0" VerticalAlignment="Bottom" Click="button_ok_Click" Margin="5" Background="White">
-                <Path Data="{StaticResource Geometry_check-circle}" Fill="{StaticResource Color_theme_activity}" Stretch="Fill" Height="80" Width="80"  />
-            </Button>
+            <Button Style="{StaticResource Styles.Button.Apply}" Click="button_ok_Click"/>
         </StackPanel>
     </Grid>
 

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/CardStyle.xaml

@@ -15,7 +15,13 @@
         <Setter Property="Padding" Value="20 5"/>
         <Setter Property="FontWeight" Value="Bold"/>
     </Style>
-
+    <Style x:Key="Styles.Card.Title2" TargetType="TextBlock">
+        <Setter Property="Background" Value="#FFC107"/>
+        <Setter Property="FontSize" Value="18"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="Padding" Value="20 5"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+    </Style>
     <Style x:Key="Styles.Card.Border" TargetType="Border">
         <Setter Property="Margin" Value="5"/>
         <Setter Property="Background" Value="{StaticResource MahApps.Brushes.ThemeBackground}"/>

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/WindowBigCloseStyle.xaml

@@ -17,7 +17,7 @@
             </Border>
             <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5" Height="110" Width="{Binding Height,RelativeSource={RelativeSource Mode=Self}}" >
                 <Ellipse Fill="White" Stretch="Fill" />
-                <Button Name="button_close" Style="{StaticResource ButtonStyle_empty}" Margin="5" BorderThickness="0" >
+                <Button Name="button_close" Style="{StaticResource Styles.Button.Empty}" Margin="5" BorderThickness="0" >
                     <Path Data="{StaticResource Geometry_close-circle}" Fill="Red" Stretch="Fill" />
                 </Button>
             </Grid>

Project.FLY.ControlLibrary/FLY.ControlLibrary/Window_Tip.xaml

@@ -16,7 +16,7 @@
                 <TextBlock Text="{Binding Title}" FontWeight="Bold" FontSize="30" FontFamily="YouYuan" Margin="10,5"/>
                 <TextBlock Text="{Binding Message}" FontWeight="Bold" FontSize="15" FontFamily="YouYuan" Margin="20,5" TextWrapping="Wrap" />
             </StackPanel>
-            <Button Style="{StaticResource ResourceKey=ButtonStyle_empty}" Command="{Binding CloseCmd}" Background="Red" VerticalAlignment="Top" HorizontalAlignment="Right" >
+            <Button Style="{StaticResource ResourceKey=Styles.Button.Empty}" Command="{Binding CloseCmd}" Background="Red" VerticalAlignment="Top" HorizontalAlignment="Right" >
 
                 <Path  Data="{StaticResource ResourceKey=Geometry_window-close}" Fill="White" Height="36" Width="36" Stretch="Fill" SnapsToDevicePixels="True" Margin="4"/>
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CustomSection/UcSectionControllerState.xaml

@@ -14,7 +14,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <StackPanel Orientation="Horizontal" >
-        <Border Style="{StaticResource BorderStyle_paramSection}">
+        <Border Style="{StaticResource Styles.ParamSection.Border}">
             <TextBlock Text="自动&#x0a;页面切换" />
         </Border>
         <TabControl x:Name="tabControl" Visibility="Collapsed"

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CustomSection/UcSectionError.xaml

@@ -19,7 +19,7 @@
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
 
-        <Border Style="{StaticResource BorderStyle_paramSection}">
+        <Border Style="{StaticResource Styles.ParamSection.Border}">
             <TextBlock Text="报警提示" />
         </Border>
         <StackPanel Grid.Column="1">
@@ -35,10 +35,10 @@
                         </Grid.ColumnDefinitions>
                         <StackPanel Orientation="Horizontal">
                             <StackPanel Orientation="Vertical" Margin="5">
-                                <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="持续时间" />
+                                <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="持续时间" />
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding WarningDurationSec}" MaxWidth="120" HorizontalAlignment="Left"/>
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="秒"/>
+                                    <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding WarningDurationSec}" MaxWidth="120" HorizontalAlignment="Left"/>
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="秒"/>
                                 </StackPanel>
                             </StackPanel>
                             <Button Style="{StaticResource ButtonStyle_RectangleIcon}" Command="{Binding PlayCmd}" >
@@ -73,13 +73,13 @@
                 <StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <StackPanel Margin="{StaticResource ControlMargin}">
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="使能" />
-                            <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding EnableLCUS1}" />
+                            <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="使能" />
+                            <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding EnableLCUS1}" />
                         </StackPanel>
                         <StackPanel Margin="{StaticResource ControlMargin}">
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="串口地址" />
+                            <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="串口地址" />
                             <StackPanel Orientation="Horizontal">
-                                <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding LCUS1_PortName}" HorizontalAlignment="Left" Tag="Full"/>
+                                <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding LCUS1_PortName}" HorizontalAlignment="Left" Tag="Full"/>
                             </StackPanel>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
@@ -105,8 +105,8 @@
                 <StackPanel Orientation="Horizontal" x:Name="spErrCodes">
                     <StackPanel Margin="{StaticResource ControlMargin}">
                         <StackPanel Margin="{StaticResource ControlMargin}">
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="使能" />
-                            <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding EnableScanErrBigTip}" />
+                            <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="使能" />
+                            <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding EnableScanErrBigTip}" />
                         </StackPanel>
                     </StackPanel>
                 </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CustomSection/UcSectionLanguage.xaml

@@ -13,13 +13,13 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <StackPanel Orientation="Horizontal" >
-        <Border Style="{StaticResource BorderStyle_paramSection}">
+        <Border Style="{StaticResource Styles.ParamSection.Border}">
             <TextBlock Text="语言" />
         </Border>
         <StackPanel >
             <StackPanel Orientation="Horizontal">
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="语言" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="语言" />
                     <flyctrl:ToggleButtonOnOff Grid.Column="4" Grid.Row="4" Grid.RowSpan="2" 
                                 OnLabel="en"  OffLabel="中文" IsChecked="{Binding IsEn}"/>
                 </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CustomSection/UcSectionOsk.xaml

@@ -13,18 +13,18 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <StackPanel Orientation="Horizontal" >
-        <Border Style="{StaticResource BorderStyle_paramSection}">
+        <Border Style="{StaticResource Styles.ParamSection.Border}">
             <TextBlock Text="虚拟键盘" />
         </Border>
         <StackPanel >
             <StackPanel Orientation="Horizontal">
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="虚拟键盘" />
-                    <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding HaveOSK}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="虚拟键盘" />
+                    <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding HaveOSK}" />
                 </StackPanel>
                 <StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding HaveOSK, Converter={StaticResource visbilityconv}}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="支持鼠标" />
-                    <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding HaveOSK_mouse}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="支持鼠标" />
+                    <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding HaveOSK_mouse}" />
                 </StackPanel>
             </StackPanel>
         </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CustomSection/UcSingleStateTab.xaml

@@ -18,7 +18,7 @@
     <Grid>
         <StackPanel>
             <StackPanel.Resources>
-                <Style x:Key="TextBlockStyle_GridFieldHeader" TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeaderEditable}">
+                <Style x:Key="TextBlockStyle_GridFieldHeader" TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader.Editable}">
                     <Setter Property="Width" Value="100"/>
                     <Setter Property="Margin" Value="1.5,0"/>
                     <Setter Property="Foreground" Value="White"/>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj

@@ -646,6 +646,9 @@
   <ItemGroup>
     <Resource Include="Images\doorplate.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\bg_adbox.jpg" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgAddress.xaml

@@ -21,7 +21,7 @@
             <RowDefinition Height="496*" />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal"  Background="{StaticResource Brush_theme_bar}" >
-            <Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/>
+            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
             <TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="服务器地址"/>
         </StackPanel>
         <DataGrid AlternationCount ="2" AlternatingRowBackground="LightGray"  AutoGenerateColumns="False" CanUserAddRows="False" Margin="{StaticResource ControlMargin}" 
@@ -45,7 +45,7 @@
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
                                        Text="地址"/>
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="15" 
+                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" FontSize="15" 
                                        Text="如:127.0.0.0:20006"/>
                         </StackPanel>
                     </DataGridTextColumn.Header>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgCurve.xaml

@@ -24,8 +24,8 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Horizontal" Background="{StaticResource Background_Title}">
-            <Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/>
+        <StackPanel Orientation="Horizontal" Background="{StaticResource Brushes.TitleBar.Background}">
+            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
             <TextBlock Style="{StaticResource TextBlockStyle_Title}"  Text="AD曲线"/>
         </StackPanel>
         <Grid Grid.Row="1" >

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgCustomSections.xaml

@@ -21,7 +21,7 @@
             <RowDefinition Height="496*" />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal"  Background="{StaticResource Brush_theme_bar}" >
-            <Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/>
+            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
             <TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="客户端设置"/>
         </StackPanel>
         <ScrollViewer PanningMode="Both" Grid.Row="1" >

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgError/WdFlyADAccess.xaml

@@ -27,9 +27,9 @@
 
                     </StackPanel>
                     <StackPanel Orientation="Vertical" Margin="5">
-                        <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="授权码" />
+                        <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="授权码" />
                         <StackPanel Orientation="Horizontal">
-                            <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Access, Converter={StaticResource bytesconv}}" Tag="Full"/>
+                            <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Access, Converter={StaticResource bytesconv}}" Tag="Full"/>
                         </StackPanel>
                     </StackPanel>
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgFlyAd.xaml

@@ -33,7 +33,7 @@
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
                 <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack" />
-                <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="控制器"/>
+                <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="AD盒"/>
             </StackPanel>
             <local:CtMicroGage Grid.Column="1" x:Name="mircoGage" Background="Transparent" VerticalAlignment="Bottom"/>
         </Grid>
@@ -190,7 +190,7 @@
                                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="机架长度" />
                                     <StackPanel Orientation="Horizontal">
                                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding PosLength}" />
-                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|"/>
+                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}"/>
                                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                             <Run>
                                 <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
@@ -216,7 +216,7 @@
                                         <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调试速度" />
                                         <StackPanel Orientation="Horizontal">
                                             <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VJOG}" />
-                                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                             <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run>
                                     <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
@@ -236,7 +236,7 @@
                                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="开始速度" />
                                     <StackPanel Orientation="Horizontal">
                                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SVelocity}" />
-                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run >
                                     <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
@@ -254,7 +254,7 @@
                                         <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="归零速度1" />
                                         <StackPanel Orientation="Horizontal">
                                             <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding HVelocity1}" />
-                                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                             <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run >
                                                                             <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
@@ -271,7 +271,7 @@
                                         <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="归零速度2" />
                                         <StackPanel Orientation="Horizontal">
                                             <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding HVelocity2}" />
-                                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                             <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run >
                                     <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGageInfo.xaml

@@ -24,13 +24,13 @@
             <RowDefinition Height="auto" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Grid Background="{StaticResource Background_Title}" >
+        <Grid Background="{StaticResource Brushes.TitleBar.Background}" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack" />
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack" />
                 <TextBlock Style="{StaticResource TextBlockStyle_Title}"  Text="机架信息"/>
             </StackPanel>
             <local:CtMicroGage Grid.Column="1" x:Name="mircoGage" Background="Transparent" VerticalAlignment="Bottom"/>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGrid/PgGrid.xaml

@@ -58,7 +58,7 @@
                                         <TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input}"
                                                  Text="{Binding TargetPos}" />
                                         <StackPanel Orientation="Horizontal" >
-                                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                             <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}">
                                                 <Run Text="{Binding TargetMm,Mode=OneWay}"/><Run Text="mm"/>
                                             </TextBlock>
@@ -194,7 +194,7 @@
                                     <TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input}"
                                                  Text="{Binding MeasureValuePos}" />
                                     <StackPanel Orientation="Horizontal" >
-                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}">
                                                 <Run Text="{Binding MeasureValueMm,Mode=OneWay}"/><Run Text="mm"/>
                                         </TextBlock>
@@ -208,7 +208,7 @@
                                     <TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input}"
                                                  Text="{Binding MeasureWidthPos}" />
                                     <StackPanel Orientation="Horizontal" >
-                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}">
                                                 <Run Text="{Binding MeasureWidthMm,Mode=OneWay}"/><Run Text="mm"/>
                                         </TextBlock>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgInitparam.xaml

@@ -48,7 +48,7 @@
                                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="机架长度" />
                                     <StackPanel Orientation="Horizontal">
                                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding PosLength}" />
-                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|"/>
+                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}"/>
                                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                             <Run>
                                 <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
@@ -166,7 +166,7 @@
                                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="扫描速度" />
                                     <StackPanel Orientation="Horizontal">
                                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VScan}" HorizontalAlignment="Left"/>
-                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run>
                                     <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
@@ -184,7 +184,7 @@
                                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="定位速度" />
                                     <StackPanel Orientation="Horizontal">
                                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VAccuracy}" />
-                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run>
                                     <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
@@ -201,7 +201,7 @@
                                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调试速度" />
                                     <StackPanel Orientation="Horizontal">
                                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VJOG}" />
-                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                         <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run>
                                     <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
@@ -221,7 +221,7 @@
                                 <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="开始速度" />
                                 <StackPanel Orientation="Horizontal">
                                     <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SVelocity}" />
-                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                     <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run >
                                     <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
@@ -239,7 +239,7 @@
                                 <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="归零速度1" />
                                 <StackPanel Orientation="Horizontal">
                                     <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding HVelocity1}" />
-                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                     <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run >
                                                                             <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
@@ -256,7 +256,7 @@
                                 <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="归零速度2" />
                                 <StackPanel Orientation="Horizontal">
                                     <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding HVelocity2}" />
-                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" Text="|" />
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
                                     <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                 <Run >
                                     <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgPwManager.xaml

@@ -21,7 +21,7 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal"  Background="{StaticResource Brush_theme_bar}" >
-            <Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/>
+            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
             <TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="密码管理"/>
         </StackPanel>
         <ScrollViewer  PanningMode="Both" Grid.Row="1" >
@@ -39,7 +39,7 @@
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
                                        Text="级别"/>
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" 
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" 
                                        Text="(0-10)"/>
                                 </StackPanel>
                             </DataGridTextColumn.Header>
@@ -83,7 +83,7 @@
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
                                        Text="级别"/>
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" 
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" 
                                        Text="(0-10)"/>
                                 </StackPanel>
                             </DataGridTextColumn.Header>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/DynAreaFilmWidth.xaml

@@ -24,7 +24,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
-        <Button Click="Border_Width_Click" Width="250" Style="{StaticResource ButtonStyle_empty}" Visibility="{Binding Enable,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
+        <Button Click="Border_Width_Click" Width="250" Style="{StaticResource Styles.Button.Empty}" Visibility="{Binding Enable,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
             <Border Style="{StaticResource BorderStyle_module}"  >
                 <StackPanel Margin="2">
                     <StackPanel Orientation="Horizontal" Margin="2">
@@ -33,7 +33,7 @@
 
                             <StackPanel Orientation="Horizontal" Margin="5,0">
                                 <TextBlock Text="{Binding Width, StringFormat={}{0:F0}}" FontSize="20" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
-                                <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" FontSize="12" />
+                                <TextBlock Style="{StaticResource ResourceKey=Styles.Text.FieldContent.Unit}" Text="mm" FontSize="12" />
                             </StackPanel>
                         </StackPanel>
 
@@ -41,7 +41,7 @@
                             <TextBlock Text="纵向速度" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
                             <StackPanel Orientation="Horizontal" Margin="5,0">
                                 <TextBlock Text="{Binding FilmVelocity, StringFormat={}{0:F1}}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
-                                <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="m/min" FontSize="12" />
+                                <TextBlock Style="{StaticResource ResourceKey=Styles.Text.FieldContent.Unit}" Text="m/min" FontSize="12" />
                             </StackPanel>
                         </StackPanel>
                     </StackPanel>
@@ -50,7 +50,7 @@
                             <TextBlock Text="纵向位置" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
                             <StackPanel Orientation="Horizontal" Margin="5,0">
                                 <TextBlock Text="{Binding FilmPosition, StringFormat={}{0:F2}}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
-                                <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="m" FontSize="12" />
+                                <TextBlock Style="{StaticResource ResourceKey=Styles.Text.FieldContent.Unit}" Text="m" FontSize="12" />
                             </StackPanel>
                         </StackPanel>
                     </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/DynAreaIO.xaml

@@ -35,7 +35,7 @@
             <local:DynAreaIOViewModel_UnitTest x:Key="viewModel" IsError="False" ErrMsg="枫莱尔控制器连接断开" />
         </ResourceDictionary>
     </UserControl.Resources>
-    <Button Click="Border_IO_Click" Style="{StaticResource ButtonStyle_empty}" d:DataContext="{StaticResource viewModel}">
+    <Button Click="Border_IO_Click" Style="{StaticResource Styles.Button.Empty}" d:DataContext="{StaticResource viewModel}">
         <Grid>
             <Border Style="{StaticResource BorderStyle_module}" >
                 <StackPanel Margin="2">
@@ -98,7 +98,7 @@
                             <StackPanel Orientation="Horizontal" Background="Black" >
                                 <!--<TextBlock Text="20000" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="White" />-->
                                 <TextBlock Text="{Binding Hrs}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="White" Padding="2,0"/>
-                                <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="小时" FontSize="12" Foreground="White"/>
+                                <TextBlock Style="{StaticResource ResourceKey=Styles.Text.FieldContent.Unit}" Text="小时" FontSize="12" Foreground="White"/>
                             </StackPanel>
                         </StackPanel>
                     </Grid>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/DynAreaIO.xaml.cs

@@ -161,9 +161,9 @@ namespace FLY.Thick.Base.UI.UiModule
 
         void UpdateError()
         {
-            if (this.gageService is FObjBase.FObjServiceClient)
+            if (this.warningSystem is FObjBase.FObjServiceClient)
             {
-                var client = this.gageService as FObjBase.FObjServiceClient;
+                var client = this.warningSystem as FObjBase.FObjServiceClient;
                 if (!client.IsConnected)
                 {
                     ErrMsg = "服务器连接断开";

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/DynAreaSample.xaml

@@ -20,11 +20,11 @@
                 <Setter Property="Foreground" Value="#FF3B3B3B"/>
                 <Setter Property="Margin" Value="5,0"/>
             </Style>
-            <local:GetSampleVmUt x:Key="viewModel" Enable="True">
-            </local:GetSampleVmUt>
+            <local:PgGetSampleVmUt x:Key="viewModel" Enable="True">
+            </local:PgGetSampleVmUt>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Button Name="Border_Sample" d:DataContext="{StaticResource viewModel}" Width="250" Click="Border_Sample_Click" Style="{StaticResource ButtonStyle_empty}" Visibility="{Binding Enable,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Collapsed}">
+    <Button Name="Border_Sample" d:DataContext="{StaticResource viewModel}" Width="250" Click="Border_Sample_Click" Style="{StaticResource Styles.Button.Empty}" Visibility="{Binding Enable,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Collapsed}">
         <Border Style="{StaticResource BorderStyle_module}" >
             <StackPanel Margin="2">
                 <ItemsControl ItemsSource="{Binding Samples}">
@@ -40,8 +40,8 @@
                                         <Run Text="样品" /><Run Text="{Binding Index}"/>
                                     </TextBlock>
                                     <TextBlock Text="{Binding AD}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}"/>
-                                    <TextBlock Text="|" Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" FontSize="24" />
-                                    <TextBlock  Text="{Binding OrgAD}"  Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" FontSize="12" />
+                                    <TextBlock Text="|" Style="{StaticResource ResourceKey=Styles.Text.FieldContent.Separator}" FontSize="24" />
+                                    <TextBlock  Text="{Binding OrgAD}"  Style="{StaticResource ResourceKey=Styles.Text.FieldContent.Unit}" FontSize="12" />
                                 </StackPanel>
                                 <TextBlock Grid.Column="1" Text="{Binding SampleValue,StringFormat={}{0:F2}}"  FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Background="{StaticResource Color_theme_activity}" Foreground="White"/>
                             </Grid>
@@ -65,8 +65,8 @@
                                 <TextBlock Text="偏移" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
                                 <StackPanel Orientation="Horizontal" Margin="5,0">
                                     <TextBlock Text="{Binding MaxOffset}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
-                                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|"  FontSize="12"/>
-                                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}"  FontSize="12">
+                                    <TextBlock Style="{StaticResource ResourceKey=Styles.Text.FieldContent.Separator}"  FontSize="12"/>
+                                    <TextBlock Style="{StaticResource ResourceKey=Styles.Text.FieldContent.Unit}"  FontSize="12">
                                                     <Run >
                                                         <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
                                                             <Binding Path=".MaxOffset" />

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraph.xaml

@@ -132,7 +132,7 @@
                         <Setter Property="SnapsToDevicePixels" Value="True"/>
                     </Style>
                 </StackPanel.Resources>
-                <Button Click="button_pause_Click" Style="{StaticResource ButtonStyle_empty}" Margin="5,0">
+                <Button Click="button_pause_Click" Style="{StaticResource Styles.Button.Empty}" Margin="5,0">
                     <Grid Style="{StaticResource GridStyle_ButtonShadow}">
                         <Rectangle Fill="{StaticResource Color_theme_activity}" Width="40" Height="40"/>
                         <Path Fill="White" Stretch="Uniform" Width="20" Height="20">
@@ -149,7 +149,7 @@
                         </Path>
                     </Grid>
                 </Button>
-                <Button Click="button_save_Click" Style="{StaticResource ButtonStyle_empty}" Margin="5,0" IsEnabled="{Binding IsPaused}">
+                <Button Click="button_save_Click" Style="{StaticResource Styles.Button.Empty}" Margin="5,0" IsEnabled="{Binding IsPaused}">
                     <Grid Style="{StaticResource GridStyle_ButtonShadow}">
                         <Rectangle  Width="40" Height="40">
                             <Rectangle.Style>
@@ -167,7 +167,7 @@
                         <Path Data="{StaticResource Geometry_floppy}" Fill="White" Stretch="Uniform" Width="20" Height="20"/>
                     </Grid>
                 </Button>
-                <Button Click="button_analyze_Click" Style="{StaticResource ButtonStyle_empty}" Margin="5,0" IsEnabled="{Binding IsPaused}">
+                <Button Click="button_analyze_Click" Style="{StaticResource Styles.Button.Empty}" Margin="5,0" IsEnabled="{Binding IsPaused}">
                     <Grid Style="{StaticResource GridStyle_ButtonShadow}">
                         <Rectangle Width="40" Height="40">
                             <Rectangle.Style>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraphConfig.xaml

@@ -23,14 +23,14 @@
         <StackPanel Orientation="Vertical" Margin="5,20">
             <StackPanel Orientation="Horizontal">
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="混合数" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="混合数" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Mix}" />
+                        <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Mix}" />
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <StackPanel Orientation="Vertical" Margin="5">
-                        <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="间隔" />
+                        <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="间隔" />
                         <StackPanel Orientation="Horizontal">
                             <ComboBox x:Name="combox_intervalopt" Width="140" HorizontalAlignment="Left" FontSize="32" 
                                       ItemsSource="{Binding DataContext.IntervalOpt, ElementName=grid_null}" 
@@ -39,13 +39,13 @@
                         </StackPanel>
                     </StackPanel>
                     <StackPanel Orientation="Vertical" Margin="5">
-                        <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="数据量" />
+                        <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="数据量" />
                         <StackPanel Orientation="Horizontal">
                             <ComboBox x:Name="combox_datalenopt" Width="140" HorizontalAlignment="Left" FontSize="32" 
                                           ItemsSource="{Binding DataContext.DataLenOpt, ElementName=grid_null}" 
                                           SelectedValue="{Binding Len}"/>
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
+                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
+                            <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
                                         <Run>
                                             <MultiBinding Converter="{StaticResource timelenconv}" Mode="OneWay" >
                                                 <Binding Path="Interval" />
@@ -59,33 +59,33 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="AD模式" />
-                    <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsADMode}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="AD模式" />
+                    <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsADMode}" />
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="自动Y轴" />
-                    <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsAutoY}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="自动Y轴" />
+                    <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsAutoY}" />
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Margin="5" Visibility="{Binding IsAutoY,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="自动Y轴中值" />
-                    <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsAutoTarget}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="自动Y轴中值" />
+                    <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsAutoTarget}" />
                 </StackPanel>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Visibility="{Binding IsAutoY,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}">
                 <StackPanel Orientation="Vertical" Margin="5" Visibility="{Binding IsAutoTarget,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="Y轴中值" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="Y轴中值" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YTarget}" />
+                        <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding YTarget}" />
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="Y轴范围" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="Y轴范围" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YRange}" />
+                        <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding YRange}" />
                     </StackPanel>
                 </StackPanel>
             </StackPanel>
-            <Button Style="{StaticResource ButtonStyle_empty}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="button_save_Click" Margin="5,-100,5,0" Background="White">
+            <Button Style="{StaticResource Styles.Button.Empty}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="button_save_Click" Margin="5,-100,5,0" Background="White">
                 <Path Data="{StaticResource Geometry_check-circle}" Fill="{StaticResource Color_theme_activity}" Stretch="Fill" Height="80" Width="80"  />
             </Button>
         </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/PgFixAnalyze.xaml

@@ -98,7 +98,7 @@
                 <ColumnDefinition/>
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
-            <Button Style="{StaticResource ButtonStyle_empty}" Command="BrowseBack" Margin="10">
+            <Button Style="{StaticResource Styles.Button.Empty}" Command="BrowseBack" Margin="10">
                 <Grid>
                     <Rectangle Width="60" Height="60" Fill="White"/>
                     <Path Fill="{StaticResource Brush_theme_bar}" Data="{StaticResource Geometry_arrow-left-bold}" 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/WdAHelper.xaml

@@ -15,16 +15,16 @@
     <Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" >
         <StackPanel Margin="5,20">
             <StackPanel Orientation="Horizontal" Margin="0,5">
-                <Border Style="{StaticResource BorderStyle_paramSection}" >
+                <Border Style="{StaticResource Styles.ParamSection.Border}" >
                     <TextBlock Text="方程" />
                 </Border>
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="实际值Y"/>
-                    <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Y}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="实际值Y"/>
+                    <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Y}" />
                 </StackPanel>
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="显示值X" />
-                    <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding X}"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="显示值X" />
+                    <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding X}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,5">

Project.FLY.Thick.Base/FLY.Thick.Base.UI/WdAbHelper.xaml

@@ -17,29 +17,29 @@
     <Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" d:DataContext="{StaticResource viewmodel}">
         <StackPanel Margin="5,20">
             <StackPanel Orientation="Horizontal" Margin="0,5">
-                <Border Style="{StaticResource BorderStyle_paramSection}" >
+                <Border Style="{StaticResource Styles.ParamSection.Border}" >
                     <TextBlock Text="方程1"/>
                 </Border>
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="实际值Y1" />
-                    <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Y1}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="实际值Y1" />
+                    <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Y1}" />
                 </StackPanel>
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}"  Text="显示值X1" />
-                    <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding X1}"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}"  Text="显示值X1" />
+                    <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding X1}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,5">
-                <Border Style="{StaticResource BorderStyle_paramSection}" >
+                <Border Style="{StaticResource Styles.ParamSection.Border}" >
                     <TextBlock Text="方程2"/>
                 </Border>
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="实际值Y2" />
-                    <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Y2}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="实际值Y2" />
+                    <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Y2}" />
                 </StackPanel>
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}"  Text="显示值X2"/>
-                    <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding X2}"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}"  Text="显示值X2"/>
+                    <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding X2}"/>
                 </StackPanel>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,5">

Project.FLY.Thick.Base/FLY.Thick.Base.UI/WdPassword.xaml

@@ -24,11 +24,11 @@
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <StackPanel Margin="{StaticResource ControlMargin}" >
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="保持5分钟" />
-                    <ToggleButton Name="togglebutton_keep5min"  Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding Keep5Min}" HorizontalAlignment="Left"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="保持5分钟" />
+                    <ToggleButton Name="togglebutton_keep5min"  Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding Keep5Min}" HorizontalAlignment="Left"/>
                 </StackPanel>
                 <StackPanel Margin="{StaticResource ControlMargin}" Grid.Column="1">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="请输入密码" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="请输入密码" />
                     <StackPanel Orientation="Horizontal">
                        <PasswordBox x:Name="passwordbox" Margin="{StaticResource ControlMargin}"
                              Controls:TextBoxHelper.Watermark="请输入密码"

Project.FLY.Thick.Base/FLY.Thick.Base.UI/WdSaveDatas.xaml

@@ -21,7 +21,7 @@
             <StackPanel Grid.Column="1" Orientation="Vertical" Margin="5">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="文件路径" VerticalAlignment="Bottom"/>
-                    <Button Style="{StaticResource ButtonStyle_empty}" Click="button_open_Click" Background="White" VerticalAlignment="Bottom" Margin="5">
+                    <Button Style="{StaticResource Styles.Button.Empty}" Click="button_open_Click" Background="White" VerticalAlignment="Bottom" Margin="5">
                         <Path Data="{StaticResource Geometry_plus-box-outline}" Fill="{StaticResource Color_theme_activity}" Height="36" Width="36" Stretch="Fill" SnapsToDevicePixels="True" />
                     </Button>
                 </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/WdThickScale.xaml

@@ -20,14 +20,14 @@
                 <StackPanel Orientation="Vertical" Margin="5">
                     <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="显示值" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Old}"    MinWidth="150" />
+                        <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Old}"    MinWidth="150" />
                     </StackPanel>
                 </StackPanel>
                 <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="->" VerticalAlignment="Center" />
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="实际值" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="实际值" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding New}" MinWidth="150"/>
+                        <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding New}" MinWidth="150"/>
                     </StackPanel>
                 </StackPanel>
             </StackPanel>