Merge remote-tracking branch 'remotes/origin/dev7.0-battery.laser-20210703' into dev7.0-filmCasting

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

@@ -23,9 +23,9 @@
             <TextBlock Text="报警提示" />
         </Border>
         <StackPanel Grid.Column="1">
-            <GroupBox Style="{x:Null}" Margin="5">
+            <GroupBox Style="{x:Null}" Margin="{StaticResource ControlMargin}">
                 <GroupBox.Header>
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="音乐" VerticalAlignment="Bottom"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="音乐" VerticalAlignment="Bottom"/>
                 </GroupBox.Header>
                 <StackPanel>
                     <Grid>
@@ -34,22 +34,22 @@
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <StackPanel Orientation="Horizontal">
-                            <StackPanel Orientation="Vertical" Margin="5">
+                            <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                                 <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="持续时间" />
                                 <StackPanel Orientation="Horizontal">
                                     <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}" >
+                            <Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Command="{Binding PlayCmd}" >
                                 <iconPacks:PackIconMaterial Kind="Play" />
                             </Button>
                         </StackPanel>
                         <Grid Grid.Column="1">
-                            <StackPanel Grid.Column="1" Margin="5">
+                            <StackPanel Grid.Column="1" Margin="{StaticResource ControlMargin}">
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="音乐文件路径" VerticalAlignment="Bottom"/>
-                                    <Button Style="{StaticResource ButtonStyle_icon}" Command="{Binding OpenCmd}" >
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="音乐文件路径" VerticalAlignment="Bottom"/>
+                                    <Button Style="{StaticResource Styles.Button.Icon}" Command="{Binding OpenCmd}" >
                                         <iconPacks:PackIconMaterial Kind="FolderOpen" />
                                     </Button>
                                 </StackPanel>
@@ -66,15 +66,15 @@
                 </StackPanel>
 
             </GroupBox>
-            <GroupBox Style="{x:Null}" Margin="5">
+            <GroupBox Style="{x:Null}" Margin="{StaticResource ControlMargin}">
                 <GroupBox.Header>
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="USB继电器" VerticalAlignment="Bottom"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="USB继电器" VerticalAlignment="Bottom"/>
                 </GroupBox.Header>
                 <StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <StackPanel Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="使能" />
-                            <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding EnableLCUS1}" />
+                            <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding LCUS1_Enable}" />
                         </StackPanel>
                         <StackPanel Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="串口地址" />
@@ -84,23 +84,23 @@
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
 
-                            <Button Style="{StaticResource ButtonStyle_RectangleIcon}" Command="{Binding BellRingCmd}" >
+                            <Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Command="{Binding BellRingCmd}" >
                                 <iconPacks:PackIconMaterial Kind="BellRing" />
                             </Button>
 
-                            <Button Style="{StaticResource ButtonStyle_RectangleIcon}" Command="{Binding BellOffCmd}" Background="{StaticResource Color_theme_noact}">
+                            <Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Command="{Binding BellOffCmd}" Background="{StaticResource Brushes.NoAct}">
                                 <iconPacks:PackIconMaterial Kind="BellOff" />
                             </Button>
   
                         </StackPanel>
                     </StackPanel>
-                    <TextBlock x:Name="textblock_lcus" Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding ErrMsg}" />
+                    <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="{Binding LCUS1.ErrMsg}" />
                 </StackPanel>
 
             </GroupBox>
-            <GroupBox Style="{x:Null}" Margin="5">
+            <GroupBox Style="{x:Null}" Margin="{StaticResource ControlMargin}">
                 <GroupBox.Header>
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="大屏显示扫描报警" VerticalAlignment="Bottom"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="大屏显示扫描报警" VerticalAlignment="Bottom"/>
                 </GroupBox.Header>
                 <StackPanel Orientation="Horizontal" x:Name="spErrCodes">
                     <StackPanel Margin="{StaticResource ControlMargin}">

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

@@ -64,7 +64,7 @@ namespace FLY.Thick.Base.UI.CustomSection
         /// <summary>
         /// 使能USB 继电器
         /// </summary>
-        public bool EnableLCUS1 { get; set; }
+        public bool LCUS1_Enable { get; set; }
 
 
 
@@ -78,25 +78,25 @@ namespace FLY.Thick.Base.UI.CustomSection
 
 
         ParamDictionary paramDictionary;
