compdfkit(win) - 数字签名接口参数类型调整

Demo/Examples/Compdfkit_Tools/DigitalSignature/AddCertificationControl/AddCustomCertificationControl.xaml.cs

@@ -1,4 +1,5 @@
-using ComPDFKit.PDFAnnotation;
+using ComPDFKit.DigitalSign;
+using ComPDFKit.PDFAnnotation;
 using ComPDFKit.PDFDocument;
 using Compdfkit_Tools.Helper;
 using Nager.Country;
@@ -168,7 +169,7 @@ namespace Compdfkit_Tools.PDFControl
         {
             if (PurposeCmb.SelectedItem != null)
             {
-                certificateInfo.PurposeType = (PurposeType)PurposeCmb.SelectedIndex;
+                certificateInfo.PurposeType = (CPDFCertUsage)PurposeCmb.SelectedIndex;
             }
         }
     }

Demo/Examples/Compdfkit_Tools/DigitalSignature/AddCertificationControl/SaveCerficateControl.xaml.cs

@@ -68,7 +68,7 @@ namespace Compdfkit_Tools.PDFControl
             }
             certificateInfo += "/CN=" + CertificateInfo.GrantorName;
             bool is_2048 = CertificateInfo.AlgorithmType == AlgorithmType.RSA2048bit;
-            CPDFPKCS12CertHelper.GeneratePKCS12Cert(certificateInfo, CertificateInfo.Password, FilePath, (int)CertificateInfo.PurposeType, is_2048);
+            CPDFPKCS12CertHelper.GeneratePKCS12Cert(certificateInfo, CertificateInfo.Password, FilePath, CertificateInfo.PurposeType, is_2048);
             FillDigitalSignatureDialog fillDigitalSignatureDialog = new FillDigitalSignatureDialog();
             fillDigitalSignatureDialog.FilePath = FilePath;
             fillDigitalSignatureDialog.ShowDialog();

Demo/Examples/Compdfkit_Tools/DigitalSignature/DigitalSignatureData/DigitalSignatureData.cs

@@ -1,4 +1,5 @@
-using System;
+using ComPDFKit.DigitalSign;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -19,13 +20,6 @@ namespace Compdfkit_Tools.PDFControl
         RSA2048bit
     }
 
-    public enum PurposeType
-    {
-        DigitalSignatures,
-        DataEncryption,
-        DigitalSignaturesAndDataEncryption
-    }
-
     public class CertificateInfo
     {
         public string GrantorName = string.Empty; 
@@ -35,7 +29,7 @@ namespace Compdfkit_Tools.PDFControl
         public string Area = string.Empty;
         public string Password = string.Empty;
         public AlgorithmType AlgorithmType;
-        public PurposeType PurposeType;
+        public CPDFCertUsage PurposeType;
     }
     
     internal class DigitalSignatureData

Demo/Examples/Compdfkit_Tools/DigitalSignature/FillDigitalSignatureControl/FillDigitalSignatureControl.xaml.cs

@@ -55,16 +55,16 @@ namespace Compdfkit_Tools.PDFControl
         private void CreateTempSignature()
         {
             CPDFDocument tempDocument = CPDFDocument.CreateDocument();
-            tempDocument.InsertPage(0, 200, 200, null);
+            tempDocument.InsertPage(0, 200, 200, "");
             CPDFPage page = tempDocument.PageAtIndex(0);
             CPDFSignatureWidget signatureWidget = page.CreateWidget(C_WIDGET_TYPE.WIDGET_SIGNATUREFIELDS) as CPDFSignatureWidget;
             signatureWidget.SetRect(new CRect(0, 100, 100, 0));
-            signatureWidget.UpdataApWithSignature(tempSignatureConfig);
+            //signatureWidget.UpdataApWithSignature(tempSignatureConfig);
             signatureWidget.UpdateFormAp();
-            //if(signatureWidget.UpdateApWithImage("C:\\Users\\dkan\\Pictures\\Screenshots\\hao.jpg", "", 0))
-            //{
-            //    signatureWidget.UpdateAp();
-            //}
+            if(signatureWidget.UpdateApWithImage("C:\\Users\\dkan\\Pictures\\Screenshots\\hao.jpg", "", 0))
+            {
+                signatureWidget.UpdateAp();
+            }
             byte[] signatureBitmapBytes = GetTempSignatureImage(signatureWidget, out int width, out int height);
             tempDocument.WriteToFilePath("E:\\testfile1.pdf");
 

Demo/Examples/Compdfkit_Tools/PageEdit/PDFPageEdit/CPDFPageEditControl.xaml.cs

@@ -1468,14 +1468,14 @@ namespace Compdfkit_Tools.PDFControl
                 var size = pdfViewer.Document.GetPageSize(data.InsertIndex - 1);
                 if (size.Width == 0 || size.Height == 0)
                     size = pdfViewer.Document.GetPageSize(data.InsertIndex);
-                pdfViewer.Document.InsertPage(data.InsertIndex, size.Width, size.Height, null);
+                pdfViewer.Document.InsertPage(data.InsertIndex, size.Width, size.Height, "");
                 RefreshThumbnail();
                 PageEditListBox.SelectedItems.Clear();
                 PageEditListBox.SelectedIndex = data.InsertIndex;
             }
             else if (data.InsertType == InsertType.CustomBlankPages)
             {
-                pdfViewer.Document.InsertPage(data.InsertIndex, data.PageWidth, data.PageHeight, null);
+                pdfViewer.Document.InsertPage(data.InsertIndex, data.PageWidth, data.PageHeight, "");
                 RefreshThumbnail();
                 PageEditListBox.SelectedItems.Clear();
                 PageEditListBox.SelectedIndex = data.InsertIndex;