从 v8 复制整个FLY.ControlLibrary过来

Project.FLY.ControlLibrary/FLY.ControlLibrary/FLY.ControlLibrary.csproj

@@ -132,7 +132,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Converter\Dictionary_MyConv.xaml">
+    <Page Include="Converter\Converters.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -164,7 +164,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Resource>
-    <Resource Include="Themes\Dictionary_MyStyle.xaml">
+    <Resource Include="Themes\Styles.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Resource>

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

@@ -9,7 +9,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
                 <!--<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Culture/StringResource.zh-CN.xaml"/>-->
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

Project.FLY.ControlLibrary/FLY.ControlLibrary/Prompt.xaml

@@ -10,7 +10,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

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

@@ -4,9 +4,9 @@
         <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Colors2.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/TextStyle2.xaml"/>
     </ResourceDictionary.MergedDictionaries>
-    <SolidColorBrush x:Key="Brushes.Card.Background" Color="{StaticResource MahApps.Colors.Gray9}"/>
+    
     <Style TargetType="TextBox" x:Key="Styles.Text.FieldContent.Input.Card" BasedOn="{StaticResource Styles.Text.FieldContent.Input}">
-        <Setter Property="Background"  Value="{StaticResource MahApps.Brushes.Gray9}" />
+        <Setter Property="Background"  Value="{StaticResource Brushes.Gray9}" />
     </Style>
     <Style x:Key="Styles.Card.Title" TargetType="TextBlock">
         <Setter Property="Background" Value="{StaticResource Brushes.Card.Badged.Background}"/>
@@ -20,15 +20,15 @@
         <Setter Property="HorizontalAlignment" Value="Left"/>
     </Style>
     <Style x:Key="Styles.Card.Border" TargetType="Border">
-        <Setter Property="Margin" Value="5"/>
-        <Setter Property="Background" Value="{StaticResource MahApps.Brushes.ThemeBackground}"/>
+        <Setter Property="Margin" Value="{StaticResource ControlMargin}"/>
+        <Setter Property="Background" Value="{StaticResource Brushes.ThemeBackground}"/>
         <Setter Property="CornerRadius" Value="3"/>
         <Setter Property="Padding" Value="8"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="{StaticResource MahApps.Brushes.Gray8}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Brushes.Gray8}"/>
         <Setter Property="Effect">
             <Setter.Value>
-                <DropShadowEffect Color="{StaticResource MahApps.Colors.Gray1}" Opacity=".25" BlurRadius="5" ShadowDepth="3"/>
+                <DropShadowEffect Color="{StaticResource Colors.Gray1}" Opacity=".25" BlurRadius="5" ShadowDepth="3"/>
             </Setter.Value>
         </Setter>
     </Style>

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/Colors2.xaml

@@ -2,33 +2,105 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--激活颜色-->
-    <SolidColorBrush x:Key="Brushes.Activity" Color="{StaticResource MahApps.Colors.AccentBase}"/>
+    <Color x:Key="Colors.Activity">#FF0078D7</Color> <!--MahApps.Colors.AccentBase-->
     <!--不活动颜色-->
-    <SolidColorBrush x:Key="Brushes.Static" Color="{StaticResource MahApps.Colors.Gray1}"/>
+    <Color x:Key="Colors.Static" >#FF333333</Color> <!--MahApps.Colors.Gray1-->
     <!--不活动颜色-->
-    <SolidColorBrush x:Key="Brushes.NoAct" Color="{StaticResource MahApps.Colors.Gray2}"/>
+    <Color x:Key="Colors.NoAct" >#FF7F7F7F</Color> <!--MahApps.Colors.Gray2-->
     <!--背景色-->
-    <SolidColorBrush x:Key="Brushes.ThemeBackground" Color="{StaticResource MahApps.Colors.ThemeBackground}"/>
+    <Color x:Key="Colors.ThemeBackground">white</Color> <!--MahApps.Colors.ThemeBackground-->
     <!--激活的字颜色-->