-        LCUS1 lCUS1;
-
+        LCUS1 lcus1;
+        public LCUS1 LCUS1 => lcus1;
         public UcSectionErrorVm() 
         {
             PlayCmd = new RelayCommand(Play);
             OpenCmd = new RelayCommand(Open);
-            BellRingCmd = new RelayCommand(() => { lCUS1.On(); });
-            BellOffCmd = new RelayCommand(() => { lCUS1.Off(); });
+            BellRingCmd = new RelayCommand(() => { lcus1.On(); });
+            BellOffCmd = new RelayCommand(() => { lcus1.Off(); });
         }
 
         public void Init(ParamDictionary paramDictionary, LCUS1 lCUS1)
         {
             this.paramDictionary = paramDictionary;
-            this.lCUS1 = lCUS1;
-            paramDictionary.SetBinding(this, "WarningTipPath", "");
-            paramDictionary.SetBinding(this, "WarningDurationSec", 5);
-            paramDictionary.SetBinding(this, "EnableScanErrBigTip", false);
-            paramDictionary.SetBinding(this, "LCUS1_PortName", "COM1");
-            paramDictionary.SetBinding(this, "EnableLCUS1", false);
+            this.lcus1 = lCUS1;
+            paramDictionary.SetBinding(this, nameof(WarningTipPath), ParamDistItemKeys.WarningTipPath, "");
+            paramDictionary.SetBinding(this, nameof(WarningDurationSec), ParamDistItemKeys.WarningDurationSec, 5);
+            paramDictionary.SetBinding(this, nameof(EnableScanErrBigTip), ParamDistItemKeys.EnableScanErrBigTip, false);
+            paramDictionary.SetBinding(this, nameof(LCUS1_PortName), ParamDistItemKeys.LCUS1_PortName, "COM1");
+            paramDictionary.SetBinding(this, nameof(LCUS1_Enable), ParamDistItemKeys.LCUS1_Enable, false);
         }
 
         private void Play() 

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

@@ -48,8 +48,8 @@ namespace FLY.Thick.Base.UI.CustomSection
 
         public void Init(ParamDictionary paramDictionary)
         {
-            paramDictionary.SetBinding(this, "HaveOSK", false);
-            paramDictionary.SetBinding(this, "HaveOSK_mouse", false);
+            paramDictionary.SetBinding(this, nameof(HaveOSK), ParamDistItemKeys.HaveOSK, false);
+            paramDictionary.SetBinding(this, nameof(HaveOSK_mouse), ParamDistItemKeys.HaveOSK_mouse, false);
         }
 
     }

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

@@ -53,7 +53,7 @@
                             <StackPanel Orientation="Horizontal" Margin="3,1.5">
                                 <TextBlock Style="{StaticResource TextBlockStyle_GridFieldContent}" Text="{Binding ControllerState}"/>
                                 <TextBlock Style="{StaticResource TextBlockStyle_GridFieldContent}" Text="{Binding Header}"/>
-                                <Button Style="{StaticResource ButtonStyle_icon}" Click="button_del_Click" Tag="{Binding .}" Foreground="{StaticResource MahApps.Brushes.Validation5}">
+                                <Button Style="{StaticResource Styles.Button.Icon}" Click="button_del_Click" Tag="{Binding .}" Foreground="{StaticResource MahApps.Brushes.Validation5}">
                                     <iconPacks:PackIconMaterial Kind="CloseCircle"/>
                                 </Button>
                             </StackPanel>
@@ -67,7 +67,7 @@
             <StackPanel Orientation="Horizontal" Margin="3">
                 <ComboBox x:Name="combobox_controllerstate" Style="{StaticResource ComboBoxStyle_GridFieldContent}"/>
                 <ComboBox x:Name="combobox_tabitemheader" Style="{StaticResource ComboBoxStyle_GridFieldContent}"/>
-                <Button Style="{StaticResource ButtonStyle_icon}" Click="button_add_Click" >
+                <Button Style="{StaticResource Styles.Button.Icon}" Click="button_add_Click" >
                     <iconPacks:PackIconMaterial Kind="PlusCircle"/>
                 </Button>
             </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/DependOn/LCUS1_dependOn.cs

