compdfkit(win) - 更新dll，bug修复，文案校对

Demo/Examples/Compdfkit_Tools/Common/Helper/CommonHelper.cs

@@ -1018,16 +1018,26 @@ namespace Compdfkit_Tools.Helper
 
     public class SignatureHelper
     {
-        public static List<CPDFSignature> GetEffectiveSignatureList(List<CPDFSignature>signatureList)
+        public static List<CPDFSignature> SignatureList;
+        
+        public static void InitEffectiveSignatureList(CPDFDocument document)
         {
-            for(int index = signatureList.Count - 1; index >= 0; index--)
+            SignatureList = document.GetSignatureList();
+            for(int index = SignatureList.Count - 1; index >= 0; index--)
             {
-                if (signatureList[index].SignerList.Count <= 0)
+                if (SignatureList[index].SignerList.Count <= 0)
                 {
-                    signatureList.RemoveAt(index);
+                    SignatureList.RemoveAt(index);
                 }
             }
-            return signatureList;
+        }
+
+        public static void VerifySignatureList(CPDFDocument document)
+        {
+            foreach (var sig in SignatureList)
+            {
+                sig.VerifySignatureWithDocument(document);
+            }
         }
     }
 }

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

@@ -81,7 +81,7 @@ namespace Compdfkit_Tools.PDFControl
             else if (e == CreateCertificationMode.SaveCertificate)
             {
                 saveCerficateControl = new SaveCerficateControl();
-                saveCerficateControl.CertificateInfo = addCustomCertificationControl.certificateInfo;
+                saveCerficateControl.CertificateInfo = addCustomCertificationControl.CertificateInfo;
                 BodyBd.Child = saveCerficateControl;
                 Title = saveCerficateControlTitle;
                 

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

@@ -29,7 +29,7 @@ namespace Compdfkit_Tools.PDFControl
     {
         public event EventHandler SaveEvent;
         public event EventHandler CancelEvent;
-        public CertificateInfo certificateInfo = new CertificateInfo();
+        public CertificateInfo CertificateInfo = new CertificateInfo();
 
         private string _grantorName = string.Empty;
         public string GrantorName
@@ -38,7 +38,7 @@ namespace Compdfkit_Tools.PDFControl
             set
             {
                 _grantorName = value;
-                certificateInfo.GrantorName = value;
+                CertificateInfo.GrantorName = value;
             }
         }
 
@@ -49,7 +49,7 @@ namespace Compdfkit_Tools.PDFControl
             set
             {
                 _email = value;
-                certificateInfo.Email = value;
+                CertificateInfo.Email = value;
             }
         }
 
@@ -60,7 +60,7 @@ namespace Compdfkit_Tools.PDFControl
             set
             {
                 _organization = value;
-                certificateInfo.Organization = value;
+                CertificateInfo.Organization = value;
             }
         }
 
@@ -71,7 +71,7 @@ namespace Compdfkit_Tools.PDFControl
             set
             {
                 _organizationalUnit = value;
-                certificateInfo.OrganizationUnit = value;
+                CertificateInfo.OrganizationUnit = value;
             }
         }
 
@@ -122,17 +122,17 @@ namespace Compdfkit_Tools.PDFControl
         private void SaveBtn_Click(object sender, RoutedEventArgs e)
         {
 
-            if (certificateInfo.GrantorName == string.Empty)
+            if (CertificateInfo.GrantorName == string.Empty)
             {
                 ErrorTipsText.Text = "Please input Grantor Name";
                 return;
             }
-            if(certificateInfo.Email == string.Empty)
+            if(CertificateInfo.Email == string.Empty)
             {
                 ErrorTipsText.Text = "Please input Email";
                 return;
             }
-            if (!CommonHelper.IsValidEmail(certificateInfo.Email))
+            if (!CommonHelper.IsValidEmail(CertificateInfo.Email))
             {
                 ErrorTipsText.Text = "Email format is not correct";
                 return;
@@ -146,7 +146,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 string selectedText = AreaCmb.SelectedItem.ToString();
                 string[] parts = selectedText.Split('-');
-                certificateInfo.Area = parts[0].Trim(); // Extract the Alpha2Code 
+                CertificateInfo.Area = parts[0].Trim(); // Extract the Alpha2Code 
             }
         }
 
@@ -154,7 +154,7 @@ namespace Compdfkit_Tools.PDFControl
         {
             if (PurposeCmb.SelectedItem != null)
             {
-                certificateInfo.PurposeType = (CPDFCertUsage)PurposeCmb.SelectedIndex;
+                CertificateInfo.PurposeType = (CPDFCertUsage)PurposeCmb.SelectedIndex + 1;
             }
         }
     }

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

