综合-调整PDFsetting dll引用，处理(x64,x86无法启动问题)；SDK 验证增加输出日志

PDF Office/App.xaml.cs

@@ -286,7 +286,17 @@ namespace PDF_Master
 
 
 
-            LicenseVerify();
+            if(!LicenseVerify())
+            {
+                System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                {
+
+                    AlertsMessage alertsMessage = new AlertsMessage();
+                    alertsMessage.ShowDialog("", "系统加载失败，请尝试卸载重装", "OK");
+                    Environment.Exit(1);
+                    return;
+                }));
+            }
 
             InitSettings();
 
@@ -581,28 +591,35 @@ namespace PDF_Master
             {
                 result = CPDFSDKVerifier.LoadNativeLibrary();
                 if (!result)
+                {
+                    Trace.WriteLine("CPDFSDK Load Failed.\n");
                     return false;
+                }
+                Trace.WriteLine("CPDFSDK Load Success.\n");
             }
-            catch { }
+            catch { Trace.WriteLine("CPDFSDK Load Error.\n"); }
             SDKLisenceHelper sdkhelper = new SDKLisenceHelper();
             string devKey = "";
             string devSecret = "";
 #if DEBUG
             devKey = "ehrnKqkWc1XSEAWyPUt6+95GzCoLEyoKrCbsUuJkCqGmxmP5ozX4bS0R6crHItQVNTFvC5mBZ1M7QjJ6Ekdu4Daj7PM+EDLTBKbFJinK4Ri9E5E2X+a9vF5zSj0TkIscQPVnwj9ikxAFOWGIyybMwQQzwc8a4j1cGOqGXQRDMMY=";
             devSecret = "mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4gQurxTxGuBlGAhs0P1mD3X3bHT+AHfcLiymaqE4DY7kTFHoPs9I3tl5ErS+BHdzHRhrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1367/WkJ00tM7U7tttD6ccHhEu996bvBgqf8Sw8OekQKQq13VBewK5AckaDux4W7SGRhCUNWC4MItkr36JnXMD2tiFQYzMG8C66HYmRGSLh";
+
+#endif
             devKey = sdkhelper.DevKey;
             devSecret = sdkhelper.DevSecret;
-#endif
             string userKey = sdkhelper.UserKey;
             string userSecret = sdkhelper.UserSecret;
 
             try
             {
                 LicenseErrorCode verifyResult = CPDFSDKVerifier.LicenseVerify(devKey, devSecret);
+                Trace.WriteLine("CPDFSDK License Code."+ verifyResult+"\n");
                 if (verifyResult != LicenseErrorCode.LICENSE_ERR_SUCCESS)
                     return false;
+         
             }
-            catch { }
+            catch { Trace.WriteLine("CPDFSDK License Code Error \n"); }
 
             string ConverterDevKey = sdkhelper.ConverterDevKey;
             string ConverterDevSecret = sdkhelper.ConverterDevSecret;
@@ -627,6 +644,7 @@ namespace PDF_Master
                 if (licenseerror != LicenseError.ERR_SUCCESS)
                 {
                     //MessageBox.Show("ComPDFKit Conversion SDK Load Failed!");
+                    Console.WriteLine("CPDFConvert Load Failed.\n");
                     return false;
                 }
                 CPDFConverter.Init(resPath);

PDF Office/CustomControl/AlertsMessage.xaml.cs

@@ -45,7 +45,10 @@ namespace PDF_Master.CustomControl
         {
             InitializeComponent();
 
-            ownerWindow = App.Current.MainWindow;
+            if (App.Current.MainWindow != this)
+            {
+                ownerWindow = App.Current.MainWindow;
+            }
         }
 
         public void ShowAskAgainCheck()

PDF Office/Views/PageEdit/PageEditContent.xaml.cs

@@ -1020,8 +1020,11 @@ namespace PDF_Master.Views.PageEdit
         {
             //释放定时器 避免内存泄露
             timer?.Stop();
-            timer.Tick -= Timer_Tick;
-            timer = null;
+            if (timer != null)
+            {
+                timer.Tick -= Timer_Tick;
+                timer = null;
+            }
         }
     }
 }

PDFSettings/PDFSettings.csproj

@@ -68,13 +68,11 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ComPDFKit.Desk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\PDFReader_WPF\ComPDFKit.Desk.dll</HintPath>
+    <Reference Include="ComPDFKit.Desk">
+      <HintPath>..\PDF Office\ComPDFKit.Desk.dll</HintPath>
     </Reference>
-    <Reference Include="ComPDFKit.Viewer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\PDFReader_WPF\ComPDFKit.Viewer.dll</HintPath>
+    <Reference Include="ComPDFKit.Viewer">
+      <HintPath>..\..\..\..\Users\kdan\Documents\WXWork\1688857377300808\Cache\File\2022-12\MVVMUn\MVVMUn\ComPDFKit.Viewer.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />