compdfkit(win) - 图标、文案

Demo/Examples/Compdfkit_Tools/Common/DeviceSerial/DeviceSerialControl.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Compdfkit_Tools.PDFControl"
              mc:Ignorable="d"
-             Title="Device Serial Number"
+             Title="Device ID"
              Height="100"
              Width="360"
              WindowStartupLocation="CenterScreen"

Demo/Examples/Compdfkit_Tools/Common/DeviceSerial/DeviceSerialControl.xaml.cs

@@ -2,7 +2,9 @@ using System;
 using System.Management;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media.Imaging;
 using System.Windows.Threading;
+using ComPDFKit.NativeMethod;
 
 namespace Compdfkit_Tools.PDFControl
 {
@@ -12,13 +14,14 @@ namespace Compdfkit_Tools.PDFControl
         {
             InitializeComponent();
             Loaded += MainWindow_Loaded;
+            Icon = new BitmapImage(new Uri("pack://application:,,,/Compdfkit_Tools;component/ComPDFKit_Logo.ico"));
         }
         
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
 		{
 			try
 			{
-				BoardText.Text = GetDeviceID();
+				BoardText.Text = CPDFSDKVerifier.GetDeviceId();
 			}
 			catch (Exception)
 			{
@@ -26,43 +29,6 @@ namespace Compdfkit_Tools.PDFControl
 			}
 		}
 
-		private string GetDeviceID()
-		{
-            string sn = "";
-
-            ManagementObjectSearcher mos = new ManagementObjectSearcher("Select * from Win32_BaseBoard");
-            foreach (ManagementObject management in mos.Get())
-            {
-                sn = management["SerialNumber"].ToString().Trim();
-                if (!string.IsNullOrEmpty(sn))
-				{
-                    return sn;
-                }
-            }
-
-            mos = new ManagementObjectSearcher("Select * from Win32_Bios");
-            foreach (ManagementObject management in mos.Get())
-            {
-                sn = management["SerialNumber"].ToString().Trim();
-                if (!string.IsNullOrEmpty(sn))
-				{
-                    return sn;
-                }
-            }
-
-            mos = new ManagementObjectSearcher("Select * from Win32_Processor");
-            foreach (ManagementObject management in mos.Get())
-            {
-                sn = management["ProcessorId"].ToString().Trim();
-                if (!string.IsNullOrEmpty(sn))
-				{
-                    return sn;
-                }
-            }
-
-            return sn;
-        }
-
 		private void CopyBtn_Click(object sender, RoutedEventArgs e)
 		{
 			try

Demo/Examples/Compdfkit_Tools/DigitalSignature/VerifyDigitalSignatureControl/DigitalSignatureValiditySummaaryControl.xaml.cs

@@ -41,7 +41,11 @@ namespace Compdfkit_Tools.PDFControl
                 validitySummaryString += "The signer's identity is invalid.\n\n";
             }
 
-            if (isSignVerified && isCertTrusted)
+            if(isDocModified || (!isSignVerified && !isCertTrusted))
+            {
+                validitySummaryString += "The signature is invalid.\n\n";
+            }
+            else if (isSignVerified && isCertTrusted)
             {
                 validitySummaryString += "The signature is valid.\n\n";
             }
@@ -49,10 +53,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 validitySummaryString += "Signature validity is unknown because it has not been included in your list of trusted certificates and none of its parent certificates are trusted certificates.\n\n";
             }
-            else if(!isSignVerified && !isCertTrusted)
-            {
-                validitySummaryString += "The signature is invalid.\n\n";
-            }
+            
             if(isExpired)
             {
                 validitySummaryString += "The file was signed with a certificate that has expired. If you acquired this file recently, it may not be authentic.\n\n";