-    <SolidColorBrush x:Key="Brushes.Text.Activity" Color="{StaticResource MahApps.Colors.Highlight}"/>
+    <Color x:Key="Colors.Text.Activity">#FF00589F</Color> <!--MahApps.Colors.Highlight-->
     <!--不合法颜色-->
-    <SolidColorBrush x:Key="Brushes.Validation" Color="DarkRed"/>
-    <!--不合法颜色-->
-    <SolidColorBrush x:Key="Brushes.Highlight" Color="#f34336"/>
+    <Color x:Key="Colors.Validation">DarkRed</Color>
+    <!--高亮颜色-->
+    <Color x:Key="Colors.Highlight">#f34336</Color>
+    
     
     <!--Pass颜色-->
-    <SolidColorBrush x:Key="Brushes.Pass" Color="#4cae50"/>
+    <Color x:Key="Colors.Pass" >#4cae50</Color>
     <!--Fault颜色-->
-    <SolidColorBrush x:Key="Brushes.Fault" Color="#f34336"/>
+    <Color x:Key="Colors.Fault">#f34336</Color>
+    <!--Card.Badged 背景颜色-->
+    <Color x:Key="Colors.Card.Badged.Background">#FFC107</Color>
+    <!--Card.Badged 前景颜色-->
+    <Color x:Key="Colors.Card.Badged.Foreground">Black</Color>
+
+    <!--字 颜色-->
+    <Color x:Key="Colors.Text.White">White</Color>
+    <Color x:Key="Colors.Text.Gray">#FFC3C3C3</Color>
+    <Color x:Key="Colors.Text.Black">Black</Color>
+
+    <!--灰 颜色-->
+    <Color x:Key="Colors.Gray">#FFBEBEBE</Color>
+    <Color x:Key="Colors.Gray1">#FF333333</Color>
+    <Color x:Key="Colors.Gray2">#FF7F7F7F</Color>
+    <Color x:Key="Colors.Gray3">#FF9D9D9D</Color>
+    <Color x:Key="Colors.Gray4">#FFA59F93</Color>
+    <Color x:Key="Colors.Gray5">#FFB9B9B9</Color>
+    <Color x:Key="Colors.Gray6">#FFCCCCCC</Color>
+    <Color x:Key="Colors.Gray7">#FFD8D8D9</Color>
+    <Color x:Key="Colors.Gray8">#FFE0E0E0</Color>
+    <Color x:Key="Colors.Gray9">#5EC9C9C9</Color>
+    <Color x:Key="Colors.Gray10">#FFF7F7F7</Color>
+
+    <Color x:Key="Colors.AccentBase">#FF0078D7</Color>
+    <Color x:Key="Colors.Accent">#CC0078D7</Color>
+    <Color x:Key="Colors.Accent2">#990078D7</Color>
+    <Color x:Key="Colors.Accent3">#660078D7</Color>
+    <Color x:Key="Colors.Accent4">#330078D7</Color>
+
+
+    <!--激活颜色-->
+    <SolidColorBrush x:Key="Brushes.Activity" Color="{StaticResource Colors.Activity}"/>
+    <!--不活动颜色-->
+    <SolidColorBrush x:Key="Brushes.Static" Color="{StaticResource Colors.Static}"/>
+    <!--不活动颜色-->
+    <SolidColorBrush x:Key="Brushes.NoAct" Color="{StaticResource Colors.NoAct}"/>
+    <!--背景色，卡片背景颜色-->
+    <SolidColorBrush x:Key="Brushes.ThemeBackground" Color="{StaticResource Colors.ThemeBackground}"/>
+    <!--激活的字颜色-->
+    <SolidColorBrush x:Key="Brushes.Text.Activity" Color="{StaticResource Colors.Text.Activity}"/>
+    <!--不合法颜色-->
+    <SolidColorBrush x:Key="Brushes.Validation" Color="{StaticResource Colors.Validation}"/>
+    <!--高亮颜色-->
+    <SolidColorBrush x:Key="Brushes.Highlight" Color="{StaticResource Colors.Highlight}"/>
 
     <!--Pass颜色-->
