From a061384ba628a09bf4df91f50321ab22c03129aa Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 18 三月 2025 20:58:36 +0800
Subject: [PATCH] Winform支持遮罩层；
---
WPFProject/WPFProject.csproj | 255 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 230 insertions(+), 25 deletions(-)
diff --git a/WPFProject/WPFProject.csproj b/WPFProject/WPFProject.csproj
index 564f32e..3fa1e7a 100644
--- a/WPFProject/WPFProject.csproj
+++ b/WPFProject/WPFProject.csproj
@@ -7,7 +7,7 @@
<ProjectGuid>{D47D2314-5DD5-4899-ADF9-15ED057289D3}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>WPFProject</RootNamespace>
- <AssemblyName>WPFProject</AssemblyName>
+ <AssemblyName>TestPlatform</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -15,6 +15,24 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<LangVersion>latest</LangVersion>
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <PublishUrl>C:\Output\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>1</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <PublishWizardCompleted>true</PublishWizardCompleted>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -49,11 +67,35 @@
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
+ <DebugType>none</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile>
+ </DocumentationFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ApplicationIcon>JingCeLogo2.ico</ApplicationIcon>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestCertificateThumbprint>EEB12C457268F9D6367680E983B284A2555FF73A</ManifestCertificateThumbprint>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestKeyFile>WPFProject_TemporaryKey.pfx</ManifestKeyFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <GenerateManifests>false</GenerateManifests>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignManifests>true</SignManifests>
+ </PropertyGroup>
+ <PropertyGroup>
+ <TargetZone>LocalIntranet</TargetZone>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="AIStudio.Wpf.Controls, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
@@ -65,17 +107,23 @@
<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>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <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>
@@ -148,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" />
@@ -167,6 +230,9 @@
</Compile>
<Compile Include="LoadingWindow.xaml.cs">
<DependentUpon>LoadingWindow.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Login.xaml.cs">
+ <DependentUpon>Login.xaml</DependentUpon>
</Compile>
<Compile Include="Models\CanvasPosition.cs" />
<Compile Include="Models\FuncModel.cs" />
@@ -205,14 +271,19 @@
<Compile Include="UI\WorkWindow.xaml.cs">
<DependentUpon>WorkWindow.xaml</DependentUpon>
</Compile>
+ <Compile Include="Utils\BinUtil.cs" />
<Compile Include="Utils\CanvasHelper.cs" />
<Compile Include="Utils\DdDragHandler.cs" />
<Compile Include="Utils\DdDropHandler.cs" />
+ <Compile Include="Utils\Encryptor.cs" />
<Compile Include="Utils\MainToastHandler.cs" />
<Compile Include="Utils\Resize.cs" />
<Compile Include="Utils\Win32Helper.cs" />
<Compile Include="Utils\XmlUtil.cs" />
<Compile Include="ViewModels\ProgramListViewModel.cs" />
+ <Compile Include="Window1.xaml.cs">
+ <DependentUpon>Window1.xaml</DependentUpon>
+ </Compile>
<Page Include="Controls\InnerWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -229,7 +300,15 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Controls\WinFormHolder.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="LoadingWindow.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
+ <Page Include="Login.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -285,11 +364,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Resource Include="Resources\Font\Font.xaml">
- <Generator>MSBuild:Compile</Generator>
+ <Page Include="Window1.xaml">
<SubType>Designer</SubType>
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Resource>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Style\ListViewStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -321,6 +399,39 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
+ <Content Include="Config\Put Your Config Here.txt">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <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" />
+ <Resource Include="Icon\b4.jpg" />
+ <Content Include="Icon\JingCeLogo.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Icon\JingCeLogo2.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Resource Include="TextFile1.txt" />
+ <Resource Include="JingCeLogo2.ico" />
+ <Resource Include="Icon\t1.png" />
+ <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">
+ <DependentUpon>HolderForm.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Forms\Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
@@ -328,29 +439,70 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <Content Include="Libs\SQLite.Interop.dll">
+ <Content Include="Config\log4net.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="log4net.config">
+ <Content Include="Lang\zh-CN\App.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\TestExecution.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\Setting.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Config\Database\database.db" />
+ <Content Include="Lang\zh-CN\DataViewer.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\ParamManage.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\IOMonitor.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\AlarmInfoManage.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\TestResult.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\AlarmInfoManage.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\App.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\DataViewer.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\IOMonitor.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\ParamManage.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\Setting.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\TestExecution.json">
+ <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>
<None Include="packages.config" />
+ <None Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
- <Resource Include="Resources\Font\iconfont.ttf">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Resource>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
- </ItemGroup>
- <ItemGroup>
- <WCFMetadata Include="Connected Services\" />
- </ItemGroup>
- <ItemGroup>
- <Resource Include="Resources\Icon\xinzeng_1.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HMI.AlermInfoManage\HMI.AlarmInfoManage.csproj">
@@ -393,9 +545,17 @@
<Project>{de4205c6-5923-46fd-a4b9-65169bf61c75}</Project>
<Name>HMI.MenuManage</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>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.TsExecution\Plugin.TsExecution.csproj">
+ <Project>{202d9a7b-96b3-4ad4-9977-fc4263207a02}</Project>
+ <Name>Plugin.TsExecution</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -404,12 +564,57 @@
</Content>
</ItemGroup>
<ItemGroup>
- <Folder Include="Config\" />
- <Folder Include="Plugin\" />
+ <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+ <Visible>False</Visible>
+ <ProductName>Microsoft .NET Framework 4.7.2 %28x86 鍜� x64%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>copy /Y "$(TargetDir)HMI.MenuManage.dll" "$(TargetDir)\Plugin\HMI.MenuManage.dll"
-copy /Y "$(TargetDir)HMI.MenuManage.pdb" "$(TargetDir)\Plugin\HMI.MenuManage.pdb"</PostBuildEvent>
+ <PostBuildEvent>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"
+
+move /y "$(TargeDir)HMI.AlarmInfoManage.dll" $(TargeDir)Plugin\HMI.AlarmInfoManage.dll"
+move /y "$(TargeDir)HMI.DataViewer.dll" $(TargeDir)Plugin\HMI.DataViewer.dll"
+move /y "$(TargeDir)HMI.IOMonitor.dll" $(TargeDir)Plugin\HMI.IOMonitor.dll"
+move /y "$(TargeDir)HMI.LogViewer.dll" $(TargeDir)Plugin\HMI.LogViewer.dll"
+move /y "$(TargeDir)HMI.MenuManage.dll" $(TargeDir)Plugin\HMI.MenuManage.dll"
+move /y "$(TargeDir)HMI.ParameterManage.dll" $(TargeDir)Plugin\HMI.ParameterManage.dll"
+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"
+
+setlocal enabledelayedexpansion
+
+set "source_folder=$(TargetDir)"
+set "destination_folder=$(TargetDir)3rds"
+
+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 /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 /Y "%25%25F" "%25destination_folder%25"
+ )
+)</PostBuildEvent>
</PropertyGroup>
+ <ProjectExtensions>
+ <VisualStudio>
+ <UserProperties lang_4zh-cn_4app_1json__JsonSchema="" />
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1