From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件；
---
WPFProject/WPFProject.csproj | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/WPFProject/WPFProject.csproj b/WPFProject/WPFProject.csproj
index 813964a..51dae9e 100644
--- a/WPFProject/WPFProject.csproj
+++ b/WPFProject/WPFProject.csproj
@@ -107,8 +107,14 @@
<Reference Include="HandyControl, Version=3.4.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
<HintPath>packages\HandyControl.3.4.0\lib\net472\HandyControl.dll</HintPath>
</Reference>
- <Reference Include="log4net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
- <HintPath>packages\log4net.3.0.3\lib\net462\log4net.dll</HintPath>
+ <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+ <HintPath>packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.DwayneNeed">
+ <HintPath>..\Libs\Microsoft.DwayneNeed.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.DwayneNeed.Win32">
+ <HintPath>..\Libs\Microsoft.DwayneNeed.Win32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
@@ -117,10 +123,10 @@
<HintPath>packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Panuon.WPF, Version=1.1.2.2, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>packages\Panuon.WPF.1.1.2.2\lib\net472\Panuon.WPF.dll</HintPath>
+ <HintPath>packages\Panuon.WPF.1.1.3\lib\net472\Panuon.WPF.dll</HintPath>
</Reference>
- <Reference Include="Panuon.WPF.UI, Version=1.2.4.8, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>packages\Panuon.WPF.UI.1.2.4.9\lib\net472\Panuon.WPF.UI.dll</HintPath>
+ <Reference Include="Panuon.WPF.UI, Version=1.3.0.2, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>packages\Panuon.WPF.UI.1.3.0.2\lib\net472\Panuon.WPF.UI.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework.Aero" />
<Reference Include="System" />
@@ -190,14 +196,29 @@
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Controls\DpPlugin.cs" />
+ <Compile Include="Controls\HolderForm.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Controls\HolderForm.Designer.cs">
+ <DependentUpon>HolderForm.cs</DependentUpon>
+ </Compile>
<Compile Include="Controls\InnerWindow.xaml.cs">
<DependentUpon>InnerWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\MainTabControl.xaml.cs">
<DependentUpon>MainTabControl.xaml</DependentUpon>
</Compile>
+ <Compile Include="Controls\MaskControl.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="Controls\MaskControl.Designer.cs">
+ <DependentUpon>MaskControl.cs</DependentUpon>
+ </Compile>
<Compile Include="Controls\MinInnerWindow.xaml.cs">
<DependentUpon>MinInnerWindow.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Controls\WinFormHolder.xaml.cs">
+ <DependentUpon>WinFormHolder.xaml</DependentUpon>
</Compile>
<Compile Include="Entity\PluginLoadMessage.cs" />
<Compile Include="Entity\PluginSettingInfo.cs" />
@@ -250,9 +271,13 @@
<Compile Include="UI\WorkWindow.xaml.cs">
<DependentUpon>WorkWindow.xaml</DependentUpon>
</Compile>
+ <Compile Include="Utils\BinUtil.cs" />
<Compile Include="Utils\CanvasHelper.cs" />
+ <Compile Include="Utils\CommonLogger.cs" />
<Compile Include="Utils\DdDragHandler.cs" />
<Compile Include="Utils\DdDropHandler.cs" />
+ <Compile Include="Utils\Encryptor.cs" />
+ <Compile Include="Utils\LogCleanner.cs" />
<Compile Include="Utils\MainToastHandler.cs" />
<Compile Include="Utils\Resize.cs" />
<Compile Include="Utils\Win32Helper.cs" />
@@ -274,6 +299,10 @@
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\MinInnerWindow.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Controls\WinFormHolder.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -378,6 +407,9 @@
<Content Include="x64\SQLite.Interop.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="Libs\SuperSocket.SocketEngine.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Resource Include="Icon\b1.jpg" />
<Resource Include="Icon\b2.jpg" />
<Resource Include="Icon\b3.jpg" />
@@ -399,6 +431,9 @@
</Content>
<Resource Include="Resources\Background.png" />
<Resource Include="Resources\JingCeLogo.png" />
+ <EmbeddedResource Include="Controls\HolderForm.resx">
+ <DependentUpon>HolderForm.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Forms\Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
@@ -406,9 +441,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <Content Include="Libs\x64\SQLite.Interop.dll">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
<Content Include="Config\log4net.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -421,9 +453,7 @@
<Content Include="Lang\zh-CN\Setting.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="Config\Database\database.db">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
+ <Content Include="Config\Database\database.db" />
<Content Include="Lang\zh-CN\DataViewer.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -461,6 +491,24 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Lang\en-US\TestResult.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\ServoManage.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\ServoManage.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\DOControl.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\LogViewer.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\DOControl.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\LogViewer.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="packages.config" />
@@ -514,6 +562,14 @@
<Project>{de4205c6-5923-46fd-a4b9-65169bf61c75}</Project>
<Name>HMI.MenuManage</Name>
</ProjectReference>
+ <ProjectReference Include="..\Plugin.DOControl\Plugin.DOControl.csproj">
+ <Project>{306a83dc-a7db-4057-baa7-477d8756f5d9}</Project>
+ <Name>Plugin.DOControl</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.ServoManage\Plugin.ServoManage.csproj">
+ <Project>{1853e00f-6865-4bc6-974b-6a5e1c00bafe}</Project>
+ <Name>Plugin.ServoManage</Name>
+ </ProjectReference>
<ProjectReference Include="..\Plugin.TestResult\Plugin.TestResult.csproj">
<Project>{7375b74c-b6bf-4814-9838-e1caacad1897}</Project>
<Name>Plugin.TestResult</Name>
@@ -555,23 +611,26 @@
move /y "$(TargeDir)HMI.SettingControl.dll" $(TargeDir)Plugin\HMI.SettingControl.dll"
move /y "$(TargeDir)Plugin.TestResult.dll" $(TargeDir)Plugin\Plugin.TestResult.dll"
move /y "$(TargeDir)Plugin.TsExecution.dll" $(TargeDir)Plugin\Plugin.TsExecution.dll"
+move /y "$(TargeDir)Plugin.ServoManage.dll" $(TargeDir)Plugin\Plugin.ServoManage.dll"
+move /y "$(TargeDir)Plugin.DOControl.dll" $(TargeDir)Plugin\Plugin.DOControl.dll"
setlocal enabledelayedexpansion
set "source_folder=$(TargetDir)"
set "destination_folder=$(TargetDir)3rds"
-if not exist "%25destination_folder%25" mkdir "%25destination_folder%25"
+rmdir /S /Q "%25destination_folder%25"
+mkdir "%25destination_folder%25"
for /d %25%25D in ("%25source_folder%25\*") do (
if /I not "%25%25~nxD"=="Config" if /I not "%25%25~nxD"=="Icon" if /I not "%25%25~nxD"=="Lang" if /I not "%25%25~nxD"=="Libs" if /I not "%25%25~nxD"=="Log" if /I not "%25%25~nxD"=="Plugin" (
- move "%25%25D" "%25destination_folder%25"
+ move /Y "%25%25D" "%25destination_folder%25"
)
)
for %25%25F in ("%25source_folder%25\*") do (
if /I not "%25%25~nxF"=="$(TargetFileName)" if /I not "%25%25~nxF"=="$(TargetFileName).config" if /I not "%25%25~nxF"=="$(TargetName).pdb" if /I not "%25%25~nxF"=="clear.bat" (
- move "%25%25F" "%25destination_folder%25"
+ move /Y "%25%25F" "%25destination_folder%25"
)
)</PostBuildEvent>
</PropertyGroup>
--
Gitblit v1.9.1