@@ -17,20 +17,14 @@ namespace FLY.Thick.Base.UI
         {
             this.paramDictionary = paramDictionary;
             this.warningService = warningService;
-            PortName = this.paramDictionary.GetValue("LCUS1_PortName", "COM1");
-            this.paramDictionary.ValueChanged += (s, e) =>
-            {
-                if (e.Key == "LCUS1_PortName")
-                {
-                    PortName = e.Value as string;
-                }
-            };
+            //绑定 this.PortName 与 this.paramDictionary.LCUS1_PortName
+            this.paramDictionary.SetBinding(this, nameof(PortName), ParamDistItemKeys.LCUS1_PortName, "COM1");
 
             this.warningService.PropertyChanged += (s, e) =>
             {
                 if (e.PropertyName == nameof(this.warningService.IsRinging))
                 {
-                    if (this.paramDictionary.GetValue("EnableLCUS1",false))
+                    if (this.paramDictionary.GetValue(ParamDistItemKeys.LCUS1_Enable, false))
                     {
                         if (this.warningService.IsRinging)
                         {

Project.FLY.Thick.Base/FLY.Thick.Base.UI/OnInit/OnInitError.cs

@@ -102,7 +102,7 @@ namespace FLY.Thick.Base.UI.OnInit
 
         void updateErrCodesOfTip()
         {
-            enableScanErrBigTip = paramDictionary.GetValue<bool>(ParamDistItemKeys.EnableScanErrBigTip, false);
+            enableScanErrBigTip = paramDictionary.GetValue(ParamDistItemKeys.EnableScanErrBigTip, false);
 
         }
     }

Project.FLY.Thick.Base/FLY.Thick.Base.UI/ParamDistItemKeys.cs

@@ -15,7 +15,7 @@ namespace FLY.Thick.Base.UI
         public const string WarningDurationSec = "WarningDurationSec";
         public const string EnableScanErrBigTip = "EnableScanErrBigTip";
         public const string LCUS1_PortName = "LCUS1_PortName";
-        public const string EnableLCUS1 = "EnableLCUS1";
+        public const string LCUS1_Enable = "LCUS1_Enable";
         public const string WindowSize = "WindowSize";
 
     }

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

@@ -35,7 +35,7 @@
                 <DataGridTextColumn CanUserSort="False" CanUserReorder="False" Binding="{Binding ConnName}" IsReadOnly="True">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
+                            <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" 
                                        Text="服务器"/>
                         </StackPanel>
                     </DataGridTextColumn.Header>
@@ -43,7 +43,7 @@
                 <DataGridTextColumn CanUserSort="False" CanUserReorder="False" Binding="{Binding Address}" >
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
+                            <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" 
                                        Text="地址"/>
                             <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" FontSize="15" 
                                        Text="如:127.0.0.0:20006"/>

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

@@ -52,7 +52,7 @@
                 </Button>
                 <StackPanel Grid.Column="1">
 
-                    <StackPanel Margin="5" Visibility="{Binding DataContext.HasHold, ElementName=grid_initparam, Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}">
+                    <StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding DataContext.HasHold, ElementName=grid_initparam, Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}">
                         <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="有效范围" />
                         <StackPanel Orientation="Horizontal">
                             <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Valid.Begin}" />
@@ -80,37 +80,37 @@
 
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="使能" />
                             <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding Enable}" HorizontalAlignment="Left"/>
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="单一材料" />
                             <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsOneMaterial}" HorizontalAlignment="Left"/>
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="拐点查找" />
                             <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsBreakDetect}" HorizontalAlignment="Left"/>
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="设置温修" />
                             <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding TempADBySet}" HorizontalAlignment="Left"/>
                         </StackPanel>
                         <Grid>
-                            <StackPanel  Margin="5" Visibility="{Binding TempADBySet, Converter={StaticResource visbilityconv},ConverterParameter=CollapsedWhenTrue}">
+                            <StackPanel  Margin="{StaticResource ControlMargin}" Visibility="{Binding TempADBySet, Converter={StaticResource visbilityconv},ConverterParameter=CollapsedWhenTrue}">
                                 <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="温修AD" />
                                 <TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="{Binding TempAD}" />
                             </StackPanel>
-                            <StackPanel  Margin="5" Visibility="{Binding TempADBySet, Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
+                            <StackPanel  Margin="{StaticResource ControlMargin}" Visibility="{Binding TempADBySet, Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
                                 <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="温修AD" />
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding TempAD}" />
                             </StackPanel>
                         </Grid>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="温修范围%" />
                             <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsTempRangeByPercent}" HorizontalAlignment="Left"/>
                         </StackPanel>
-                        <StackPanel Margin="5" >
+                        <StackPanel Margin="{StaticResource ControlMargin}" >
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="温修范围" />
                             <Grid>
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding TempRange}" Visibility="{Binding IsTempRangeByPercent, Converter={StaticResource visbilityconv},ConverterParameter=CollapsedWhenTrue}"/>
@@ -123,7 +123,7 @@
 
                     </StackPanel>
                     <WrapPanel Orientation="Horizontal">
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="滤波器" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding N}" />
@@ -141,7 +141,7 @@
 
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="探头直径" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding SensorWidth}" />
@@ -159,7 +159,7 @@
 
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="边界内缩" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding N2}" />
@@ -177,7 +177,7 @@
 
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="边界外扩" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding N3}" />
@@ -209,13 +209,13 @@
                 <Border Style="{StaticResource Styles.ParamSection.Border}">
                     <TextBlock Text="结果"/>
                 </Border>
-                <Grid Grid.Column="1" Margin="5">
+                <Grid Grid.Column="1" Margin="{StaticResource ControlMargin}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
                     <WrapPanel Grid.Column="1" Orientation="Horizontal">
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Text="正向边界" >
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader}">
@@ -254,7 +254,7 @@
                             </StackPanel>
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Text="反向边界" >
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader}">
@@ -293,7 +293,7 @@
                             </StackPanel>
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="膜宽" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Style="{StaticResource Styles.Text.FieldContent}">
@@ -312,7 +312,7 @@
                             </StackPanel>
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="期望膜宽" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Style="{StaticResource Styles.Text.FieldContent}">
@@ -332,7 +332,7 @@
 
                         </StackPanel>
                     </WrapPanel>
-                    <WindowsFormsHost Grid.Row="1" Margin="5">
+                    <WindowsFormsHost Grid.Row="1" Margin="{StaticResource ControlMargin}">
                         <Chr:Chart x:Name="chart1"/>
                     </WindowsFormsHost>
                 </Grid>

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

@@ -46,21 +46,21 @@
                 <StackPanel Grid.Column="1">
 
                     <StackPanel Orientation="Horizontal">
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="使能" />
                             <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding Enable}" HorizontalAlignment="Left"/>
                         </StackPanel>
                         <Grid>
-                            <StackPanel  Margin="5" >
-                                <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="温修AD" />
+                            <StackPanel  Margin="{StaticResource ControlMargin}" >
+                                <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="温修AD" />
                                 <TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding TempAD}" />
                             </StackPanel>
                         </Grid>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="温修范围%" />
                             <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsTempRangeByPercent}" HorizontalAlignment="Left"/>
                         </StackPanel>
-                        <StackPanel Margin="5" >
+                        <StackPanel Margin="{StaticResource ControlMargin}" >
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="温修范围" />
                             <Grid>
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding TempRange}" Visibility="{Binding IsTempRangeByPercent, Converter={StaticResource visbilityconv},ConverterParameter=CollapsedWhenTrue}"/>
@@ -73,7 +73,7 @@
 
                     </StackPanel>
                     <WrapPanel Orientation="Horizontal">
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="滤波器" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding N}" />
@@ -91,7 +91,7 @@
 
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="探头直径" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding SensorWidth}" />
@@ -109,7 +109,7 @@
 
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="边界内缩" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding N2}" />
@@ -127,7 +127,7 @@
 
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="边界外扩" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding N3}" />
@@ -159,16 +159,16 @@
                 <Border Style="{StaticResource Styles.ParamSection.Border}">
                     <TextBlock Text="结果"/>
                 </Border>
-                <Grid Grid.Column="1" Margin="5">
+                <Grid Grid.Column="1" Margin="{StaticResource ControlMargin}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
                     <WrapPanel Grid.Column="1" Orientation="Horizontal">
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Text="正向边界" >
                                 <TextBlock.Style>
-                                    <Style TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeader}">
+                                    <Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader}">
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding DataContext.Direction,ElementName=root}" Value="{x:Static misc:DIRECTION.FORWARD}">
                                                 <Setter Property="Foreground" Value="Red"/>
@@ -204,10 +204,10 @@
                             </StackPanel>
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
                             <TextBlock Text="反向边界" >
                                 <TextBlock.Style>
-                                    <Style TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeader}">
+                                    <Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader}">
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding DataContext.Direction,ElementName=root}" Value="{x:Static misc:DIRECTION.BACKWARD}">
                                                 <Setter Property="Foreground" Value="Red"/>
@@ -243,8 +243,8 @@
                             </StackPanel>
 
                         </StackPanel>
