From f08871fe7d148d667f2f11f80f64de71a0d9504c Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 15 六月 2026 18:19:37 +0800
Subject: [PATCH] 优化标准老化界面
---
WPFProject/WPFProject.csproj | 117 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 72 insertions(+), 45 deletions(-)
diff --git a/WPFProject/WPFProject.csproj b/WPFProject/WPFProject.csproj
index ab7c4b2..4260917 100644
--- a/WPFProject/WPFProject.csproj
+++ b/WPFProject/WPFProject.csproj
@@ -198,8 +198,9 @@
<Compile Include="PanuonWindow.xaml.cs">
<DependentUpon>PanuonWindow.xaml</DependentUpon>
</Compile>
- <Compile Include="TestWindow.xaml.cs">
- <DependentUpon>TestWindow.xaml</DependentUpon>
+ <Compile Include="ResourceListener.cs" />
+ <Compile Include="UI\ResourceUI.xaml.cs">
+ <DependentUpon>ResourceUI.xaml</DependentUpon>
</Compile>
<Compile Include="UI\TestWindow.xaml.cs">
<DependentUpon>TestWindow.xaml</DependentUpon>
@@ -213,9 +214,6 @@
<Compile Include="Utils\LogCleanner.cs" />
<Compile Include="Utils\MainToastHandler.cs" />
<Compile Include="Utils\Win32Helper.cs" />
- <Compile Include="Window1.xaml.cs">
- <DependentUpon>Window1.xaml</DependentUpon>
- </Compile>
<Page Include="Controls\MainTabControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -236,10 +234,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="MainWindow.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
@@ -248,11 +242,11 @@
<Compile Include="Controls\MenuTabControl.xaml.cs">
<DependentUpon>MenuTabControl.xaml</DependentUpon>
</Compile>
- <Compile Include="MainWindow.xaml.cs">
- <DependentUpon>MainWindow.xaml</DependentUpon>
- <SubType>Code</SubType>
- </Compile>
<Page Include="PanuonWindow.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="UI\ResourceUI.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -264,10 +258,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Window1.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
<Page Include="Style\ListViewStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -277,10 +267,6 @@
<SubType>Designer</SubType>
</Page>
<Page Include="Style\MainTab.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
- <Page Include="TestWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -305,7 +291,7 @@
<Content Include="Config\Put Your Config Here.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="Libs\Static\Static Resource.txt">
+ <Content Include="Icon\LoginLogo.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="x64\SQLite.Interop.dll">
@@ -314,9 +300,16 @@
<Content Include="SuperSocket.SocketEngine.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="x86\SQLite.Interop.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="瀹夎MSMQ.bat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="鍙樻洿璁板綍\2025-12-24.txt" />
+ <None Include="Settings.ini">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<Resource Include="Icon\b1.jpg" />
<Resource Include="Icon\b2.jpg" />
<Resource Include="Icon\b3.jpg" />
@@ -333,9 +326,6 @@
<Resource Include="Icon\t2.png" />
<Resource Include="Icon\t3.png" />
<Resource Include="Icon\t4.png" />
- <Content Include="Plugin\Here put your plugins.txt">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
<Resource Include="Resources\Background.png" />
<Resource Include="Resources\JingCeLogo.png" />
<EmbeddedResource Include="Controls\HolderForm.resx">
@@ -444,11 +434,43 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\HMI.Old\Plugin_TestResult\CellStepSender\CellStepSender.csproj">
+ <ProjectReference Include="..\CellStepSender\CellStepSender.csproj">
<Project>{84edeac7-6763-46cd-b098-0b508aaa705f}</Project>
<Name>CellStepSender</Name>
</ProjectReference>
- <ProjectReference Include="..\..\S7Driver\S7Driver.csproj">
+ <ProjectReference Include="..\HMI.Util\HMI.Util.csproj">
+ <Project>{AFEA100A-9223-448D-AB10-3015D93DD98C}</Project>
+ <Name>HMI.Util</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\ModBusTcpController\ModBusTcpController.csproj">
+ <Project>{49db0c9b-b239-4608-a91e-f5ed43afaf96}</Project>
+ <Name>ModBusTcpController</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.BurnIn\Plugin.BurnIn.csproj">
+ <Project>{7964f444-d2c6-4c11-87f4-0df4faec10b6}</Project>
+ <Name>Plugin.BurnIn</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.DataViewer\Plugin.DataViewer.csproj">
+ <Project>{dbfe5040-963f-4bbf-93fb-26b3f18fda90}</Project>
+ <Name>Plugin.DataViewer</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.QualityReport\Plugin.QualityReport.csproj">
+ <Project>{0fd55872-b9f6-41ad-8d3f-6d7a7d3f1233}</Project>
+ <Name>Plugin.QualityReport</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.SeqEditor\Plugin.SeqEditor.csproj">
+ <Project>{1260f995-1ae9-17b6-feb5-c430c1416bec}</Project>
+ <Name>Plugin.SeqEditor</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.TestResult\Plugin.TestResult.csproj">
+ <Project>{7375b74c-b6bf-4814-9838-e1caacad1897}</Project>
+ <Name>Plugin.TestResult</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.TsExecution\Plugin.TsExecution.csproj">
+ <Project>{202d9a7b-96b3-4ad4-9977-fc4263207a02}</Project>
+ <Name>Plugin.TsExecution</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\S7Driver\S7Driver.csproj">
<Project>{628ef12b-9ed2-4b20-950f-dc3ecc3fd15f}</Project>
<Name>S7Driver</Name>
</ProjectReference>
@@ -504,25 +526,9 @@
<Project>{61df853d-829a-4426-bef8-0135586005b6}</Project>
<Name>Plugin.DODriverControl</Name>
</ProjectReference>
- <ProjectReference Include="..\Plugin.JarUI\Plugin.JarUI.csproj">
- <Project>{968fe602-22d6-42bd-981c-601ad518a896}</Project>
- <Name>Plugin.JarUI</Name>
- </ProjectReference>
<ProjectReference Include="..\Plugin.ModelManage\Plugin.ModelManage.csproj">
<Project>{76ce4d21-702c-416f-95b4-f4f4c5b2d162}</Project>
<Name>Plugin.ModelManage</Name>
- </ProjectReference>
- <ProjectReference Include="..\Plugin.SeqEditor\Plugin.SeqEditor.csproj">
- <Project>{717fd815-ff95-4f30-b4d9-9cea978ca40e}</Project>
- <Name>Plugin.SeqEditor</Name>
- </ProjectReference>
- <ProjectReference Include="..\Plugin.TestResult\Plugin.TestResult.csproj">
- <Project>{7375b74c-b6bf-4814-9838-e1caacad1897}</Project>
- <Name>Plugin.TestResult</Name>
- </ProjectReference>
- <ProjectReference Include="..\Plugin.TsExecution\Plugin.TsExecution.csproj">
- <Project>{202d9a7b-96b3-4ad4-9977-fc4263207a02}</Project>
- <Name>Plugin.TsExecution</Name>
</ProjectReference>
<ProjectReference Include="..\SimpleUtil\HMI.LogUtil\HMI.LogUtil.csproj">
<Project>{6d0aab08-0f3e-48ce-b755-9d29bc8f1225}</Project>
@@ -563,6 +569,13 @@
<PropertyGroup>
<PostBuildEvent>IF "$(ConfigurationName)"=="Release" Confuser.CLI.exe $(TargeDir)..\ConfuserEx\$(TargetFileName).crproj
+
+mkdir "$(TargetDir)OpenTap"
+
+copy "$(TargeDir)HMI.Core.dll" "$(TargetDir)OpenTap"
+copy "$(TargeDir)HMI.Simple.Util.dll" "$(TargetDir)OpenTap"
+copy "$(TargeDir)HMI.Util.Base.dll" "$(TargetDir)OpenTap"
+
move /y "$(TargeDir)HMI.Core.dll" $(TargeDir)Libs\HMI.Core.dll"
move /y "$(TargeDir)HMI.Base.dll" $(TargeDir)Libs\HMI.Base.dll"
move /y "$(TargeDir)HMI.UI.dll" $(TargeDir)Libs\HMI.UI.dll"
@@ -571,12 +584,16 @@
move /y "$(TargeDir)HMI.StdControl.dll" $(TargeDir)Libs\HMI.StdControl.dll"
move /y "$(TargeDir)S7Driver.dll" $(TargeDir)Libs\S7Driver.dll"
move /y "$(TargeDir)HslCommunication.dll" $(TargeDir)Libs\HslCommunication.dll"
+move /y "$(TargeDir)PLCHelper.dll" $(TargeDir)Libs\PLCHelper.dll"
+move /y "$(TargeDir)ModBusTcpController.dll" $(TargeDir)Libs\ModBusTcpController.dll"
move /y "$(TargeDir)HMI.LogUtil.dll" $(TargeDir)Api\HMI.LogUtil.dll"
move /y "$(TargeDir)HMI.SerialData.Util.dll" $(TargeDir)Api\HMI.SerialData.Util.dll"
move /y "$(TargeDir)HMI.Simple.Util.dll" $(TargeDir)Api\HMI.Simple.Util.dll"
move /y "$(TargeDir)HMI.Util.Base.dll" $(TargeDir)Api\HMI.Util.Base.dll"
move /y "$(TargeDir)CellStepSender.dll" $(TargeDir)Api\CellStepSender.dll"
+
+mkdir "$(TargetDir)Plugin"
move /y "$(TargeDir)HMI.AlarmInfoManage.dll" $(TargeDir)Plugin\HMI.AlarmInfoManage.dll"
move /y "$(TargeDir)HMI.DataViewer.dll" $(TargeDir)Plugin\HMI.DataViewer.dll"
@@ -598,6 +615,16 @@
move /y "$(TargeDir)Plugin.DODriverControl.dll" $(TargeDir)Plugin\Plugin.DODriverControl.dll"
move /y "$(TargeDir)Plugin.ModelManage.dll" $(TargeDir)Plugin\Plugin.ModelManage.dll"
move /y "$(TargeDir)Plugin.CurrentSensorControl.dll" $(TargeDir)Plugin\Plugin.CurrentSensorControl.dll"
+move /y "$(TargeDir)Plugin.TsSupport.dll" $(TargeDir)Plugin\Plugin.TsSupport.dll"
+move /y "$(TargeDir)Plugin.DataViewer.dll" $(TargeDir)Plugin\Plugin.DataViewer.dll"
+move /y "$(TargeDir)Util.ManualDebug.dll" $(TargeDir)Plugin\Util.ManualDebug.dll"
+move /y "$(TargeDir)Plugin.QualityReport.dll" $(TargeDir)Plugin\Plugin.QualityReport.dll"
+move /y "$(TargeDir)Plugin.BurnIn.dll" $(TargeDir)Plugin\Plugin.BurnIn.dll"
+
+move /y "$(TargeDir)AddInPlugin.dll" "$(TargetDir)OpenTap\AddInPlugin.dll"
+move /y "$(TargeDir)OpenTap.dll" "$(TargetDir)OpenTap\OpenTap.dll"
+move /y "$(TargeDir)OpenTap.Plugins.BasicSteps.dll" "$(TargetDir)OpenTap\OpenTap.Plugins.BasicSteps.dll"
+move /y "$(TargeDir)HMI.TapApi.dll" "$(TargetDir)OpenTap\HMI.TapApi.dll"
setlocal enabledelayedexpansion
@@ -614,13 +641,13 @@
)
for /d %25%25D in ("%25source_folder%25\*") do (
- if /I not "%25%25~nxD"=="Api" 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" if /I not "%25%25~nxD"=="TestPlatform.exe.WebView2" (
+ if /I not "%25%25~nxD"=="Api" 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" if /I not "%25%25~nxD"=="TestPlatform.exe.WebView2" if /I not "%25%25~nxD"=="OpenTap" (
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" if /I not "%25%25~nxF"=="瀹夎MSMQ.bat" (
+ 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" if /I not "%25%25~nxF"=="瀹夎MSMQ.bat" if /I not "%25%25~nxF"=="Settings.ini" (
move /Y "%25%25F" "%25destination_folder%25"
)
)
--
Gitblit v1.9.1