@@ -81,11 +81,12 @@ namespace Compdfkit_Tools.DigitalSignature.CPDFSignatureListControl
             int index = SignatureList.SelectedIndex;
             if (index >= 0 && index < signatureList.Count)
             {
+                int pageIndex = signatureList[index].GetPageIndex(pdfViewer.Document);
+                var widget = signatureList[index].GetSignatureWidget(pdfViewer.Document);
                 
                 pdfViewer.Document.RemoveSignature(signatureList[index], true);
-                pdfViewer.Document.ReleasePages(signatureList[index].GetPageIndex(pdfViewer.Document));
+                pdfViewer.Document.ReleasePages(pageIndex);
                 pdfViewer.ReloadDocument();
-                var widget = signatureList[index].GetSignatureWidget(pdfViewer.Document);
                 widget.ResetForm();
                 widget.SetIsLocked(false);
                 LoadSignatureList();
@@ -111,14 +112,13 @@ namespace Compdfkit_Tools.DigitalSignature.CPDFSignatureListControl
         {
             if (pdfViewer != null && pdfViewer.Document != null)
             {
-                signatureList = SignatureHelper.GetEffectiveSignatureList(pdfViewer.Document.GetSignatureList());
+                signatureList = SignatureHelper.SignatureList;
                 if (signatureList != null)
                 {
                     SignatureList.ItemsSource = null;
                     signatureDataList = new List<SignatureData>();
                     foreach (CPDFSignature signature in signatureList)
                     {
-                        signature.VerifySignatureWithDocument(pdfViewer.Document);
                         var item = new SignatureData();
                         CPDFSigner signer = signature.SignerList.First();
                         bool isSignVerified = signer.IsSignVerified;

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

@@ -123,7 +123,6 @@ namespace Compdfkit_Tools.PDFControl
             CPDFSignature sig = signatureWidget.GetSignature();
             if (signatureWidget.IsSigned() && sig.SignerList.Count > 0)
             {
-                sig.VerifySignatureWithDocument(PDFViewControl.PDFView.Document);
                 ViewSignatureEvent(sender, sig);
             }
             else
@@ -261,7 +260,6 @@ namespace Compdfkit_Tools.PDFControl
             dialog.InitCertificateList(e);
             dialog.CertificateInfoControl.TrustCertificateEvent += (o, args) =>
             {
-                e.VerifySignatureWithDocument(PDFViewControl.PDFView.Document);
                 SignatureStatusChanged?.Invoke(this, null);
             };
             

Demo/Examples/Compdfkit_Tools/DigitalSignature/ViewCertificationControl/CertificateDetailControl.xaml

@@ -8,7 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="600">
     <Grid>
         <Grid Background="#ffffff"  Margin="20,0,0,0"  Panel.ZIndex="1" Height="20" HorizontalAlignment="Left" VerticalAlignment="Top">
-            <TextBlock Text="Certificate Data" FontWeight="Bold" FontSize="16"></TextBlock>
+            <TextBlock Text="Details" FontWeight="Bold" FontSize="16"></TextBlock>
         </Grid>
        
         <Border Margin="12" BorderBrush="#33000000" BorderThickness="1" >

Demo/Examples/Compdfkit_Tools/DigitalSignature/ViewCertificationControl/CertificateInfoControl.xaml

@@ -18,17 +18,17 @@
         <TabControl Style="{StaticResource LineTabControlStyle}"                
                     Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}"
                 Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}">
-            <TabItem Header="Abstract" Style="{StaticResource LineTabItemStyle}">
+            <TabItem Header="Summary" Style="{StaticResource LineTabItemStyle}">
                 <Grid>
                     <local:SummaryControl x:Name="SummaryControl" Height="160" VerticalAlignment="Top"></local:SummaryControl>
                 </Grid>
             </TabItem>
-            <TabItem Header="Detailed Info"  Style="{StaticResource LineTabItemStyle}">
+            <TabItem Header="Detials"  Style="{StaticResource LineTabItemStyle}">
                 <Grid>
                     <local:CertificateDetailControl x:Name="CertificateDetailControl" Height="450" VerticalAlignment="Top"></local:CertificateDetailControl>
                 </Grid>
             </TabItem>
-            <TabItem Header="Confidence"  Style="{StaticResource LineTabItemStyle}">
+            <TabItem Header="Trust"  Style="{StaticResource LineTabItemStyle}">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="150"></RowDefinition>

Demo/Examples/Compdfkit_Tools/DigitalSignature/ViewCertificationControl/ViewCertificateDialog.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Compdfkit_Tools.PDFControl"
         mc:Ignorable="d"
-        Title="ViewCertificationControl" Height="600" Width="820" ResizeMode="NoResize">
+        Title="ViewCertificationControl" Height="670" Width="820" ResizeMode="NoResize">
     
     <Window.Resources>
         <local:DictionaryValueConverter x:Key="DictionaryValueConverter"/>

Demo/Examples/DigitalSignature/MainWindow.xaml.cs

@@ -32,7 +32,7 @@ namespace DigitalSignature
     public partial class MainWindow : Window, INotifyPropertyChanged
     {
         private string currentMode = "Viewer";
-
+        private bool isFirstLoad = true;
         private PDFViewControl pdfViewer;
         private PDFViewControl passwordViewer;
         private RegularViewerControl regularViewerControl = new RegularViewerControl();
@@ -40,7 +40,6 @@ namespace DigitalSignature
         private CPDFBOTABarControl botaBarControl = new CPDFBOTABarControl(BOTATools.Thumbnail | BOTATools.Outline | BOTATools.Bookmark | BOTATools.Search | BOTATools.Annotation | BOTATools.Signature);
         private CPDFDisplaySettingsControl displaySettingsControl = new CPDFDisplaySettingsControl();
         private SignatureStatusBarControl signatureStatusBarControl = new SignatureStatusBarControl();
-        private List<CPDFSignature> signatures = new List<CPDFSignature>();
 
         private PanelState panelState = PanelState.GetInstance();
         public event EventHandler<bool> OnCanSaveChanged;
@@ -165,9 +164,6 @@ namespace DigitalSignature
 
         private void LoadCustomControl()
         {
-            signatures = SignatureHelper.GetEffectiveSignatureList(pdfViewer.PDFView.Document.GetSignatureList());
-            VerifySignatures();
-            
             regularViewerControl.PdfViewControl = pdfViewer;
             regularViewerControl.InitWithPDFViewer(pdfViewer.PDFView);
             regularViewerControl.PdfViewControl.PDFView.SetMouseMode(MouseModes.Viewer);
@@ -176,16 +172,18 @@ namespace DigitalSignature
             regularViewerControl.SetDisplaySettingsControl(displaySettingsControl);
             PDFGrid.Child = regularViewerControl;
             
-            signatureStatusBarControl.SetStatus(signatures);
-            regularViewerControl.SetSignatureStatusBarControl(signatureStatusBarControl);
-
-            signatureStatusBarControl.OnViewSignatureButtonClicked -= ViewAllSignatures;
-            signatureStatusBarControl.OnViewSignatureButtonClicked += ViewAllSignatures;
-            
+            SignatureHelper.InitEffectiveSignatureList(pdfViewer.PDFView.Document);
             digitalSignatureControl.OnCanSaveChanged -= DigitalSignatureControl_OnCanSaveChanged;
             digitalSignatureControl.OnCanSaveChanged += DigitalSignatureControl_OnCanSaveChanged;
             digitalSignatureControl.SignatureStatusChanged -= DigitalSignatureControl_OnSignatureStatusChanged;
             digitalSignatureControl.SignatureStatusChanged += DigitalSignatureControl_OnSignatureStatusChanged;
+            signatureStatusBarControl.OnViewSignatureButtonClicked -= ViewAllSignatures;
+            signatureStatusBarControl.OnViewSignatureButtonClicked += ViewAllSignatures;
+            
+            SignatureHelper.VerifySignatureList(pdfViewer.PDFView.Document);
+            signatureStatusBarControl.SetStatus(SignatureHelper.SignatureList);
+            regularViewerControl.SetSignatureStatusBarControl(signatureStatusBarControl);
+            
         }
 
         private void LoadDocument()
@@ -235,9 +233,8 @@ namespace DigitalSignature
         
         private void DigitalSignatureControl_OnSignatureStatusChanged(object sender, EventArgs e)
         {
-            signatures = SignatureHelper.GetEffectiveSignatureList(pdfViewer.PDFView.Document.GetSignatureList());
-            VerifySignatures();
-            signatureStatusBarControl.SetStatus(signatures);
+            SignatureHelper.VerifySignatureList(pdfViewer.PDFView.Document);
+            signatureStatusBarControl.SetStatus(SignatureHelper.SignatureList);
             botaBarControl.LoadSignatureList();
         }
 
@@ -362,14 +359,6 @@ namespace DigitalSignature
             botaBarControl.SelectBotaTool(BOTATools.Signature);
         }
 
-        private void VerifySignatures()
-        {
-            foreach (var sig in signatures)
-            {
-                sig.VerifySignatureWithDocument(pdfViewer.PDFView.Document);
-            }
-        }
-
         private void ExpandSearchBtn_Click(object sender, RoutedEventArgs e)
         {
             LeftToolPanelButton.IsChecked = true;