1

src/YSAI.DAQ/YSAI.Controls/YSAI.Controls.csproj

@@ -30,7 +30,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3-beta1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
 	</ItemGroup>
 

src/YSAI.DAQ/YSAI.DAQ.sln

@@ -33,27 +33,31 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.RabbitMQ", "YSAI.Rabbi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Manage", "YSAI.Manage\YSAI.Manage.csproj", "{6E9667C0-303C-472D-949B-60F812E6C659}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Manage.Core", "YSAI.Manage.Core\YSAI.Manage.Core.csproj", "{57F9FF57-ADD3-40B0-AE20-C2F88A2784A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Manage.Core", "YSAI.Manage.Core\YSAI.Manage.Core.csproj", "{57F9FF57-ADD3-40B0-AE20-C2F88A2784A0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wpf", "wpf", "{6F526F44-A5B0-49D5-8E04-DBFDB5F8E6C6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Can", "YSAI.Can\YSAI.Can.csproj", "{8B8BF505-7A00-4868-939F-EB5056083E49}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Can", "YSAI.Can\YSAI.Can.csproj", "{8B8BF505-7A00-4868-939F-EB5056083E49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Langs", "YSAI.Langs\YSAI.Langs.csproj", "{CCF267B2-ABB4-4B42-8351-103D59FA4B3B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Langs", "YSAI.Langs\YSAI.Langs.csproj", "{CCF267B2-ABB4-4B42-8351-103D59FA4B3B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Mvvm", "YSAI.Mvvm\YSAI.Mvvm.csproj", "{2FC39615-7195-4A0D-9959-E49630AB41D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Mvvm", "YSAI.Mvvm\YSAI.Mvvm.csproj", "{2FC39615-7195-4A0D-9959-E49630AB41D6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Resources", "YSAI.Resources\YSAI.Resources.csproj", "{1294B1E5-92C8-496B-B629-7616EEAF47A8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Resources", "YSAI.Resources\YSAI.Resources.csproj", "{1294B1E5-92C8-496B-B629-7616EEAF47A8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Controls", "YSAI.Controls\YSAI.Controls.csproj", "{47AE67D9-44AD-48B1-8927-DCC7A51649B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Controls", "YSAI.Controls\YSAI.Controls.csproj", "{47AE67D9-44AD-48B1-8927-DCC7A51649B9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Converters", "YSAI.Converters\YSAI.Converters.csproj", "{D7FFC9F4-1248-469D-BAF9-AD675BF83A92}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Converters", "YSAI.Converters\YSAI.Converters.csproj", "{D7FFC9F4-1248-469D-BAF9-AD675BF83A92}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Window", "YSAI.Window\YSAI.Window.csproj", "{6A255A65-3198-44AA-A281-62F721D49CEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Window", "YSAI.Window\YSAI.Window.csproj", "{6A255A65-3198-44AA-A281-62F721D49CEF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.WindowMessage", "YSAI.WindowMessage\YSAI.WindowMessage.csproj", "{0EA9373C-B55A-4400-82AC-7681AA996229}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.WindowMessage", "YSAI.WindowMessage\YSAI.WindowMessage.csproj", "{0EA9373C-B55A-4400-82AC-7681AA996229}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Unility.Windows", "YSAI.Unility.Windows\YSAI.Unility.Windows.csproj", "{257F1474-B220-4C61-88C6-5B83BEF7B3A7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Unility.Windows", "YSAI.Unility.Windows\YSAI.Unility.Windows.csproj", "{257F1474-B220-4C61-88C6-5B83BEF7B3A7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Tool.Windows", "YSAI.Tool.Windows\YSAI.Tool.Windows.csproj", "{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Manage.Windows", "YSAI.Manage.Windows\YSAI.Manage.Windows.csproj", "{2221CE78-FA24-40E3-8453-9C66E32F9C0C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -157,6 +161,14 @@ Global
 		{257F1474-B220-4C61-88C6-5B83BEF7B3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{257F1474-B220-4C61-88C6-5B83BEF7B3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{257F1474-B220-4C61-88C6-5B83BEF7B3A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49133ADB-D3BF-4682-AA5A-CC1CF1917D45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2221CE78-FA24-40E3-8453-9C66E32F9C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2221CE78-FA24-40E3-8453-9C66E32F9C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2221CE78-FA24-40E3-8453-9C66E32F9C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2221CE78-FA24-40E3-8453-9C66E32F9C0C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/YSAI.DAQ/YSAI.Langs/YSAI.Langs.csproj

@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="WPFLocalizeExtension" Version="3.9.4" />
+		<PackageReference Include="WPFLocalizeExtension" Version="3.10.0" />
 	</ItemGroup>
 
 	<ItemGroup>

src/YSAI.DAQ/YSAI.Manage.Windows/App.xaml

@@ -0,0 +1,14 @@
+<Application x:Class="YSAI.Manage.Windows.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:YSAI.Manage.Windows"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <!--加载默认样式-->
+                <ResourceDictionary Source="pack://application:,,,/YSAI.Window;component/Themes/WindowTemplate_Black.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

src/YSAI.DAQ/YSAI.Manage.Windows/App.xaml.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace YSAI.Manage.Windows
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}

src/YSAI.DAQ/YSAI.Manage.Windows/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]

src/YSAI.DAQ/YSAI.Manage.Windows/MainWindow.xaml

@@ -0,0 +1,14 @@
+<base:WindowBase x:Class="YSAI.Manage.Windows.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:YSAI.Manage.Windows"
+        xmlns:base="clr-namespace:YSAI.Window;assembly=YSAI.Window"
+        Icon="YSAI_One.ico" 
+        FontFamily="{DynamicResource AllFontFamily}" WindowStartupLocation="CenterScreen" IsContentBackgroundPicture="True"
+        Title="采集库调试工具" Height="800" Width="900">
+    <Grid>
+
+    </Grid>
+</base:WindowBase>

src/YSAI.DAQ/YSAI.Manage.Windows/MainWindow.xaml.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using YSAI.Window;
+
+namespace YSAI.Manage.Windows
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : WindowBase
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/YSAI.DAQ/YSAI.Manage.Windows/YSAI.Manage.Windows.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="YSAI_One.ico" />
+    <None Remove="YSAI_Two.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\YSAI.Tool.Windows\YSAI.Tool.Windows.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="YSAI_One.ico" />
+    <Resource Include="YSAI_Two.ico" />
+  </ItemGroup>
+
+</Project>

src/YSAI.DAQ/YSAI.Tool.Windows/YSAI.Tool.Windows.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\YSAI.Controls\YSAI.Controls.csproj" />
+    <ProjectReference Include="..\YSAI.WindowMessage\YSAI.WindowMessage.csproj" />
+  </ItemGroup>
+
+</Project>

src/YSAI.DAQ/YSAI.Unility.Windows/YSAI.Unility.Windows.csproj

@@ -15,7 +15,7 @@
 	<ItemGroup>
 		<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.2" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NPOI" Version="2.6.0" />
+		<PackageReference Include="NPOI" Version="2.6.1" />
 		<PackageReference Include="System.Speech" Version="7.0.0" />
 	</ItemGroup>
 </Project>

src/YSAI.DAQ/YSAI.Unility/YSAI.Unility.csproj

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.32.0" />
+		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.32.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 

src/YSAI.DAQ/YSAI.Window/Themes/Property/Black.xaml

@@ -79,42 +79,46 @@
     <sys:Double x:Key="Ver.DropShadowEffect.ShadowDepth">0</sys:Double>
     <sys:Double x:Key="Ver.DropShadowEffect.Opacity">0.3</sys:Double>
 
+    <!--LOGO图标位置偏移-->
+    <Thickness x:Key="LogoImageMargin"  Left="5" Top="5" Right="5" Bottom="5" />
     <!--标题高度-->
     <sys:Double x:Key="TitleHeight">35</sys:Double>
     <!--标题的字体大小-->
-    <sys:Double x:Key="TitleFontSize">16</sys:Double>
+    <sys:Double x:Key="TitleFontSize">14</sys:Double>
     <!--标题字体是否需要加粗-->
-    <FontWeight x:Key="TitleFontWeight">Medium</FontWeight>
+    <FontWeight x:Key="TitleFontWeight">Normal</FontWeight>
     <!--语言图片宽度-->
-    <sys:Double x:Key="LanguageImageWidth">17</sys:Double>
+    <sys:Double x:Key="LanguageImageWidth">15</sys:Double>
     <!--皮肤设置图片宽度-->
-    <sys:Double x:Key="SkinImageWidth">17</sys:Double>
+    <sys:Double x:Key="SkinImageWidth">16</sys:Double>
     <!--最小化图片宽度-->
-    <sys:Double x:Key="MinimizeImageWidth">17</sys:Double>
+    <sys:Double x:Key="MinimizeImageWidth">15</sys:Double>
     <!--原始图片宽度-->
-    <sys:Double x:Key="NormalImageWidth">17</sys:Double>
+    <sys:Double x:Key="NormalImageWidth">15</sys:Double>
     <!--最大化图片宽度-->
-    <sys:Double x:Key="MaximizeImageWidth">17</sys:Double>
+    <sys:Double x:Key="MaximizeImageWidth">15</sys:Double>
     <!--关闭图片宽度-->
-    <sys:Double x:Key="CloseImageWidth">17</sys:Double>
+    <sys:Double x:Key="CloseImageWidth">14</sys:Double>
     <!--版本的高度-->
     <sys:Double x:Key="VerHeight">25</sys:Double>
     <!--版本的展现内容-->
     <sys:String x:Key="VerContent">Ver ：</sys:String>
     <!--版本的字体大小-->
-    <sys:Double x:Key="VerFontSize">13</sys:Double>
+    <sys:Double x:Key="VerFontSize">12</sys:Double>
     <!--版本号的字体大小-->
-    <sys:Double x:Key="VerCodeFontSize">13</sys:Double>
+    <sys:Double x:Key="VerCodeFontSize">12</sys:Double>
     <!--版本字体是否需要加粗-->
-    <FontWeight x:Key="VerFontWeight">Medium</FontWeight>
+    <FontWeight x:Key="VerFontWeight">Normal</FontWeight>
     <!--版本号字体是否需要加粗-->
-    <FontWeight x:Key="VerCodeFontWeight">Medium</FontWeight>
+    <FontWeight x:Key="VerCodeFontWeight">Normal</FontWeight>
     <!--所有字体样式-->
     <FontFamily x:Key="AllFontFamily">微软雅黑</FontFamily>
     <!--版本号文字位置偏移-->
-    <Thickness x:Key="VerMargin"  Left="0" Top="-3" Right="0" Bottom="0" />
+    <Thickness x:Key="VerMargin"  Left="0" Top="-1" Right="0" Bottom="0" />
     <!--版本号代码位置偏移-->
-    <Thickness x:Key="VerCodeMargin"  Left="-13" Top="-3" Right="0" Bottom="0" />
+    <Thickness x:Key="VerCodeMargin"  Left="-13" Top="-1" Right="0" Bottom="0" />
+    <!--版本图标位置偏移-->
+    <Thickness x:Key="VerImageMargin"  Left="4" Top="4" Right="0" Bottom="4" />
 
     <!--顶部的圆角控制-->
     <CornerRadius x:Key="TopCornerRadius"  TopLeft="5" TopRight="5" BottomLeft="0" BottomRight="0"/>

src/YSAI.DAQ/YSAI.Window/Themes/Property/Blue.xaml

@@ -79,32 +79,34 @@
     <sys:Double x:Key="Ver.DropShadowEffect.ShadowDepth">0</sys:Double>
     <sys:Double x:Key="Ver.DropShadowEffect.Opacity">0.3</sys:Double>
 
+    <!--LOGO图标位置偏移-->
+    <Thickness x:Key="LogoImageMargin"  Left="5" Top="5" Right="5" Bottom="5" />
     <!--标题高度-->
     <sys:Double x:Key="TitleHeight">35</sys:Double>
     <!--标题的字体大小-->
-    <sys:Double x:Key="TitleFontSize">16</sys:Double>
+    <sys:Double x:Key="TitleFontSize">14</sys:Double>
     <!--标题字体是否需要加粗-->
     <FontWeight x:Key="TitleFontWeight">Normal</FontWeight>
     <!--语言图片宽度-->
-    <sys:Double x:Key="LanguageImageWidth">17</sys:Double>
+    <sys:Double x:Key="LanguageImageWidth">15</sys:Double>
     <!--皮肤图片宽度-->
-    <sys:Double x:Key="SkinImageWidth">17</sys:Double>
+    <sys:Double x:Key="SkinImageWidth">16</sys:Double>
     <!--最小化图片宽度-->
-    <sys:Double x:Key="MinimizeImageWidth">17</sys:Double>
+    <sys:Double x:Key="MinimizeImageWidth">15</sys:Double>
     <!--原始图片宽度-->
-    <sys:Double x:Key="NormalImageWidth">17</sys:Double>
+    <sys:Double x:Key="NormalImageWidth">15</sys:Double>
     <!--最大化图片宽度-->
-    <sys:Double x:Key="MaximizeImageWidth">17</sys:Double>
+    <sys:Double x:Key="MaximizeImageWidth">15</sys:Double>
     <!--关闭图片宽度-->
-    <sys:Double x:Key="CloseImageWidth">17</sys:Double>
+    <sys:Double x:Key="CloseImageWidth">14</sys:Double>
     <!--版本的高度-->
     <sys:Double x:Key="VerHeight">25</sys:Double>
     <!--版本的展现内容-->
     <sys:String x:Key="VerContent">Ver ：</sys:String>
     <!--版本的字体大小-->
-    <sys:Double x:Key="VerFontSize">13</sys:Double>
+    <sys:Double x:Key="VerFontSize">12</sys:Double>
     <!--版本号的字体大小-->
-    <sys:Double x:Key="VerCodeFontSize">13</sys:Double>
+    <sys:Double x:Key="VerCodeFontSize">12</sys:Double>
     <!--版本字体是否需要加粗-->
     <FontWeight x:Key="VerFontWeight">Normal</FontWeight>
     <!--版本号字体是否需要加粗-->
@@ -112,9 +114,11 @@
     <!--所有字体样式-->
     <FontFamily x:Key="AllFontFamily">微软雅黑</FontFamily>
     <!--版本号文字位置偏移-->
-    <Thickness x:Key="VerMargin"  Left="0" Top="-3" Right="0" Bottom="0" />
+    <Thickness x:Key="VerMargin"  Left="0" Top="-1" Right="0" Bottom="0" />
     <!--版本号代码位置偏移-->
-    <Thickness x:Key="VerCodeMargin"  Left="-13" Top="-3" Right="0" Bottom="0" />
+    <Thickness x:Key="VerCodeMargin"  Left="-13" Top="-1" Right="0" Bottom="0" />
+    <!--版本图标位置偏移-->
+    <Thickness x:Key="VerImageMargin"  Left="4" Top="4" Right="0" Bottom="4" />
     
     <!--顶部的圆角控制-->
     <CornerRadius x:Key="TopCornerRadius"  TopLeft="5" TopRight="5" BottomLeft="0" BottomRight="0"/>

src/YSAI.DAQ/YSAI.Window/Themes/Property/Cyan.xaml

@@ -79,32 +79,34 @@
     <sys:Double x:Key="Ver.DropShadowEffect.ShadowDepth">0</sys:Double>
     <sys:Double x:Key="Ver.DropShadowEffect.Opacity">0.3</sys:Double>
 
+    <!--LOGO图标位置偏移-->
+    <Thickness x:Key="LogoImageMargin"  Left="5" Top="5" Right="5" Bottom="5" />
     <!--标题高度-->
     <sys:Double x:Key="TitleHeight">35</sys:Double>
     <!--标题的字体大小-->
-    <sys:Double x:Key="TitleFontSize">15</sys:Double>
+    <sys:Double x:Key="TitleFontSize">14</sys:Double>
     <!--标题字体是否需要加粗-->
     <FontWeight x:Key="TitleFontWeight">Normal</FontWeight>
     <!--语言图片宽度-->
-    <sys:Double x:Key="LanguageImageWidth">16</sys:Double>
+    <sys:Double x:Key="LanguageImageWidth">15</sys:Double>
     <!--皮肤图片宽度-->
     <sys:Double x:Key="SkinImageWidth">16</sys:Double>
     <!--最小化图片宽度-->
-    <sys:Double x:Key="MinimizeImageWidth">16</sys:Double>
+    <sys:Double x:Key="MinimizeImageWidth">15</sys:Double>
     <!--原始图片宽度-->
-    <sys:Double x:Key="NormalImageWidth">16</sys:Double>
+    <sys:Double x:Key="NormalImageWidth">15</sys:Double>
     <!--最大化图片宽度-->
-    <sys:Double x:Key="MaximizeImageWidth">16</sys:Double>
+    <sys:Double x:Key="MaximizeImageWidth">15</sys:Double>
     <!--关闭图片宽度-->
-    <sys:Double x:Key="CloseImageWidth">16</sys:Double>
+    <sys:Double x:Key="CloseImageWidth">14</sys:Double>
     <!--版本的高度-->
     <sys:Double x:Key="VerHeight">25</sys:Double>
     <!--版本的展现内容-->
     <sys:String x:Key="VerContent">Ver ：</sys:String>
     <!--版本的字体大小-->
-    <sys:Double x:Key="VerFontSize">13</sys:Double>
+    <sys:Double x:Key="VerFontSize">12</sys:Double>
     <!--版本号的字体大小-->
-    <sys:Double x:Key="VerCodeFontSize">13</sys:Double>
+    <sys:Double x:Key="VerCodeFontSize">12</sys:Double>
     <!--版本字体是否需要加粗-->
     <FontWeight x:Key="VerFontWeight">Normal</FontWeight>
     <!--版本号字体是否需要加粗-->
@@ -112,9 +114,11 @@
     <!--所有字体样式-->
     <FontFamily x:Key="AllFontFamily">微软雅黑</FontFamily>
     <!--版本号文字位置偏移-->
-    <Thickness x:Key="VerMargin"  Left="0" Top="-3" Right="0" Bottom="0" />
+    <Thickness x:Key="VerMargin"  Left="0" Top="-1" Right="0" Bottom="0" />
     <!--版本号代码位置偏移-->
-    <Thickness x:Key="VerCodeMargin"  Left="-13" Top="-3" Right="0" Bottom="0" />
+    <Thickness x:Key="VerCodeMargin"  Left="-13" Top="-1" Right="0" Bottom="0" />
+    <!--版本图标位置偏移-->
+    <Thickness x:Key="VerImageMargin"  Left="4" Top="4" Right="0" Bottom="4" />
 
     <!--顶部的圆角控制-->
     <CornerRadius x:Key="TopCornerRadius"  TopLeft="5" TopRight="5" BottomLeft="0" BottomRight="0"/>

src/YSAI.DAQ/YSAI.Window/Themes/Property/White.xaml

@@ -79,16 +79,18 @@
     <sys:Double x:Key="Ver.DropShadowEffect.ShadowDepth">0</sys:Double>
     <sys:Double x:Key="Ver.DropShadowEffect.Opacity">0.3</sys:Double>
 
+    <!--LOGO图标位置偏移-->
+    <Thickness x:Key="LogoImageMargin"  Left="5" Top="5" Right="5" Bottom="5" />
     <!--标题高度-->
     <sys:Double x:Key="TitleHeight">35</sys:Double>
     <!--标题的字体大小-->
-    <sys:Double x:Key="TitleFontSize">15</sys:Double>
+    <sys:Double x:Key="TitleFontSize">14</sys:Double>
     <!--标题字体是否需要加粗-->
     <FontWeight x:Key="TitleFontWeight">Normal</FontWeight>
     <!--语言图片宽度-->
     <sys:Double x:Key="LanguageImageWidth">15</sys:Double>
     <!--皮肤图片宽度-->
-    <sys:Double x:Key="SkinImageWidth">15</sys:Double>
+    <sys:Double x:Key="SkinImageWidth">16</sys:Double>
     <!--最小化图片宽度-->
     <sys:Double x:Key="MinimizeImageWidth">15</sys:Double>
     <!--原始图片宽度-->
@@ -96,15 +98,15 @@
     <!--最大化图片宽度-->
     <sys:Double x:Key="MaximizeImageWidth">15</sys:Double>
     <!--关闭图片宽度-->
-    <sys:Double x:Key="CloseImageWidth">15</sys:Double>
+    <sys:Double x:Key="CloseImageWidth">14</sys:Double>
     <!--版本的高度-->
     <sys:Double x:Key="VerHeight">25</sys:Double>
     <!--版本的展现内容-->
     <sys:String x:Key="VerContent">Ver ：</sys:String>
     <!--版本的字体大小-->
-    <sys:Double x:Key="VerFontSize">13</sys:Double>
+    <sys:Double x:Key="VerFontSize">12</sys:Double>
     <!--版本号的字体大小-->
-    <sys:Double x:Key="VerCodeFontSize">13</sys:Double>
+    <sys:Double x:Key="VerCodeFontSize">12</sys:Double>
     <!--版本字体是否需要加粗-->
     <FontWeight x:Key="VerFontWeight">Normal</FontWeight>
     <!--版本号字体是否需要加粗-->
@@ -112,9 +114,11 @@
     <!--所有字体样式-->
     <FontFamily x:Key="AllFontFamily">微软雅黑</FontFamily>
     <!--版本号文字位置偏移-->
-    <Thickness x:Key="VerMargin"  Left="0" Top="-3" Right="0" Bottom="0" />
+    <Thickness x:Key="VerMargin"  Left="0" Top="-1" Right="0" Bottom="0" />
     <!--版本号代码位置偏移-->
-    <Thickness x:Key="VerCodeMargin"  Left="-13" Top="-3" Right="0" Bottom="0" />
+    <Thickness x:Key="VerCodeMargin"  Left="-13" Top="-1" Right="0" Bottom="0" />
+    <!--版本图标位置偏移-->
+    <Thickness x:Key="VerImageMargin"  Left="4" Top="4" Right="0" Bottom="4" />
 
     <!--顶部的圆角控制-->
     <CornerRadius x:Key="TopCornerRadius"  TopLeft="5" TopRight="5" BottomLeft="0" BottomRight="0"/>

src/YSAI.DAQ/YSAI.Window/Themes/Style/WindowStyle.xaml

@@ -7,6 +7,8 @@
     <Style x:Key="StyleBase" TargetType="{x:Type sv:WindowBase}"  BasedOn="{StaticResource {x:Type Window}}">
         <Setter Property="Window.WindowStyle" Value="None"/>
         <Setter Property="AllowsTransparency" Value="True"/>
+        <Setter Property="MinHeight" Value="200"/>
+        <Setter Property="MinWidth" Value="200"/>
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
         <Setter Property="FontFamily" Value="{DynamicResource AllFontFamily}"/>
@@ -46,7 +48,7 @@
                                         <ColumnDefinition Width="auto"/>
                                     </Grid.ColumnDefinitions>
                                     <!--LOGO-->
-                                    <Image Grid.Column="0" Source="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}}" Margin="5" Name="PART_Icon"/>
+                                    <Image Grid.Column="0" Source="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}}" Margin="{DynamicResource LogoImageMargin}" Name="PART_Icon"/>
                                     <!--标题-->
                                     <Label Name="CaptionText" Grid.Column="1"  Content="{Binding Path=Title, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" HorizontalAlignment="{DynamicResource TitleHorizontalAlignment}"  Foreground="{DynamicResource TitleForeground}" FontWeight="{DynamicResource TitleFontWeight}" FontSize="{DynamicResource TitleFontSize}" />
                                     <!--语言-->
@@ -109,7 +111,7 @@
                                         <ColumnDefinition Width="auto"/>
                                         <ColumnDefinition Width="auto"/>
                                     </Grid.ColumnDefinitions>
-                                    <Image Grid.Column="0" Source="{DynamicResource Ver}" Margin="3,3,0,3" />
+                                    <Image Grid.Column="0" Source="{DynamicResource Ver}" Margin="{DynamicResource VerImageMargin}" />
                                     <Label Grid.Column="1" Content="{DynamicResource VerContent}" Margin="{DynamicResource VerMargin}" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="{DynamicResource VerFontWeight}"  Foreground="{DynamicResource VerForeground}" FontSize="{DynamicResource VerFontSize}"/>
                                     <Label Grid.Column="2" Name="System_Ver" Margin="{DynamicResource VerCodeMargin}"  VerticalAlignment="Center"   FontWeight="{DynamicResource VerCodeFontWeight}"  Foreground="{DynamicResource VerCodeForeground}" FontSize="{DynamicResource VerCodeFontSize}"/>
                                 </Grid>