-                        <StackPanel  Margin="5">
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="膜宽" />
+                        <StackPanel  Margin="{StaticResource ControlMargin}">
+                            <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="膜宽" />
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Style="{StaticResource TextBlockStyle_FieldContent}">
                                 <Run Text="{Binding Width,Mode=OneWay}"/>
@@ -263,7 +263,7 @@
 
                         </StackPanel>
                     </WrapPanel>
-                    <WindowsFormsHost Grid.Row="1" Margin="5">
+                    <WindowsFormsHost Grid.Row="1" Margin="{StaticResource ControlMargin}">
                         <Chr:Chart x:Name="chart1"/>
                     </WindowsFormsHost>
                 </Grid>

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

@@ -19,14 +19,14 @@
 
             <Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" >
                 <StackPanel Orientation="Vertical" Margin="5,20">
-                    <StackPanel Orientation="Vertical" Margin="5">
-                <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="序列码" />
+                    <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
+                <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="序列码" />
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding Code, Converter={StaticResource bytesconv}}"   Tag="Full" MinWidth="400" />
                         </StackPanel>
 
                     </StackPanel>
-                    <StackPanel Orientation="Vertical" Margin="5">
+                    <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                         <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="授权码" />
                         <StackPanel Orientation="Horizontal">
                             <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Access, Converter={StaticResource bytesconv}}" Tag="Full"/>
@@ -35,7 +35,7 @@
 
 
 
-                    <Button Style="{StaticResource ButtonStyle2}" Content="应用"  Margin="5" Width="auto" Command="{Binding ApplyCmd}" />
+                    <Button Style="{StaticResource ButtonStyle2}" Content="应用"  Margin="{StaticResource ControlMargin}" Width="auto" Command="{Binding ApplyCmd}" />
                 </StackPanel>
             </Grid>
 

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

@@ -64,7 +64,7 @@
                 </Button.Style>
 
             </Button>
-            <Grid Grid.Column="1" Margin="5">
+            <Grid Grid.Column="1" Margin="{StaticResource ControlMargin}">
                 <Grid.RowDefinitions>
                     <RowDefinition  Height="Auto"/>
                     <RowDefinition  />

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

@@ -90,7 +90,7 @@
                                 <ColumnDefinition/>
                                 <ColumnDefinition Width="auto"/>
                             </Grid.ColumnDefinitions>
-                            <ItemsControl ItemsSource="{Binding SeriesInfos}" Margin="5" x:Name="itemSelect">
+                            <ItemsControl ItemsSource="{Binding SeriesInfos}" Margin="{StaticResource ControlMargin}" x:Name="itemSelect">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <WrapPanel Orientation="Horizontal" />
@@ -130,7 +130,7 @@
                                 <RowDefinition Height="auto"/>
                                 <RowDefinition/>
                             </Grid.RowDefinitions>
-                            <lvc:CartesianChart x:Name="chart1" Grid.Row="1" Margin="5" Height="350" MouseMove="UIElement_OnMouseMove" MouseDown="UIElement_MouseDown" MouseUp="UIElement_MouseUp"
+                            <lvc:CartesianChart x:Name="chart1" Grid.Row="1" Margin="{StaticResource ControlMargin}" Height="350" MouseMove="UIElement_OnMouseMove" MouseDown="UIElement_MouseDown" MouseUp="UIElement_MouseUp"
                                             DisableAnimations="True" Hoverable="False" DataTooltip="{x:Null}"
                                             Series="{Binding Series}"
                                             >

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

@@ -37,7 +37,7 @@
                         <DataGridTextColumn CanUserReorder="False" Binding="{Binding Level}" >
                             <DataGridTextColumn.Header>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" 
                                        Text="级别"/>
                                     <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" 
                                        Text="(0-10)"/>
@@ -47,7 +47,7 @@
                         <DataGridTextColumn CanUserSort="False" CanUserReorder="False" Binding="{Binding Password}" >
                             <DataGridTextColumn.Header>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" 
                                        Text="密码"/>
                                 </StackPanel>
                             </DataGridTextColumn.Header>
@@ -65,7 +65,7 @@
                         <DataGridTextColumn CanUserReorder="False" Binding="{Binding UiName}" >
                             <DataGridTextColumn.Header>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" 
                                        Text="名称"/>
                                 </StackPanel>
                             </DataGridTextColumn.Header>