-    <SolidColorBrush x:Key="Brushes.Card.Badged.Background" Color="#FFC107"/>
+    <SolidColorBrush x:Key="Brushes.Pass" Color="{StaticResource Colors.Pass}"/>
     <!--Fault颜色-->
-    <SolidColorBrush x:Key="Brushes.Card.Badged.Foreground" Color="Black"/>
+    <SolidColorBrush x:Key="Brushes.Fault" Color="{StaticResource Colors.Fault}"/>
+
+    <!--Badged 底部颜色-->
+    <SolidColorBrush x:Key="Brushes.Card.Badged.Background" Color="{StaticResource Colors.Card.Badged.Background}"/>
+    <!--Badged 字颜色-->
+    <SolidColorBrush x:Key="Brushes.Card.Badged.Foreground" Color="{StaticResource Colors.Card.Badged.Foreground}"/>
+    <!--卡片所在容器 背景 颜色-->
+    <SolidColorBrush x:Key="Brushes.Card.Background" Color="{StaticResource Colors.Gray8}"/>
+
+
+    <SolidColorBrush x:Key="Brushes.Text.White" Color="{StaticResource Colors.Text.White}"/>
+    <SolidColorBrush x:Key="Brushes.Text.LightGray" Color="{StaticResource Colors.Gray8}"/>
+    <SolidColorBrush x:Key="Brushes.Text.Gray" Color="{StaticResource Colors.Gray2}"/>
+    <SolidColorBrush x:Key="Brushes.Text.Black" Color="{StaticResource Colors.Text.Black}"/>
+
+    <SolidColorBrush x:Key="Brushes.Gray1" Color="{StaticResource Colors.Gray1}" />
+    <SolidColorBrush x:Key="Brushes.Gray2" Color="{StaticResource Colors.Gray2}" />
+    <SolidColorBrush x:Key="Brushes.Gray3" Color="{StaticResource Colors.Gray3}" />
+    <SolidColorBrush x:Key="Brushes.Gray4" Color="{StaticResource Colors.Gray4}" />
+    <SolidColorBrush x:Key="Brushes.Gray5" Color="{StaticResource Colors.Gray5}" />
+    <SolidColorBrush x:Key="Brushes.Gray6" Color="{StaticResource Colors.Gray6}" />
+    <SolidColorBrush x:Key="Brushes.Gray7" Color="{StaticResource Colors.Gray7}" />
+    <SolidColorBrush x:Key="Brushes.Gray8" Color="{StaticResource Colors.Gray8}" />
+    <SolidColorBrush x:Key="Brushes.Gray9"  Color="{StaticResource Colors.Gray9}" />
+    <SolidColorBrush x:Key="Brushes.Gray10" Color="{StaticResource Colors.Gray10}" />
+    <SolidColorBrush x:Key="Brushes.Gray" Color="{StaticResource Colors.Gray}" />
 
-    <SolidColorBrush x:Key="Brushes.Text.White" Color="White"/>
-    <SolidColorBrush x:Key="Brushes.Text.Gray" Color="#FFC3C3C3"/>
-    <SolidColorBrush x:Key="Brushes.Text.Black" Color="Black"/>
+    <SolidColorBrush x:Key="Brushes.AccentBase" Color="{StaticResource Colors.AccentBase}" />
+    <SolidColorBrush x:Key="Brushes.Accent"  Color="{StaticResource Colors.Accent}" />
+    <SolidColorBrush x:Key="Brushes.Accent2" Color="{StaticResource Colors.Accent2}" />
+    <SolidColorBrush x:Key="Brushes.Accent3" Color="{StaticResource Colors.Accent3}" />
+    <SolidColorBrush x:Key="Brushes.Accent4" Color="{StaticResource Colors.Accent4}" />
     <!--随机颜色-->
     <x:Array x:Key="Brushes.Random" Type="SolidColorBrush">
         <SolidColorBrush>#2195f2</SolidColorBrush>

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/IconButtonStyle2.xaml

