Merge remote-tracking branch 'origin/master' into zyyNew

# Conflicts:
#	.gitignore

.gitignore

@@ -23,54 +23,110 @@ Common/bin/Debug/Common.pdb~origin_zxy
 Common/bin/Debug/ICSharpCode.SharpZipLib.dll
 Common/bin/Debug/log4net.config
 Common/bin/Debug/log4net.dll
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser ps.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser limited2 blue gdi.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser limited.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser limited ps.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser limited gdi.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/laser gdi.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C9650.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C9600.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C8800.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C710.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C5950.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C5900.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/default/OKI C5400.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/OKI C9650 Forms.profile
+XHWK.WKTool/bin/Debug/PrintTool/data/profiles/OKI C9600.profile
+XHWK.WKTool/bin/Debug/PrintTool/Ghostscript/gs8.71/lib/stc1520h.upp
+XHWK.WKTool/bin/Debug/PrintTool/Ghostscript/gs8.71/lib/landscap.ps
+XHWK.WKTool/bin/Debug/PrintTool/Ghostscript/gs8.71/lib/gs_btokn.ps
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDScanConverter.dll
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPublishImageGenerator.dll
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPatternGenerator.dll
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPatternGenerator.bin
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPGHelper.dll
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OIDPDFFileGenerator.dll
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/OID PG.ini
+XHWK.WKTool/bin/Debug/OIDPublishImageGenerator/AppVersionType.ini
+XHWK.WKTool/bin/Debug/O2S.Components.PDFRender4NET.dll
+XHWK.WKTool/bin/Debug/Newtonsoft.Json.xml
+XHWK.WKTool/bin/Debug/Newtonsoft.Json.dll
+XHWK.WKTool/bin/Debug/Microsoft.mshtml.dll
+XHWK.WKTool/bin/Debug/Log/PrintLog/20210713.log
+XHWK.WKTool/bin/Debug/LatticeXML/print_license.xml
+XHWK.WKTool/bin/Debug/LatticeXML/S0_O000_B0000_P000-255.tmx
+XHWK.WKTool/bin/Debug/ICSharpCode.SharpZipLib.dll
+XHWK.WKTool/bin/Debug/DrawToolsLib.dll
+XHWK.WKTool/bin/Debug/DocumentTools.dll
+XHWK.WKTool/bin/Debug/Common.pdb
+XHWK.WKTool/bin/Debug/Common.dll
+XHWK.WKTool/bin/Debug/CheckPoint.dll
+XHWK.WKTool/bin/Debug/BouncyCastle.Crypto.dll
+XHWK.WKTool/bin/Debug/AxInterop.AcroPDFLib.dll
+XHWK.WKTool/bin/Debug/Aspose.Words.xml
+XHWK.WKTool/bin/Debug/Aspose.Words.dll
+XHWK.WKTool/bin/Debug/Aspose.Slides.dll
+XHWK.WKTool/bin/Debug/Aspose.PDF.xml
+XHWK.WKTool/bin/Debug/Aspose.PDF.dll
+XHWK.WKTool/bin/Debug/AForge.xml
+XHWK.WKTool/bin/Debug/AForge.dll
+XHWK.WKTool/bin/Debug/AForge.Video.xml
+XHWK.WKTool/bin/Debug/AForge.Video.dll
+XHWK.WKTool/bin/Debug/AForge.Video.DirectShow.xml
+XHWK.WKTool/bin/Debug/AForge.Video.DirectShow.dll
+XHWK.WKTool/bin/Debug/AForge.Math.xml
+XHWK.WKTool/bin/Debug/AForge.Math.dll
+XHWK.WKTool/bin/Debug/AForge.Imaging.xml
+XHWK.WKTool/bin/Debug/AForge.Imaging.dll
+XHWK.WKTool/bin/Debug/AForge.Controls.xml
+XHWK.WKTool/bin/Debug/AForge.Controls.dll
+XHWK.Model/obj/Debug/XHWK.Model.pdb
+XHWK.Model/obj/Debug/XHWK.Model.dll
+XHWK.Model/obj/Debug/XHWK.Model.csproj.FileListAbsolute.txt
+XHWK.Model/obj/Debug/XHWK.Model.csproj.CoreCompileInputs.cache
+XHWK.Model/obj/Debug/XHWK.Model.csproj.CopyComplete
+XHWK.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+XHWK.Model/obj/Debug/.NETFramework,Version=v4.5.2.AssemblyAttributes.cs
+XHWK.Model/bin/Debug/XHWK.Model.pdb
+XHWK.Model/bin/Debug/XHWK.Model.dll
+XHWK.Model/bin/Debug/NStandard.dll
+XHWK.Model/bin/Debug/Ink.dll
+Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+Common/obj/Debug/Common.pdb
+Common/obj/Debug/Common.dll
+Common/obj/Debug/Common.csproj.FileListAbsolute.txt
+Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
+Common/obj/Debug/Common.csproj.CopyComplete
+Common/obj/Debug/Common.csproj.AssemblyReference.cache
+Common/obj/Debug/.NETFramework,Version=v4.5.2.AssemblyAttributes.cs
 Common/bin/Debug/log4net.xml