@@ -73,7 +73,7 @@
                         <DataGridTextColumn CanUserReorder="False" Binding="{Binding Description}" >
                             <DataGridTextColumn.Header>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" 
                                        Text="描述"/>
                                 </StackPanel>
                             </DataGridTextColumn.Header>
@@ -81,7 +81,7 @@
                         <DataGridTextColumn CanUserReorder="False" Binding="{Binding Level}" >
                             <DataGridTextColumn.Header>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" 
+                                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" 
                                        Text="级别"/>
                                     <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" 
                                        Text="(0-10)"/>

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

@@ -226,7 +226,7 @@
 
                             </Grid>
                             <Controls:RangeSlider Grid.Row="2" Grid.Column="1"
-                                                  Margin="5"
+                                                  Margin="{StaticResource ControlMargin}"
                                                   Controls:SliderHelper.ChangeValueBy="LargeChange"
                                                   Controls:SliderHelper.EnableMouseWheel="MouseHover"
                                                   AutoToolTipPlacement="TopLeft"

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

@@ -103,7 +103,7 @@
                         <ColumnDefinition Width="auto"/>
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
-                    <Path Margin="5" Fill="White" Stretch="Uniform" Width="60" Height="60" SnapsToDevicePixels="True" Data="{StaticResource Geometry_alert-circle-outline}"  >
+                    <Path Margin="{StaticResource ControlMargin}" Fill="White" Stretch="Uniform" Width="60" Height="60" SnapsToDevicePixels="True" Data="{StaticResource Geometry_alert-circle-outline}"  >
                         <Path.Style>
                             <Style TargetType="Path">
                                 <Style.Triggers>
@@ -121,7 +121,7 @@
                             </Style>
                         </Path.Style>
                     </Path>
-                    <Viewbox Grid.Column="1" Margin="5" MaxWidth="190" MaxHeight="80">
+                    <Viewbox Grid.Column="1" Margin="{StaticResource ControlMargin}" MaxWidth="190" MaxHeight="80">
                         <TextBlock VerticalAlignment="Center" MaxWidth="190" TextWrapping="Wrap" FontSize="30" Foreground="White" Text="{Binding ErrMsg}"/>
                     </Viewbox>
                     

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

@@ -31,7 +31,7 @@
                     <Viewbox Margin="10">
                         <TextBlock Text="{Binding Thk,StringFormat={}{0:F1}}" Foreground="White" FontSize="30" FontWeight="Bold" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" />
                     </Viewbox>
-                    <TextBlock Text="{Binding ControllerState,Converter={StaticResource ctrlstateconv}}" Style="{StaticResource Styles.Module.Text.ItemValue.Unit}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="White" Margin="5"/>
+                    <TextBlock Text="{Binding ControllerState,Converter={StaticResource ctrlstateconv}}" Style="{StaticResource Styles.Module.Text.ItemValue.Unit}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="White" Margin="{StaticResource ControlMargin}"/>
                 </Grid>
             </Border>
             <StackPanel Grid.Row="1" Margin="2">

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

@@ -96,7 +96,7 @@
                 <Viewbox MaxHeight="50">
                     <StackPanel Orientation="Horizontal">
                         <StackPanel>
-                            <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="5">
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="{StaticResource ControlMargin}">
                                 <StackPanel Orientation="Horizontal" Visibility="{Binding IsADMode,Converter={StaticResource visbilityconv}}">
                                     <TextBlock FontSize="16" Margin="3,0" Width="auto" Text="AD值" Foreground="{StaticResource Brushes.Highlight}"/>
                                 </StackPanel>
@@ -189,7 +189,7 @@
                   Margin="10,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                   Background="{StaticResource SemiTransparentGreyBrush}" >
                 <Viewbox MaxHeight="50">
-                    <StackPanel Margin="5">
+                    <StackPanel Margin="{StaticResource ControlMargin}">
                         <StackPanel.Resources>
                             <Style TargetType="Viewbox">
                                 <Setter Property="Height" Value="25"/>

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

@@ -22,14 +22,14 @@
         <Grid x:Name="grid_null" d:DataContext="{d:DesignInstance local:FixGraphConfig}"/>
         <StackPanel Orientation="Vertical" Margin="5,20">
             <StackPanel Orientation="Horizontal">
-                <StackPanel Orientation="Vertical" Margin="5">
+                <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="混合数" />
                     <StackPanel Orientation="Horizontal">
                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Mix}" />
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
-                    <StackPanel Orientation="Vertical" Margin="5">
+                    <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                         <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="间隔" />
                         <StackPanel Orientation="Horizontal">
                             <ComboBox x:Name="combox_intervalopt" Width="140" HorizontalAlignment="Left" FontSize="32" 