@@ -83,21 +83,33 @@
 
 
     <!--圆形确定按钮，绿色， 很多界面使用，例如扫描图 设置界面 -->
-    <Style TargetType="Button" x:Key="Styles.Button.Apply" BasedOn="{StaticResource Styles.Button.Empty}">
-        <Setter Property="Foreground" Value="#FF31AE15"/>
-        <Setter Property="Margin" Value="{StaticResource ControlMargin}"/>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="Content">
+    <Style TargetType="Button" x:Key="Styles.Button.Apply" >
+        <Setter Property="Template">
             <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
                     <Grid>
                         <Ellipse Fill="White" Height="90" Width="90"/>
-                    <iconPacks:PackIconMaterial Kind="CheckCircle" HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" Height="auto" />
+                        <iconPacks:PackIconMaterial Kind="CheckCircle" 
+                                                            HorizontalAlignment="Center" VerticalAlignment="Center" Width="80" Height="auto" 
+                                                            Foreground="#FF31AE15"
+                                                            />
                     </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsKeyboardFocused" Value="true">
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="Margin" Value="{StaticResource ControlMargin}"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
     </Style>
-
     <!--矩形图标按钮 内部为iconPacks的按键，下方不可带文字 -->
     <Style TargetType="Button" x:Key="Styles.Button.Icon.Rectangle">
         <Setter Property="Template">

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle2.xaml

@@ -5,8 +5,8 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--参数设置界面标题背景颜色-->
-    <SolidColorBrush x:Key="Brushes.TitleBar.Background" Color="{StaticResource MahApps.Colors.Accent2}"/>
-    <SolidColorBrush x:Key="Brushes.TitleBar.Foreground" Color="{StaticResource MahApps.Colors.ThemeBackground}"/>
+    <SolidColorBrush x:Key="Brushes.TitleBar.Background" Color="{StaticResource Colors.Accent}"/>
+    <SolidColorBrush x:Key="Brushes.TitleBar.Foreground" Color="{StaticResource Colors.ThemeBackground}"/>
     
     <!-- 参数设置页 每个section 的标题框 内的标题-->
     <Style TargetType="TextBlock" x:Key="Styles.ParamSection.Text">
@@ -14,7 +14,7 @@
         <Setter Property="Foreground"  Value="White" />
         <Setter Property="FontWeight"  Value="Bold" />
         <Setter Property="FontSize"  Value="30" />
-        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
         <Setter Property="TextAlignment"  Value="Right" />
     </Style>
     
@@ -59,19 +59,50 @@
         <Setter Property="FontSize"  Value="30" />
     </Style>
     <!--标题区,左边的后退键(蓝底白图标)-->
-    <Style TargetType="Button" x:Key="Styles.TitleBar.BackButton" BasedOn="{StaticResource Styles.Button.Empty}">
+    <Style TargetType="Button" x:Key="Styles.TitleBar.BackButton" >
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border 
+                        BorderBrush="{TemplateBinding BorderBrush}" 
+                        BorderThickness="{TemplateBinding BorderThickness}" 
+                        Background="{TemplateBinding Background}" 
+                        Height="{TemplateBinding Height}" 
+                        Width="{TemplateBinding Width}"
+                        >
+                        <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsKeyboardFocused" Value="true">
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+
         <Setter Property="Width" Value="80"/>
         <Setter Property="Height" Value="80"/>
         <Setter Property="Margin" Value="0,24"/>
         <Setter Property="Foreground" Value="{StaticResource Brushes.TitleBar.Foreground}"/>
         <Setter Property="Background" Value="{StaticResource Brushes.TitleBar.Background}"/>
-        <Setter Property="Content">
-            <Setter.Value>
-                <iconPacks:PackIconMaterial Kind="ArrowLeftThick" 
-                                            HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0" 
-                                            Width="60" Height="auto" />
-            </Setter.Value>
-        </Setter>
+
+        <Style.Resources>
+            <Style TargetType="iconPacks:PackIconMaterial" >
+                <Setter Property="Width" Value="60"/>
+                <Setter Property="Height" Value="Auto" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Margin" Value="0" />
+            </Style>
+        </Style.Resources>
     </Style>
 
 