-Common/bin/Debug/Newtonsoft.Json.dll
+Common/bin/Debug/log4net.dll
+Common/bin/Debug/log4net.config
+Common/bin/Debug/XHWK.Model.pdb
+Common/bin/Debug/XHWK.Model.dll
+Common/bin/Debug/VisioForge.Types.dll
+Common/bin/Debug/VisioForge.Tools.dll
+Common/bin/Debug/VisioForge.Shared.dll
+Common/bin/Debug/VisioForge.MediaFramework.dll
+Common/bin/Debug/VisioForge.Controls.dll
+Common/bin/Debug/VisioForge.Controls.UI.dll
+Common/bin/Debug/VisioForge.Controls.UI.Dialogs.dll
+Common/bin/Debug/System.Data.SQLite.dll
+Common/bin/Debug/O2S.Components.PDFRender4NET.dll
 Common/bin/Debug/Newtonsoft.Json.xml
+Common/bin/Debug/Newtonsoft.Json.dll
 Common/bin/Debug/NPOI.dll
+Common/bin/Debug/NPOI.OpenXmlFormats.dll
 Common/bin/Debug/NPOI.OOXML.dll
 Common/bin/Debug/NPOI.OpenXml4Net.dll
-Common/bin/Debug/NPOI.OpenXmlFormats.dll
-Common/bin/Debug/O2S.Components.PDFRender4NET.dll
-Common/bin/Debug/System.Data.SQLite.dll
-Common/bin/Debug/VisioForge.Controls.dll
-Common/bin/Debug/VisioForge.Controls.UI.Dialogs.dll
-Common/bin/Debug/VisioForge.Controls.UI.dll
-Common/bin/Debug/VisioForge.MediaFramework.dll
-Common/bin/Debug/VisioForge.Shared.dll
-Common/bin/Debug/VisioForge.Tools.dll
-Common/bin/Debug/VisioForge.Types.dll
-Common/bin/Debug/XHWK.Model.dll
-Common/bin/Debug/XHWK.Model.pdb
-XHWK.WKTool/bin/Debug/AForge.Controls.dll
-XHWK.WKTool/bin/Debug/AForge.Controls.xml
-XHWK.WKTool/bin/Debug/AForge.dll
-XHWK.WKTool/bin/Debug/AForge.Imaging.dll
-XHWK.WKTool/bin/Debug/AForge.Imaging.xml
-XHWK.WKTool/bin/Debug/AForge.Math.dll
-XHWK.WKTool/bin/Debug/AForge.Math.xml
-XHWK.WKTool/bin/Debug/AForge.Video.DirectShow.dll
-XHWK.WKTool/bin/Debug/AForge.Video.DirectShow.xml
-XHWK.WKTool/bin/Debug/AForge.Video.dll
-XHWK.WKTool/bin/Debug/AForge.Video.xml
-XHWK.WKTool/bin/Debug/AForge.xml
-XHWK.WKTool/bin/Debug/Aspose.PDF.dll
-XHWK.WKTool/bin/Debug/Aspose.PDF.xml
-XHWK.WKTool/bin/Debug/Aspose.Slides.dll
-XHWK.WKTool/bin/Debug/Aspose.Words.dll
-XHWK.WKTool/bin/Debug/Aspose.Words.xml
-XHWK.WKTool/bin/Debug/CheckPoint.dll
-XHWK.WKTool/bin/Debug/Common.dll
-XHWK.WKTool/bin/Debug/Common.pdb
 XHWK.WKTool/bin/Debug/ffmpegx32.zip
 XHWK.WKTool/bin/Debug/ffmpegx64.zip
-XHWK.WKTool/bin/Debug/ICSharpCode.SharpZipLib.dll
 XHWK.WKTool/bin/Debug/itextsharp.xml
 XHWK.WKTool/bin/Debug/log4net.config
 XHWK.WKTool/bin/Debug/log4net.dll
 XHWK.WKTool/bin/Debug/log4net.xml
-XHWK.WKTool/bin/Debug/Microsoft.mshtml.dll
-XHWK.WKTool/bin/Debug/Newtonsoft.Json.dll
-XHWK.WKTool/bin/Debug/Newtonsoft.Json.xml
 XHWK.WKTool/bin/Debug/Spire.License.xml
 XHWK.WKTool/bin/Debug/TmatrixLibrary_OID4.dll
 XHWK.WKTool/bin/Debug/WpfAnimatedGif.pdb
@@ -81,7 +137,5 @@ XHWK.WKTool/bin/Debug/星火微课.exe
 XHWK.WKTool/bin/Debug/星火微课.exe.config
 XHWK.WKTool/bin/Debug/星火微课.pdb
 XHWK.WKTool/bin/Debug/星火微课点阵码打印及印刷指导手册.docx
-XHWK.WKTool/bin/Debug/LatticeXML/print_license.xml
-XHWK.WKTool/bin/Debug/LatticeXML/S0_O000_B0000_P000-255.tmx
 XHWK.WKTool/bin/Debug/Resources/AudioFrequency.mp3
 XHWK.WKTool/bin/Debug/SSCR/Setup Screen Capturer Recorder v0.12.10.exe