@@ -38,7 +38,7 @@
                                       SelectedValue="{Binding Interval}"/>
                         </StackPanel>
                     </StackPanel>
-                    <StackPanel Orientation="Vertical" Margin="5">
+                    <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                         <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="数据量" />
                         <StackPanel Orientation="Horizontal">
                             <ComboBox x:Name="combox_datalenopt" Width="140" HorizontalAlignment="Left" FontSize="32" 
@@ -58,27 +58,27 @@
                 </StackPanel>
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
-                <StackPanel Orientation="Vertical" Margin="5">
+                <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                     <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">
+                <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                     <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}">
+                <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}" Visibility="{Binding IsAutoY,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}">
                     <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}">
+                <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}" Visibility="{Binding IsAutoTarget,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}">
                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="Y轴中值" />
                     <StackPanel Orientation="Horizontal">
                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding YTarget}" />
                     </StackPanel>
                 </StackPanel>
-                <StackPanel Orientation="Vertical" Margin="5">
+                <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="Y轴范围" />
                     <StackPanel Orientation="Horizontal">
                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding YRange}" />

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

@@ -68,7 +68,7 @@
                 </lvc:CartesianChart.AxisY >
             </lvc:CartesianChart>
             <Controls:RangeSlider Grid.Row="1" 
-                                    Margin="5"
+                                    Margin="{StaticResource ControlMargin}"
                                     Controls:SliderHelper.ChangeValueBy="LargeChange"
                                     Controls:SliderHelper.EnableMouseWheel="MouseHover"
                                     AutoToolTipPlacement="TopLeft"

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

@@ -14,7 +14,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <StackPanel>
-        <Button Style="{StaticResource ButtonStyle_icon}" Foreground="White" 
+        <Button Style="{StaticResource Styles.Button.Icon}" Foreground="White" 
                 Click="btnScanClick">
             <StackPanel >
                 <iconPacks:PackIconMaterial Kind="Rotate3dVariant" />
@@ -23,28 +23,28 @@
                 <TextBlock Text="扫描" Foreground="White"/>
             </StackPanel>
         </Button>
-        <Button Style="{StaticResource ButtonStyle_icon}" Foreground="Red"
+        <Button Style="{StaticResource Styles.Button.Icon}" Foreground="Red"
                 Click="btnStopClick">
             <StackPanel >
                 <iconPacks:PackIconMaterial Kind="CloseCircle" />
                 <TextBlock Text="停止" Foreground="Red"/>
             </StackPanel>
         </Button>
-        <Button Style="{StaticResource ButtonStyle_icon}" Foreground="White"
+        <Button Style="{StaticResource Styles.Button.Icon}" Foreground="White"
                 Click="btnOrgClick">
             <StackPanel >
                 <iconPacks:PackIconMaterial Kind="Adjust" />
                 <TextBlock Text="归零" Foreground="White"/>
             </StackPanel>
         </Button>
-        <Button Style="{StaticResource ButtonStyle_icon}" Foreground="White"
+        <Button Style="{StaticResource Styles.Button.Icon}" Foreground="White"
                 Click="btnForwClick">
             <StackPanel >
                 <iconPacks:PackIconMaterial Kind="ArrowRightBoldCircle" />
                 <TextBlock Text="正行" Foreground="White"/>
             </StackPanel>
         </Button>
-        <Button Style="{StaticResource ButtonStyle_icon}" Foreground="White" 
+        <Button Style="{StaticResource Styles.Button.Icon}" Foreground="White" 
                 Click="btnBackwClick">
             <StackPanel >
                 <iconPacks:PackIconMaterial Kind="ArrowLeftBoldCircle" />

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

@@ -13,7 +13,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <StackPanel>
-        <Button Style="{StaticResource ButtonStyle_icon}" Foreground="White" 
+        <Button Style="{StaticResource Styles.Button.Icon}" Foreground="White" 
                 Click="btnProfileClick">
             <StackPanel >
                 <iconPacks:PackIconMaterial Kind="ClipboardText" />

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

@@ -13,7 +13,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <StackPanel>
-        <Button Style="{StaticResource ButtonStyle_icon}" Foreground="White" 
+        <Button Style="{StaticResource Styles.Button.Icon}" Foreground="White" 
                 Click="btnProfileClick">
             <StackPanel >
                 <iconPacks:PackIconMaterial Kind="Cog" />

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