@@ -88,12 +119,21 @@
         <Setter Property="Foreground" Value="{StaticResource Brushes.TitleBar.Foreground}"/>
         <Setter Property="Background" Value="{StaticResource Brushes.TitleBar.Background}"/>
         <Setter Property="Width" Value="60"/>
-        <Setter Property="Height" Value="{Binding Width,RelativeSource={RelativeSource Mode=Self}}"/>
+        <Setter Property="Height" Value="60"/>
         <Setter Property="Content">
             <Setter.Value>
-                <iconPacks:PackIconMaterial Kind="ArrowLeftBold" SnapsToDevicePixels ="True" Width="30" Height="auto" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                <iconPacks:PackIconMaterial Kind="ArrowLeftBold"/>
             </Setter.Value>
         </Setter>
+        <Style.Resources>
+            <Style TargetType="iconPacks:PackIconMaterial" >
+                <Setter Property="Width" Value="30"/>
+                <Setter Property="Height" Value="Auto" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="SnapsToDevicePixels" Value="True" />
+            </Style>
+        </Style.Resources>
     </Style>
     
     <!--标题区,左边的后退键(白底蓝图标) 小-->

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle2.xaml

@@ -50,7 +50,7 @@
     <!-- 只读项 的标题 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader">
         <Setter Property="Margin"  Value="{StaticResource Margin.Text}" />
-        <Setter Property="Foreground"  Value="#FF3B3B3B" />
+        <Setter Property="Foreground"  Value="{StaticResource Brushes.Text.Black}" />
         <Setter Property="FontWeight"  Value="Bold" />
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldHeader}" />
         <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
@@ -64,10 +64,10 @@
 
     <!-- 可写项 的标题 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Editable" BasedOn="{StaticResource Styles.Text.FieldHeader}">
-        <Setter Property="Foreground"  Value="#FF0083D7" />
+        <Setter Property="Foreground"  Value="{StaticResource Brushes.Text.Activity}" />
     </Style>
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Comment" BasedOn="{StaticResource Styles.Text.FieldHeader}">
-        <Setter Property="Foreground"  Value="#FF888888" />
+        <Setter Property="Foreground"  Value="{StaticResource Brushes.Text.Gray}" />
         <Setter Property="FontSize"  Value="13" />
     </Style>
 
@@ -79,7 +79,7 @@
     <!-- 只读项 内容 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent">
         <Setter Property="Margin"  Value="{StaticResource Margin.Text}" />
-        <Setter Property="Foreground"  Value="#FF3B3B3B" />
+        <Setter Property="Foreground"  Value="{StaticResource Brushes.Text.Black}" />
         <!--<Setter Property="FontWeight"  Value="Bold" />-->
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
         <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
@@ -89,7 +89,7 @@
     <!-- 输入框 内容 -->
     <Style TargetType="TextBox" x:Key="Styles.Text.FieldContent.Input" BasedOn="{StaticResource Styles.Text.Input}">
         <Setter Property="Margin"  Value="{StaticResource Margin.Text}" />
-        <Setter Property="Foreground"  Value="#FF3B3B3B" />
+        <Setter Property="Foreground"  Value="{StaticResource Brushes.Text.Black}" />
         <!--<Setter Property="FontWeight"  Value="Bold" />-->
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
         <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
@@ -102,7 +102,7 @@
 
     <!-- 内容的分割线 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Separator">
-        <Setter Property="Foreground"  Value="#FF888888" />
+        <Setter Property="Foreground"  Value="{StaticResource Brushes.Text.Gray}" />
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
         <Setter Property="FontFamily"  Value="Arial" />
         <Setter Property="TextAlignment"  Value="Left" />
@@ -112,7 +112,7 @@
 
     <!-- 内容的单位 -->
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Unit">
-        <Setter Property="Foreground"  Value="#FF888888" />
+        <Setter Property="Foreground"  Value="{StaticResource Brushes.Text.Gray}" />
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent.Small}" />
         <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
         <Setter Property="TextAlignment"  Value="Left" />

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/UiModuleStyle2.xaml

