diff --git a/App.config b/App.config index 474d0eb..3fda9a3 100644 --- a/App.config +++ b/App.config @@ -21,9 +21,9 @@ <!--网络质量检测阈值 Mbps--> <add key="InternetCheckMbps" value="866" /> <!--检测模式 0:json 1:Image Ohter:algorithm --> - <add key="RunModel" value="101" /> + <add key="RunModel" value="0" /> <!-- 客户端版本 --> - <add key="AppVersion" value="Nlsqq/kAPIXFHKk9dFcfqw==" /> + <!-- <add key="AppVersion" value="Nlsqq/kAPIXFHKk9dFcfqw==" /> --> </appSettings> <connectionStrings> <add name="" connectionString=""/> diff --git a/SparkClient.csproj b/BrilliantSight.csproj similarity index 95% rename from SparkClient.csproj rename to BrilliantSight.csproj index 03a3ba1..8735c26 100644 --- a/SparkClient.csproj +++ b/BrilliantSight.csproj @@ -6,15 +6,18 @@ <Nullable>enable</Nullable> <ImplicitUsings>enable</ImplicitUsings> <UseWPF>true</UseWPF> - <ApplicationIcon>logo256.ico</ApplicationIcon> - <Title>SparkClient - 星辉</Title> - <Authors>SparkClient Team</Authors> - <Description>SparkClient钻石检测工具</Description> + <ApplicationIcon>j34em-1eco4-001.ico</ApplicationIcon> + <Title>BrilliantSight - 晶瞳</Title> + <Authors>BrilliantSightTeam</Authors> + <Description>晶瞳钻石检测工具</Description> <Copyright>Copyright ©2025 北京跃洋新视科技有限公司</Copyright> <Company>北京跃洋新视科技有限公司</Company> <AssemblyVersion>1.0.2519</AssemblyVersion> <FileVersion>1.0.2519</FileVersion> <RuntimeIdentifier>win-x64</RuntimeIdentifier> + <AssemblyName>BrilliantSightClient</AssemblyName> + <RootNamespace>BrilliantSightClient</RootNamespace> + <PackageId>BrilliantSightClient</PackageId> </PropertyGroup> <ItemGroup> @@ -243,6 +246,12 @@ <None Remove="Resource\Images\UserControl\Diamond\round_P8-P8-S7.png" /> <None Remove="Resource\Images\UIResource\Diamond\round_P8-P8-S8.png" /> <Resource Include="Resource\Images\UIResource\Diamond\round_P8-P8-S8.png" /> + <None Remove="Resource\Images\ic_500_t.png" /> + <Resource Include="Resource\Images\ic_500_t.png" /> + <None Remove="Resource\Images\ic_1000_t.png" /> + <Resource Include="Resource\Images\ic_1000_t.png" /> + <None Remove="Resource\Images\icon_200_t.png" /> + <Resource Include="Resource\Images\icon_200_t.png" /> </ItemGroup> <ItemGroup> diff --git a/SparkClient.sln b/BrilliantSight.sln similarity index 82% rename from SparkClient.sln rename to BrilliantSight.sln index 66abdee..5cbba3b 100644 --- a/SparkClient.sln +++ b/BrilliantSight.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkClient", "SparkClient.csproj", "{9B346951-9ACB-4A13-B212-8C75AED24131}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrilliantSight", "BrilliantSight.csproj", "{9B346951-9ACB-4A13-B212-8C75AED24131}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Language/en_US.xaml b/Language/en_US.xaml index f02025f..67659fc 100644 --- a/Language/en_US.xaml +++ b/Language/en_US.xaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=netstandard"> <!--Text--> - <sys:String x:Key="ProcName">Spark</sys:String> + <sys:String x:Key="ProcName">BrilliantSight</sys:String> <sys:String x:Key="StartTest">START</sys:String> <sys:String x:Key="StartTestFan">MEASURE</sys:String> @@ -157,7 +157,7 @@ <sys:String x:Key="ViewportRightMenuReset">Reset Grid Lines</sys:String> <!-- Login Page --> - <sys:String x:Key="LoginWindowTitle">SparkDetectionSystem</sys:String> + <sys:String x:Key="LoginWindowTitle">BrilliantSightDetectionSystem</sys:String> <sys:String x:Key="LoginWindowAccount">Account</sys:String> <sys:String x:Key="LoginWindowPassword">Password</sys:String> <sys:String x:Key="LoginWindowRemember">Remember Password</sys:String> diff --git a/Language/zh_CN.xaml b/Language/zh_CN.xaml index a4d5fa0..a31aeb3 100644 --- a/Language/zh_CN.xaml +++ b/Language/zh_CN.xaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=netstandard"> <!--Text--> - <sys:String x:Key="ProcName">星辉</sys:String> + <sys:String x:Key="ProcName">晶瞳</sys:String> <sys:String x:Key="StartTest">开始检测</sys:String> <sys:String x:Key="StartTestFan">MEASURE</sys:String> @@ -159,7 +159,7 @@ <sys:String x:Key="ViewportCenterFlag">显示中心标记</sys:String> <!-- 登录页 --> - <sys:String x:Key="LoginWindowTitle">星辉钻石检测系统</sys:String> + <sys:String x:Key="LoginWindowTitle">晶瞳钻石检测系统</sys:String> <sys:String x:Key="LoginWindowAccount">账号</sys:String> <sys:String x:Key="LoginWindowPassword">密码</sys:String> <sys:String x:Key="LoginWindowRemember">记住密码</sys:String> diff --git a/LoginWindow.xaml b/LoginWindow.xaml index 20d6c35..7251251 100644 --- a/LoginWindow.xaml +++ b/LoginWindow.xaml @@ -42,7 +42,7 @@ <ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/> </Grid.ColumnDefinitions> - <Image Grid.Column="0" Source="/Resource/Images/icon_200.png" Width="70"/> + <Image Grid.Column="0" Source="/Resource/Images/icon_200_t.png" Width="70"/> <TextBlock Grid.Column="1" Text="{StaticResource LoginWindowTitle}" FontSize="32" FontWeight="Bold" VerticalAlignment="Center"> <TextBlock.Foreground> diff --git a/Resource/Images/ic_1000.png b/Resource/Images/ic_1000.png index f0c0e3e..4464b3b 100644 Binary files a/Resource/Images/ic_1000.png and b/Resource/Images/ic_1000.png differ diff --git a/Resource/Images/ic_1000_t.png b/Resource/Images/ic_1000_t.png new file mode 100644 index 0000000..545a7d5 Binary files /dev/null and b/Resource/Images/ic_1000_t.png differ diff --git a/Resource/Images/ic_500.png b/Resource/Images/ic_500.png index 47e16a0..1f4b344 100644 Binary files a/Resource/Images/ic_500.png and b/Resource/Images/ic_500.png differ diff --git a/Resource/Images/ic_500_t.png b/Resource/Images/ic_500_t.png new file mode 100644 index 0000000..be331ed Binary files /dev/null and b/Resource/Images/ic_500_t.png differ diff --git a/Resource/Images/icon_200.png b/Resource/Images/icon_200.png index d5b2d80..d6a1e19 100644 Binary files a/Resource/Images/icon_200.png and b/Resource/Images/icon_200.png differ diff --git a/Resource/Images/icon_200_t.png b/Resource/Images/icon_200_t.png new file mode 100644 index 0000000..59d0be4 Binary files /dev/null and b/Resource/Images/icon_200_t.png differ diff --git a/SparkClient - Backup.csproj b/SparkClient - Backup.csproj deleted file mode 100644 index 211ed82..0000000 --- a/SparkClient - Backup.csproj +++ /dev/null @@ -1,25 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk"> - - <PropertyGroup> - <OutputType>WinExe</OutputType> - <TargetFramework>net8.0-windows</TargetFramework> - <Nullable>enable</Nullable> - <ImplicitUsings>enable</ImplicitUsings> - <UseWPF>true</UseWPF> - </PropertyGroup> - - <ItemGroup> - <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" /> - <PackageReference Include="HandyControl" Version="3.5.1" /> - <PackageReference Include="HandyControl.Lang.en" Version="3.5.1" /> - <PackageReference Include="HandyControls.Lang.zh-CN" Version="3.5.3" /> - <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" /> - <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> - </ItemGroup> - - <ItemGroup> - <None Remove="Resource\Images\IGILogo.png" /> - <Resource Include="Resource\Images\IGILogo.png" /> - </ItemGroup> - -</Project> diff --git a/SparkClient.sln.DotSettings.user b/SparkClient.sln.DotSettings.user index bbe3669..a45c2aa 100644 --- a/SparkClient.sln.DotSettings.user +++ b/SparkClient.sln.DotSettings.user @@ -8,6 +8,7 @@ <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncTaskMethodBuilder_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F211e6f3b24fa438a92f1815153647ce2c8f908_003F93_003F031cf753_003FAsyncTaskMethodBuilder_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncVoidMethodBuilder_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F211e6f3b24fa438a92f1815153647ce2c8f908_003F18_003Feb00c5a4_003FAsyncVoidMethodBuilder_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABaseUriHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fbfd90ad81939493b96034353abcd1045825908_003Fdc_003Fff55e936_003FBaseUriHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> + <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABinding_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6412d4331611499aab4eb63809a2a83bf60910_003F58_003Fcf4239db_003FBinding_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABrushes_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F96a561fe76144633acef44f09d0dcb8a825920_003F7e_003F126cf976_003FBrushes_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AButtonBase_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6412d4331611499aab4eb63809a2a83bf60910_003Ffb_003F3185652c_003FButtonBase_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AButtonBase_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6412d4331611499aab4eb63809a2a83bf60910_003Ffb_003F3185652c_003FButtonBase_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> @@ -18,6 +19,7 @@ <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACastCache_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F211e6f3b24fa438a92f1815153647ce2c8f908_003F0d_003F69770120_003FCastCache_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AClrObjectRuntime_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fab21534b1ec041498b3c23a65e9ed82b15a918_003F19_003F3f4e517b_003FClrObjectRuntime_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AColor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc45597e5b7ab42d99b3882b94d97e64034a00_003Ffb_003F5b076364_003FColor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> + <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComboBox_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6412d4331611499aab4eb63809a2a83bf60910_003F7d_003F17a2ade7_003FComboBox_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fb0b0c4a2151d399b735ee25ece57ad68175a5c695936bef89d53e293f47c75_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AConfigurationManager_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4855f825db5f4f469faf36f45940559e106918_003Fff_003Fb357c8b2_003FConfigurationManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AConfigurationManager_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4855f825db5f4f469faf36f45940559e106918_003Fff_003Fb357c8b2_003FConfigurationManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> @@ -67,6 +69,7 @@ <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AILog_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fcd69d110241e68c102d90de60fe9abbdef79631973c35119af9fe6139bcdbc_003FILog_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AILog_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6f4e00a876324444bc5ae4e52ed22ade46200_003F49_003Fe673ccfc_003FILog_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInputManager_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F59d3cbd3f2f27be170d8c07c2c3947fe0efe92848ebab828a63cfbe1ef3a1d_003FInputManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> + <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AItemsControl_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6412d4331611499aab4eb63809a2a83bf60910_003Fa2_003F986204d0_003FItemsControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonConvert_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F7e62198beab24380bbac29171862d1d8adf10_003Ffc_003F02691a46_003FJsonConvert_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonSerializerInternalReader_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F7e62198beab24380bbac29171862d1d8adf10_003F90_003F0d01fe57_003FJsonSerializerInternalReader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonSerializerInternalWriter_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F7e62198beab24380bbac29171862d1d8adf10_003Fb6_003Fe755f1ba_003FJsonSerializerInternalWriter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> @@ -85,6 +88,7 @@ <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObjExporter_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F68d37d16685244cf9996bf767117a771210200_003Fb5_003F8d39bfb2_003FObjExporter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APictureBoxSizeMode_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f2f0b08d2574f1aa35973d1cd0ae347cef920_003Fb2_003F76f4e66c_003FPictureBoxSizeMode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APrintController_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb6416db4533e4255bc43c1cfd556a910175930_003Fd9_003Fccfaf320_003FPrintController_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> + <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APrinterSettings_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb6416db4533e4255bc43c1cfd556a910175930_003F3f_003Ffac5e58e_003FPrinterSettings_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APrintPreviewDialog_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f2f0b08d2574f1aa35973d1cd0ae347cef920_003F07_003Fd26ee918_003FPrintPreviewDialog_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AProcess_002EWindows_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F56dbd817965a6c8ddb04d88402812c2ed2a2bc9705cb97f04c24c4916cfcf_003FProcess_002EWindows_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APropertyChangedEventArgs_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4a37508f5f72412da47f18c02ce8145313928_003F27_003F53f616d3_003FPropertyChangedEventArgs_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> diff --git a/Views/BaseWindow/BaseControl.xaml b/Views/BaseWindow/BaseControl.xaml index 3a26943..5362fc9 100644 --- a/Views/BaseWindow/BaseControl.xaml +++ b/Views/BaseWindow/BaseControl.xaml @@ -71,7 +71,7 @@ </Grid.ColumnDefinitions> <!-- 首位元素:图标 --> - <Image Grid.Column="0" Source="../../Resource/Images/icon_200.png" + <Image Grid.Column="0" Source="../../Resource/Images/icon_200_t.png" Width="50" Height="50" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="20 0 5 0" /> diff --git a/Views/BaseWindow/HomeWindow.xaml b/Views/BaseWindow/HomeWindow.xaml index 9a354e2..af53d09 100644 --- a/Views/BaseWindow/HomeWindow.xaml +++ b/Views/BaseWindow/HomeWindow.xaml @@ -104,7 +104,7 @@ <RowDefinition Height="3*"/> <RowDefinition Height="2*"/> </Grid.RowDefinitions> - <Image Grid.Row="0" Source="../../Resource/Images/icon_200.png" + <Image Grid.Row="0" Source="../../Resource/Images/icon_200_t.png" Width="80" Height="80" VerticalAlignment="Center" HorizontalAlignment="Center" /> diff --git a/Views/Configuration/ConfigMenuPage.xaml b/Views/Configuration/ConfigMenuPage.xaml index 269676c..80f212c 100644 --- a/Views/Configuration/ConfigMenuPage.xaml +++ b/Views/Configuration/ConfigMenuPage.xaml @@ -108,7 +108,7 @@ <RowDefinition Height="3*"/> <RowDefinition Height="2*"/> </Grid.RowDefinitions> - <Image Grid.Row="0" Source="../../Resource/Images/icon_200.png" + <Image Grid.Row="0" Source="../../Resource/Images/icon_200_t.png" Width="80" Height="80" VerticalAlignment="Center" HorizontalAlignment="Center" /> diff --git a/j34em-1eco4-001.ico b/j34em-1eco4-001.ico new file mode 100644 index 0000000..3420b7e Binary files /dev/null and b/j34em-1eco4-001.ico differ diff --git a/logo.ico b/logo.ico deleted file mode 100644 index 275dc87..0000000 Binary files a/logo.ico and /dev/null differ diff --git a/logo256.ico b/logo256.ico deleted file mode 100644 index 1d4e59d..0000000 Binary files a/logo256.ico and /dev/null differ