@@ -32,7 +32,7 @@
                     <TextBlock Text="计算"/>
                 </Button>
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="结果"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="结果"/>
                     <TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" >
                         <Run Text= "Y="/>
                         <Run Text= "{Binding A, StringFormat={}{0:F3}}"/>

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

@@ -47,7 +47,7 @@
                     <TextBlock Text="计算"/>
                 </Button>
                 <StackPanel Margin="{StaticResource ControlMargin}">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="结果"/>
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="结果"/>
                     <TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" >
                         <Run Text= "Y="/>
                         <Run Text= "{Binding A, StringFormat={}{0:F3}}"/>

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

@@ -33,7 +33,7 @@
                        <PasswordBox x:Name="passwordbox" Margin="{StaticResource ControlMargin}"
                              Controls:TextBoxHelper.Watermark="请输入密码"
                              Style="{StaticResource  MahApps.Styles.PasswordBox.Win8}" MinWidth="300"/>
-                        <Button Style="{StaticResource ButtonStyle_icon}" Click="ButtonOSK_Click" >
+                        <Button Style="{StaticResource Styles.Button.Icon}" Click="ButtonOSK_Click" >
                             <iconPacks:PackIconMaterial Kind="Keyboard" />
                         </Button>
                     </StackPanel>
@@ -44,7 +44,7 @@
 
 
 
-            <Button Style="{StaticResource ButtonStyle2}" Content="确定"  Width="Auto" Margin="5" Click="button_apply_Click" />
+            <Button Style="{StaticResource ButtonStyle2}" Content="确定"  Width="Auto" Margin="{StaticResource ControlMargin}" Click="button_apply_Click" />
                 </StackPanel>
             </Grid>
 

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

@@ -18,10 +18,10 @@
 
     <Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" Width="600">
         <StackPanel Orientation="Vertical" Margin="5,20">
-            <StackPanel Grid.Column="1" Orientation="Vertical" Margin="5">
+            <StackPanel Grid.Column="1" Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                 <StackPanel Orientation="Horizontal">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="文件路径" VerticalAlignment="Bottom"/>
-                    <Button Style="{StaticResource Styles.Button.Empty}" Click="button_open_Click" Background="White" VerticalAlignment="Bottom" Margin="5">
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="文件路径" VerticalAlignment="Bottom"/>
+                    <Button Style="{StaticResource Styles.Button.Empty}" Click="button_open_Click" Background="White" VerticalAlignment="Bottom" Margin="{StaticResource ControlMargin}">
                         <Path Data="{StaticResource Geometry_plus-box-outline}" Fill="{StaticResource Color_theme_activity}" Height="36" Width="36" Stretch="Fill" SnapsToDevicePixels="True" />
                     </Button>
                 </StackPanel>
@@ -30,7 +30,7 @@
 
             </StackPanel>
             <StackPanel Orientation="Horizontal"></StackPanel>
-            <Button Content="保存" Style="{StaticResource  ButtonStyle2}"  Margin="5" Width="auto" Click="button_save_Click" />
+            <Button Content="保存" Style="{StaticResource  ButtonStyle2}"  Margin="{StaticResource ControlMargin}" Width="auto" Click="button_save_Click" />
         </StackPanel>
     </Grid>
 

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

@@ -17,14 +17,14 @@
     <Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" >
         <StackPanel Orientation="Vertical" Margin="5,20">
             <StackPanel Orientation="Horizontal">
-                <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="显示值" />
+                <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
+                    <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="显示值" />
                     <StackPanel Orientation="Horizontal">
                         <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 Styles.Text.FieldHeader}" Text="->" VerticalAlignment="Center" />
+                <StackPanel Orientation="Vertical" Margin="{StaticResource ControlMargin}">
                     <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="实际值" />
                     <StackPanel Orientation="Horizontal">
                         <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding New}" MinWidth="150"/>
@@ -32,7 +32,7 @@
                 </StackPanel>
             </StackPanel>
 
-            <Button Content="应用"  Style="{StaticResource  ButtonStyle2}"  Margin="5" Width="auto" Click="button_apply_Click" />
+            <Button Content="应用"  Style="{StaticResource  ButtonStyle2}"  Margin="{StaticResource ControlMargin}" Width="auto" Click="button_apply_Click" />
         </StackPanel>
     </Grid>