@@ -8,33 +8,38 @@
         <Setter Property="Background" Value="{StaticResource Brushes.ThemeBackground}"/>
         <Setter Property="Margin" Value="3"/>
         <Setter Property="CornerRadius" Value="3"/>
-        <Setter Property="Effect">
+        <!--<Setter Property="Effect">
             <Setter.Value>
                 <DropShadowEffect Color="Black" Direction="270" ShadowDepth="1" Opacity="0.23" />
             </Setter.Value>
+        </Setter>-->
+        <Setter Property="Effect">
+            <Setter.Value>
+                <DropShadowEffect Color="{StaticResource Colors.Gray1}" Opacity=".25" BlurRadius="5" ShadowDepth="3"/>
+            </Setter.Value>
         </Setter>
     </Style>
     <!--动态区 UiModule 的 每个项的小标题-->
     <Style TargetType="TextBlock" x:Key="Styles.Module.Text.ItemHeader">
         <Setter Property="FontWeight" Value="Bold"/>
-        <Setter Property="FontFamily" Value="Microsoft Sans Serif"/>
+        <Setter Property="FontFamily" Value="Global Sans Serif"/>
         <Setter Property="FontSize" Value="12"/>
         <Setter Property="Margin" Value="3,0"/>
     </Style>
     <Style TargetType="TextBlock" x:Key="Styles.Module.Text.ItemValue">
-        <Setter Property="FontFamily" Value="Microsoft Sans Serif"/>
+        <Setter Property="FontFamily" Value="Global Sans Serif"/>
         <Setter Property="FontSize" Value="24"/>
     </Style>
     <Style TargetType="TextBlock" x:Key="Styles.Module.Text.ItemValue.Separator">
         <Setter Property="Foreground"  Value="#FF888888" />
         <Setter Property="FontSize"  Value="24" />
-        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily"  Value="Global Sans Serif" />
         <Setter Property="Text" Value="|"/>
     </Style>
     <Style TargetType="TextBlock" x:Key="Styles.Module.Text.ItemValue.Unit">
         <Setter Property="Foreground"  Value="#FF555555" />
         <Setter Property="FontSize"  Value="12" />
-        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily"  Value="Global Sans Serif" />
         <Setter Property="VerticalAlignment"  Value="Bottom" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file

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

@@ -2,7 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="MaterialDesignIcons.xaml"/>
-        <ResourceDictionary Source="Dictionary_MyStyle.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <ControlTemplate x:Key="WindowBigCloseControlTemplate" TargetType="{x:Type Window}">

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

@@ -5,7 +5,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Themes/Dictionary_MyStyle.xaml"/>
+                <ResourceDictionary Source="Themes/Styles.xaml"/>
                 <ResourceDictionary Source="Themes/MaterialDesignIcons.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

Project.FLY.ControlLibrary/FLY.ControlLibrary/Window_WarningTip.xaml.cs

@@ -203,7 +203,7 @@ namespace FLY.ControlLibrary
         /// <returns>ID</returns>
         public static int Show(string title, string message, TimeSpan duration, string musicpath, Action stophandler)
         {
-            return Show(title, message, duration, musicpath, stophandler, "确定", null);
+            return Show(title, message, duration, musicpath, stophandler, "OK", null);
         }
         /// <summary>
         /// 显示报警提示
@@ -216,7 +216,7 @@ namespace FLY.ControlLibrary
         /// <param name="okcontent">确定按键 显示字符串</param>
         /// <param name="okhandler">确定事件 回调函数</param>
         /// <returns>ID</returns>
-        public static int Show(string title, string message, TimeSpan duration, string musicpath, Action stophandler, string okcontent, Action okhandler) 
+        public static int Show(string title, string message, TimeSpan duration, string musicpath=null, Action stophandler=null, string okcontent="OK", Action okhandler=null) 
         {
             if (Current == null)
             {