综合 - 转档库更新；Demo 支持对外 版本 SDK & 对内版本 SDK

KdanAutoTest/KdanAuto.xcodeproj/project.pbxproj

@@ -45,6 +45,7 @@
 		246FE5A5299E0FCD00706586 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 246FE599299E0FCC00706586 /* mztools.c */; };
 		246FE5A6299E0FCD00706586 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 246FE59F299E0FCC00706586 /* README.md */; };
 		246FE5A7299E0FCD00706586 /* ZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 246FE5A0299E0FCC00706586 /* ZipArchive.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+		247865462A09F69D00020CEA /* CPDFConverterFPTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 247865452A09F69D00020CEA /* CPDFConverterFPTool.m */; };
 		24848DAF29ED0E2A002A7ED5 /* AdvanceSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24848DAD29ED0E2A002A7ED5 /* AdvanceSettingViewController.swift */; };
 		24848DB029ED0E2A002A7ED5 /* AdvanceSettingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 24848DAE29ED0E2A002A7ED5 /* AdvanceSettingViewController.xib */; };
 		24848DB329ED187E002A7ED5 /* ASPropertyCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24848DB229ED187E002A7ED5 /* ASPropertyCell.swift */; };
@@ -206,6 +207,9 @@
 		246FE59F299E0FCC00706586 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		246FE5A0299E0FCC00706586 /* ZipArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZipArchive.m; sourceTree = "<group>"; };
 		246FE5A8299E106B00706586 /* KdanAuto_Bringe_Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KdanAuto_Bringe_Header.h; sourceTree = "<group>"; };
+		247865432A09F64E00020CEA /* CPDFConverterFP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFConverterFP.h; sourceTree = "<group>"; };
+		247865442A09F69D00020CEA /* CPDFConverterFPTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFConverterFPTool.h; sourceTree = "<group>"; };
+		247865452A09F69D00020CEA /* CPDFConverterFPTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPDFConverterFPTool.m; sourceTree = "<group>"; };
 		24848DAD29ED0E2A002A7ED5 /* AdvanceSettingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvanceSettingViewController.swift; sourceTree = "<group>"; };
 		24848DAE29ED0E2A002A7ED5 /* AdvanceSettingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AdvanceSettingViewController.xib; sourceTree = "<group>"; };
 		24848DB229ED187E002A7ED5 /* ASPropertyCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ASPropertyCell.swift; sourceTree = "<group>"; };
@@ -378,6 +382,7 @@
 		240934B12992735200839CC8 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				247865422A09F64E00020CEA /* CPDFConverterFP+Tools */,
 				2455C0D329E0358800800E8E /* PerformSelectorTool */,
 				246FE592299E0FCC00706586 /* ZipArchive */,
 				240934B52992736600839CC8 /* ImageProcess */,
@@ -458,6 +463,16 @@
 			path = minizip;
 			sourceTree = "<group>";
 		};
+		247865422A09F64E00020CEA /* CPDFConverterFP+Tools */ = {
+			isa = PBXGroup;
+			children = (
+				247865432A09F64E00020CEA /* CPDFConverterFP.h */,
+				247865442A09F69D00020CEA /* CPDFConverterFPTool.h */,
+				247865452A09F69D00020CEA /* CPDFConverterFPTool.m */,
+			);
+			path = "CPDFConverterFP+Tools";
+			sourceTree = "<group>";
+		};
 		24848DAC29ED0E2A002A7ED5 /* AdvanceSettingViewController */ = {
 			isa = PBXGroup;
 			children = (
@@ -1012,6 +1027,7 @@
 				24DCE8B32950543C004EBA35 /* AutoTestCellInfo.swift in Sources */,
 				240934B72992737200839CC8 /* ImageProcess.swift in Sources */,
 				24CB61CA2994FA0800C5085F /* TestDegreeManager.swift in Sources */,
+				247865462A09F69D00020CEA /* CPDFConverterFPTool.m in Sources */,
 				246FE5A3299E0FCD00706586 /* zip.c in Sources */,
 				24DCE8B1295047D8004EBA35 /* TestFileCellView.swift in Sources */,
 				24A6FF4B2930939D00B34F2E /* TextColorAutoTest.swift in Sources */,
@@ -1227,7 +1243,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = KdanAuto/KdanAutoDebug.entitlements;
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 20230418;

KdanAutoTest/KdanAuto.xcodeproj/xcuserdata/zhudongyong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -114,6 +114,38 @@
             endingLineNumber = "219"
             landmarkName = "+paramsLogWithObject:paramRules:"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "2B1F9194-BC87-41AA-988E-7670C7152A2D - ecbc738615f4c30c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "+[PerformSelectTool paramsLogWithObject:paramRules:]"
+                  moduleName = "KdanAuto"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/MacintoshHD/WorkSpace_zdy/Work/Git/AutoTest/KdanAutoTest/KdanAuto/Class/Tools/PerformSelectorTool/PerformSelectTool.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "219"
+                  endingLineNumber = "219"
+                  offsetFromSymbolStart = "1925">
+               </Location>
+               <Location
+                  uuid = "2B1F9194-BC87-41AA-988E-7670C7152A2D - ecbc738615f4c30c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "+[PerformSelectTool paramsLogWithObject:paramRules:]"
+                  moduleName = "KdanAuto"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/MacintoshHD/WorkSpace_zdy/Work/Git/AutoTest/KdanAutoTest/KdanAuto/Class/Tools/PerformSelectorTool/PerformSelectTool.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "219"
+                  endingLineNumber = "219"
+                  offsetFromSymbolStart = "2594">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -130,6 +162,38 @@
             endingLineNumber = "234"
             landmarkName = "+paramsLogWithObject:paramRules:"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "7D7E6762-B93D-416B-ACAF-A15583BE2AA5 - ecbc738615f4c13f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "+[PerformSelectTool paramsLogWithObject:paramRules:]"
+                  moduleName = "KdanAuto"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/MacintoshHD/WorkSpace_zdy/Work/Git/AutoTest/KdanAutoTest/KdanAuto/Class/Tools/PerformSelectorTool/PerformSelectTool.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "234"
+                  endingLineNumber = "234"
+                  offsetFromSymbolStart = "2734">
+               </Location>
+               <Location
+                  uuid = "7D7E6762-B93D-416B-ACAF-A15583BE2AA5 - ecbc738615f4c13f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "+[PerformSelectTool paramsLogWithObject:paramRules:]"
+                  moduleName = "KdanAuto"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/MacintoshHD/WorkSpace_zdy/Work/Git/AutoTest/KdanAutoTest/KdanAuto/Class/Tools/PerformSelectorTool/PerformSelectTool.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "234"
+                  endingLineNumber = "234"
+                  offsetFromSymbolStart = "3678">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -146,6 +210,38 @@
             endingLineNumber = "249"
             landmarkName = "+paramsLogWithObject:paramRules:"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "96340980-6F84-4797-81AD-3512B0081F74 - ecbc738615f4ff2e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "+[PerformSelectTool paramsLogWithObject:paramRules:]"
+                  moduleName = "KdanAuto"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/MacintoshHD/WorkSpace_zdy/Work/Git/AutoTest/KdanAutoTest/KdanAuto/Class/Tools/PerformSelectorTool/PerformSelectTool.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "249"
+                  endingLineNumber = "249"
+                  offsetFromSymbolStart = "3406">
+               </Location>
+               <Location
+                  uuid = "96340980-6F84-4797-81AD-3512B0081F74 - ecbc738615f4ff2e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "+[PerformSelectTool paramsLogWithObject:paramRules:]"
+                  moduleName = "KdanAuto"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/MacintoshHD/WorkSpace_zdy/Work/Git/AutoTest/KdanAutoTest/KdanAuto/Class/Tools/PerformSelectorTool/PerformSelectTool.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "249"
+                  endingLineNumber = "249"
+                  offsetFromSymbolStart = "4934">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -162,6 +258,38 @@
             endingLineNumber = "30"
             landmarkName = "+performSelector:params:"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "95F515B0-15FD-4593-944B-0F7B77927C8A - e0ce68ee19d30dee"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "+[PerformSelectTool performSelector:params:]"
+                  moduleName = "KdanAuto"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/MacintoshHD/WorkSpace_zdy/Work/Git/AutoTest/KdanAutoTest/KdanAuto/Class/Tools/PerformSelectorTool/PerformSelectTool.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "30"
+                  endingLineNumber = "30"
+                  offsetFromSymbolStart = "988">
+               </Location>
+               <Location
+                  uuid = "95F515B0-15FD-4593-944B-0F7B77927C8A - e0ce68ee19d30dee"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "+[PerformSelectTool performSelector:params:]"
+                  moduleName = "KdanAuto"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/MacintoshHD/WorkSpace_zdy/Work/Git/AutoTest/KdanAutoTest/KdanAuto/Class/Tools/PerformSelectorTool/PerformSelectTool.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "30"
+                  endingLineNumber = "30"
+                  offsetFromSymbolStart = "615">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy

KdanAutoTest/KdanAuto/Class/Tools/CPDFConverterFP+Tools/CPDFConverterFP.h

@@ -0,0 +1,70 @@
+//
+//  CPDFConverterFP.h
+//  ComPDFKit_Conversion
+//
+//  Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.
+//
+//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
+//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+//  This notice may not be removed from this file.
+//
+
+#import <Foundation/Foundation.h>
+
+typedef NSString* const CPDFConvertOptionsKey NS_STRING_ENUM;
+
+extern CPDFConvertOptionsKey CPDFConvertOptionsKeyImageDPI; // NSInteger
+extern CPDFConvertOptionsKey CPDFConvertOptionsKeyAllInOneSheet; // BOOL
+
+@protocol CPDFConverterFPDelegate <NSObject>
+
+@optional
+
+// Going to start the transformation
+- (void)FPPDFConverter:(id)converter didStartConversion:(NSError *)error;
+
+// Complete the conversion
+- (void)FPPDFConverter:(id)converter didEndConversion:(NSError *)error;
+
+// Page progress
+- (void)FPPDFConverter:(id)converter
+             pageIndex:(NSUInteger)pageIndexA
+              progress:(NSUInteger)progress;
+
+// Finish parsing a page
+- (void)FPPDFConverter:(id)converter
+   convertPDFPageIndex:(NSUInteger)pdfPageIndexA
+    writeWordPageIndex:(NSUInteger)wordPageIndexA
+  finshedWordPageCount:(NSUInteger)wordPageCountA;
+
+// A page cannot be converted
+- (void)FPPDFConverter:(id)converter
+   convertPDFPageIndex:(NSUInteger)pdfPageIndexA
+        faildWithError:(NSError *)error;
+
+// The document will be saved to disk
+- (void)FPPDFConverter:(id)converter willSaveDoc:(NSError *)error;
+
+// Catch an anomaly
+- (void)FPPDFConverter:(id)converter
+        catchException:(NSException *)exception;
+
+@end
+
+@interface CPDFConverterFP : NSObject
+
+- (instancetype)init;
+
+- (void)setDelegate:(id<CPDFConverterFPDelegate>)delegate;
+
+- (void)convertPDFAtPath:(NSString *)pdfPathA
+             pdfPassword:(NSString *)pdfPasswordA
+           pdfPageIndexs:(NSArray *)pdfPageIndexsA
+             destDocType:(NSString *)destDocTypeA
+             destDocPath:(NSString *)destDocPathA
+             moreOptions:(NSDictionary<CPDFConvertOptionsKey, id> *)moreOptionsA;
+
+- (void)stopConvertsionIfNeed;
+
+@end

KdanAutoTest/KdanAuto/Class/Tools/CPDFConverterFP+Tools/CPDFConverterFPTool.h

@@ -0,0 +1,73 @@
+//
+//  CPDFConverterFPTool.h
+//  KdanAuto
+//
+//  Created by 朱东勇 on 2023/5/9.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol CPDFConverterFPToolDelegate <NSObject>
+
+@optional
+
+// Going to start the transformation
+- (void)FPPDFConverter:(id)converter didStartConversion:(NSError *)error;
+
+// Complete the conversion
+- (void)FPPDFConverter:(id)converter didEndConversion:(NSError *)error;
+
+// Page progress
+- (void)FPPDFConverter:(id)converter
+             pageIndex:(NSUInteger)pageIndexA
+              progress:(NSUInteger)progress;
+
+// Finish parsing a page
+- (void)FPPDFConverter:(id)converter
+   convertPDFPageIndex:(NSUInteger)pdfPageIndexA
+    writeWordPageIndex:(NSUInteger)wordPageIndexA
+  finshedWordPageCount:(NSUInteger)wordPageCountA;
+
+// A page cannot be converted
+- (void)FPPDFConverter:(id)converter
+   convertPDFPageIndex:(NSUInteger)pdfPageIndexA
+        faildWithError:(NSError *)error;
+
+// The document will be saved to disk
+- (void)FPPDFConverter:(id)converter willSaveDoc:(NSError *)error;
+
+// Catch an anomaly
+- (void)FPPDFConverter:(id)converter
+        catchException:(NSException *)exception;
+
+@end
+
+@interface CPDFConverterFPTool : NSObject
+
++ (id _Nullable)createConverterFP;
+
++ (void)setDelegate:(id<CPDFConverterFPToolDelegate> _Nullable)delegate forConverterFP:(id _Nullable)converterFP;
+- (void)setDelegate:(id<CPDFConverterFPToolDelegate> _Nullable)delegate;
+
++ (void)stopConvertsionIfNeed:(id _Nullable)converterFP;
+- (void)stopConvertsionIfNeed;
+
++ (void)convertPDFForConverterFP:(id _Nullable)converterFP
+                            path:(NSString *)pdfPathA
+                     pdfPassword:(NSString * _Nullable)pdfPasswordA
+                   pdfPageIndexs:(NSArray *)pdfPageIndexsA
+                     destDocType:(NSString *)destDocTypeA
+                     destDocPath:(NSString *)destDocPathA
+                     moreOptions:(NSDictionary*)moreOptionsA;
+- (void)convertPDFAtPath:(NSString *)pdfPathA
+             pdfPassword:(NSString *)pdfPasswordA
+           pdfPageIndexs:(NSArray *)pdfPageIndexsA
+             destDocType:(NSString *)destDocTypeA
+             destDocPath:(NSString *)destDocPathA
+             moreOptions:(NSDictionary *)moreOptionsA;
+
+@end
+
+NS_ASSUME_NONNULL_END

KdanAutoTest/KdanAuto/Class/Tools/CPDFConverterFP+Tools/CPDFConverterFPTool.m

@@ -0,0 +1,84 @@
+//
+//  CPDFConverterFPTool.m
+//  KdanAuto
+//
+//  Created by 朱东勇 on 2023/5/9.
+//
+
+#import "CPDFConverterFPTool.h"
+#import "CPDFConverterFP.h"
+
+
+@implementation CPDFConverterFPTool
+
++ (id)createConverterFP {
+    Class cls = NSClassFromString(@"CPDFConverterFP");
+    if (cls == NULL)
+        return nil;
+    
+    return [[cls alloc] init];
+}
+
++ (void)setDelegate:(id<CPDFConverterFPToolDelegate> _Nullable)delegate forConverterFP:(id _Nullable)converterFP {
+    Class cls = NSClassFromString(@"CPDFConverterFP");
+    if (cls == NULL)
+        return;
+    
+    if (converterFP != nil &&
+        [converterFP isKindOfClass:cls] ) {
+        [((CPDFConverterFPTool*)converterFP) setDelegate:delegate];
+    }
+}
+
++ (void)stopConvertsionIfNeed:(NSObject* _Nullable)converterFP {
+    Class cls = NSClassFromString(@"CPDFConverterFP");
+    if (cls == NULL)
+        return;
+    
+    if (converterFP != nil &&
+        [converterFP isKindOfClass:cls]) {
+        [((CPDFConverterFPTool*)converterFP) stopConvertsionIfNeed];
+    }
+}
+
++ (void)convertPDFForConverterFP:(id _Nullable)converterFP
+                            path:(NSString *)pdfPathA
+                     pdfPassword:(NSString * _Nullable)pdfPasswordA
+                   pdfPageIndexs:(NSArray *)pdfPageIndexsA
+                     destDocType:(NSString *)destDocTypeA
+                     destDocPath:(NSString *)destDocPathA
+                     moreOptions:(NSDictionary*)moreOptionsA {
+    Class cls = NSClassFromString(@"CPDFConverterFP");
+    if (cls == NULL)
+        return;
+    
+    if (converterFP != nil &&
+        [converterFP isKindOfClass:cls]) {
+        [((CPDFConverterFPTool*)converterFP) convertPDFAtPath:pdfPathA
+                                                  pdfPassword:pdfPasswordA
+                                                pdfPageIndexs:pdfPageIndexsA
+                                                  destDocType:destDocTypeA
+                                                  destDocPath:destDocPathA
+                                                  moreOptions:moreOptionsA];
+    }
+}
+
+
+- (void)setDelegate:(id<CPDFConverterFPToolDelegate> _Nullable)delegate {
+    
+}
+
+- (void)stopConvertsionIfNeed {
+    
+}
+
+- (void)convertPDFAtPath:(NSString *)pdfPathA
+             pdfPassword:(NSString *)pdfPasswordA
+           pdfPageIndexs:(NSArray *)pdfPageIndexsA
+             destDocType:(NSString *)destDocTypeA
+             destDocPath:(NSString *)destDocPathA
+             moreOptions:(NSDictionary *)moreOptionsA {
+    
+}
+
+@end

KdanAutoTest/KdanAuto/Class/Tools/FileConveter/FileConverter.swift

@@ -18,10 +18,10 @@ let KMPDFConvertOptionsKeyImageWithAnnotation = "KMPDFConvertOptionsKeyImageWith
 
 let kDefaultPassword = "666666"
 
-class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPDelegate {
-    
+class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPToolDelegate
+{
     var pdfConverter:CPDFConverter?
-    var fpConverter:CPDFConverterFP?
+    var fpConverter:AnyObject?
     var options:CPDFConvertOptions?
     
     var originSrcPath:String = ""
@@ -100,7 +100,6 @@ class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPDelegate {
         }
         
 //        NSLog("%@ - %@\n\(inSrcPath)", useOldLib ? "老库" : "新库", params ?? "")
-        
         self.convertQueue.async {
             if (LogViewController.shared().isVisable()) {
                 LogViewController.shared().appendLog("\n转档：\(NSString(string: inSrcPath).lastPathComponent)\n")
@@ -110,6 +109,7 @@ class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPDelegate {
             let document = PDFDocument(url: url)
             if document == nil {
                 self.didSuccess = -2;
+                self.complention(self.didSuccess)
                 self.accessSemaphore?.signal()
                 return
             }
@@ -144,6 +144,7 @@ class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPDelegate {
                         self.didSuccess = -1;
                         
                         self.complention(self.didSuccess)
+                        self.accessSemaphore?.signal()
                     }
                 }
             }else if !useOldLib && NSArray(array: ["ppt", "PPT", "PPTX", "pptx"]).contains(self.pathExtension) {
@@ -241,37 +242,46 @@ class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPDelegate {
                 }
             }else {
                 autoreleasepool {
-                    if self.fpConverter == nil {
-                        self.fpConverter = CPDFConverterFP.init()
-                        self.fpConverter?.setDelegate(self)
-                    }else {
-                        self.fpConverter?.stopConvertsionIfNeed()
-                    }
-                    
-                    var needMerge = NSArray(array: ["csv", "CSV"]).contains(self.pathExtension)
-                    let dpi = tParams.value(forKey: "KMPDFConvertOptionsKeyImageDPI")
-                    if (needMerge && tParams.value(forKey: "CPDFConvertOptionsKeyAllInOneSheet") != nil) {
-                        needMerge = (tParams.value(forKey: "CPDFConvertOptionsKeyAllInOneSheet") as! NSNumber).boolValue
-                    }
+                    let className = "CPDFConverterFP"
+                    let cl = NSClassFromString(className)
                     
-                    if (LogViewController.shared().isVisable()) {
-                        LogViewController.shared().appendLog("转档参数\n")
-                        LogViewController.shared().appendLog("- 库版本: 老库\n")
-                        let options = [
-                            "KMPDFConvertOptionsKeyImageDPI" : (dpi as? String) ?? "72",
-                            "CPDFConvertOptionsKeyAllInOneSheet":NSNumber(booleanLiteral: needMerge)
-                        ]
-                        LogViewController.shared().appendLog("- 其它参数：\(options)\n")
+                    if (nil == cl) {
+                        self.complention(-1)
+                        self.accessSemaphore?.signal()
+                    }else {
+                        if self.fpConverter == nil {
+                            self.fpConverter = CPDFConverterFPTool.createConverterFP() as AnyObject
+                            CPDFConverterFPTool.setDelegate(self, forConverterFP: self.fpConverter)
+                        }else {
+                            CPDFConverterFPTool.stopConvertsionIfNeed(self.fpConverter)
+                        }
+
+                        var needMerge = NSArray(array: ["csv", "CSV"]).contains(self.pathExtension)
+                        let dpi = tParams.value(forKey: "KMPDFConvertOptionsKeyImageDPI")
+                        if (needMerge && tParams.value(forKey: "CPDFConvertOptionsKeyAllInOneSheet") != nil) {
+                            needMerge = (tParams.value(forKey: "CPDFConvertOptionsKeyAllInOneSheet") as! NSNumber).boolValue
+                        }
+
+                        if (LogViewController.shared().isVisable()) {
+                            LogViewController.shared().appendLog("转档参数\n")
+                            LogViewController.shared().appendLog("- 库版本: 老库\n")
+                            let options = [
+                                "KMPDFConvertOptionsKeyImageDPI" : (dpi as? String) ?? "72",
+                                "CPDFConvertOptionsKeyAllInOneSheet":NSNumber(booleanLiteral: needMerge)
+                            ]
+                            LogViewController.shared().appendLog("- 其它参数：\(options)\n")
+                        }
+                        CPDFConverterFPTool.convertPDF(forConverterFP: self.fpConverter,
+                                                       path: self.srcPath,
+                                                       pdfPassword: password as? String,
+                                                       pdfPageIndexs: self.pages,
+                                                       destDocType: self.pathExtension,
+                                                       destDocPath: self.desPath,
+                                                       moreOptions: [
+                                                        "KMPDFConvertOptionsKeyImageDPI" : (dpi as? String) ?? "72",
+                                                        "CPDFConvertOptionsKeyAllInOneSheet":NSNumber(booleanLiteral: needMerge)
+                                                       ])
                     }
-                    self.fpConverter?.convertPDF(atPath: self.srcPath,
-                                                 pdfPassword: password as? String,
-                                                 pdfPageIndexs: self.pages,
-                                                 destDocType: self.pathExtension,
-                                                 destDocPath: self.desPath,
-                                                 moreOptions: [
-                                                    "KMPDFConvertOptionsKeyImageDPI" : (dpi as? String) ?? "72",
-                                                    "CPDFConvertOptionsKeyAllInOneSheet":NSNumber(booleanLiteral: needMerge)
-                                                 ])
                 }
             }
         }
@@ -339,7 +349,7 @@ class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPDelegate {
     func fppdfConverter(_ converter: Any!, didEndConversion error: Error!) {
         autoreleasepool {
             didSuccess = nil == error ? 1 : 0
-            self.fpConverter?.stopConvertsionIfNeed()
+            CPDFConverterFPTool.stopConvertsionIfNeed(self.fpConverter)
             self.fpConverter = nil;
             
             Thread.sleep(forTimeInterval: 0.3)
@@ -352,9 +362,9 @@ class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPDelegate {
     /// Cancel
     func cancelTask() {
         if (self.fpConverter != nil) {
-            self.fpConverter!.stopConvertsionIfNeed()
+            CPDFConverterFPTool.stopConvertsionIfNeed(self.fpConverter)
             self.fpConverter = nil;
-            
+
             Thread.sleep(forTimeInterval: 0.3)
         }
         if (self.pdfConverter != nil) {

KdanAutoTest/KdanAuto/KdanAuto_Bringe_Header.h

@@ -10,6 +10,7 @@
 
 #import "ZipArchive.h"
 #import <ComPDFKit_Conversion/CPDFConvertKit.h>
+#import "CPDFConverterFPTool.h"
 #import "PerformSelectTool.h"
 
 #endif /* Header_h */

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConvertExcelOptions.h

@@ -38,6 +38,7 @@ typedef NS_ENUM(NSInteger, CPDFConvertExcelWorksheetOptions) {
  * Options to create Worksheet.
  */
 @property (nonatomic,assign) CPDFConvertExcelWorksheetOptions worksheetOptions;
+
 /**
  * Whether to use OCR.
  */
@@ -52,6 +53,7 @@ typedef NS_ENUM(NSInteger, CPDFConvertExcelWorksheetOptions) {
  * Set the OCR language,this takes effect only when IsAllowOCR is true.
  */
 @property (nonatomic,assign) COCRLanguage language;
+
 /**
  * Whether to contain annotations when converting.
  */

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConvertHtmlOptions.h

@@ -33,6 +33,7 @@ typedef NS_ENUM(NSInteger, CPDFConvertHtmlPageAndNavigationPaneOptions) {
  * @see CPDFConvertHtmlPageAndNavigationPaneOptions
  */
 @property (nonatomic,assign) CPDFConvertHtmlPageAndNavigationPaneOptions paneOptions;
+
 /**
  * Whether to use OCR.
  */

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConvertKit.h

@@ -39,9 +39,4 @@
  */
 @property(atomic,readonly) NSUInteger buildNumber;
 
-/**
- *  Check if this is the OCR version.
- */
-@property(atomic,readonly) BOOL isOCRVersion;
-
 @end

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConvertOptions.h

@@ -13,63 +13,11 @@
 #import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSInteger, COCRLanguage) {
-    COCRLanguageChinese,
-    COCRLanguageChineseTraditional,
-    COCRLanguageEnglish,
-    COCRLanguageJapanese,
-    COCRLanguageKorean,
-    //Latin
-    COCRLanguageSerbian,
-    COCRLanguageOccitan,
-    COCRLanguageDanish,
-    COCRLanguageGerman,
-    COCRLanguageFrench,
-    COCRLanguageItalian,
-    COCRLanguageSpanish,
-    COCRLanguagePortuguese,
-    COCRLanguageMaori,
-    COCRLanguageMalay,
-    COCRLanguageMaltese,
-    COCRLanguageDutch,
-    COCRLanguageNorwegian,
-    COCRLanguagePolish,
-    COCRLanguageRomanian,
-    COCRLanguageSlovak,
-    COCRLanguageSlovenian,
-    COCRLanguageAlbanian,
-    COCRLanguageSwedish,
-    COCRLanguageSwahili,
-    COCRLanguageTagalog,
-    COCRLanguageTurish,
-    COCRLanguageUzbek,
-    COCRLanguageVietnamese,
-    COCRLanguageAfrikaans,
-    COCRLanguageAzerbaijani,
-    COCRLanguageBosnian,
-    COCRLanguageCzech,
-    COCRLanguageWelsh,
-    COCRLanguageEstonian,
-    COCRLanguageIrish,
-    COCRLanguageCroatian,
-    COCRLanguageHungarian,
-    COCRLanguageIndonesian,
-    COCRLanguageIcelandic,
-    COCRLanguageKurdish,
-    COCRLanguageLithuanian,
-    COCRLanguageLatvian,
-    //Devanagari
-    COCRLanguageMarathi,
-    COCRLanguageNepali,
-    COCRLanguageHindi,
-    COCRLanguageBihari,
-    COCRLanguageMaithili,
-    COCRLanguageAngika,
-    COCRLanguageBhojpuri,
-    COCRLanguageMagahi,
-    COCRLanguageNagpur,
-    COCRLanguageNewari,
-    COCRLanguageGoanKonkani,
-    COCRLanguageSaudiArabia
+    COCRLanguageChinese = 0,
+    COCRLanguageChineseTraditional = 1,
+    COCRLanguageEnglish      = 3,
+    COCRLanguageJapanese     = 4,
+    COCRLanguageKorean  = 5,
 };
 
 /**

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConvertPPTOptions.h

@@ -16,6 +16,7 @@
  * PDF to PPT conversion parameter object(derived class of CPDFConvertOptions).
  */
 @interface CPDFConvertPPTOptions : CPDFConvertOptions
+
 /**
  * Whether to use OCR.
  */

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConvertRtfOptions.h

@@ -16,6 +16,7 @@
  * PDF to RTF conversion parameter object (derived class of CPDFConvertOptions).
  */
 @interface CPDFConvertRtfOptions : CPDFConvertOptions
+
 /**
  * Whether to use OCR.
  */
@@ -25,6 +26,7 @@
  * Set the OCR language,this takes effect only when IsAllowOCR is true.
  */
 @property (nonatomic,assign) COCRLanguage language;
+
 /**
  * Whether to contain annotations when converting.
  */

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConvertTxtOptions.h

@@ -16,6 +16,7 @@
  * PDF to TXT conversion parameter object (derived class of CPDFConvertOptions).
  */
 @interface CPDFConvertTxtOptions : CPDFConvertOptions
+
 /**
  * Whether to use OCR.
  */

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConvertWordOptions.h

@@ -12,15 +12,11 @@
 
 #import <ComPDFKit_Conversion/CPDFConvertOptions.h>
 
-typedef NS_ENUM(NSInteger, LayoutOptions) {
-    RetainFlowingText,
-    RetainPageLayout
-};
-
 /**
  * PDF to Word conversion parameter object(derived class of CPDFConvertOptions).
  */
 @interface CPDFConvertWordOptions : CPDFConvertOptions
+
 /**
  * Whether to use OCR.
  */
@@ -46,6 +42,4 @@ typedef NS_ENUM(NSInteger, LayoutOptions) {
  */
 @property (nonatomic,assign) BOOL isContainImages;
 
-@property (nonatomic,assign) LayoutOptions layoutOptions;
-
 @end

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/CPDFConverterFactory.h

@@ -1,37 +0,0 @@
-//
-//  CPDFConverterFactory.h
-//  ComPDFKit_Conversion
-//
-//  Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import <Foundation/Foundation.h>
-#import <ComPDFKit_Conversion/CPDFConverter.h>
-
-@class CPDFConverter;
-
-typedef NS_ENUM(NSInteger, CPDFConvertType) {
-    CPDFConvertTypeWord,
-    CPDFConvertTypePPT,
-    CPDFConvertTypeExcel,
-    CPDFConvertTypeTxt,
-    CPDFConvertTypeCsv,
-    CPDFConvertTypeImg,
-    CPDFConvertTypeRtf,
-    CPDFConvertTypeHtml,
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CPDFConverterFactory : NSObject
-
-+ (CPDFConverter *)createConvertoerWithURL:(NSURL *)url password:(NSString *)password type:(CPDFConvertType)type;
-
-@end
-
-NS_ASSUME_NONNULL_END

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Headers/ComPDFKit_Conversion.h

@@ -29,5 +29,5 @@
 #import <ComPDFKit_Conversion/CPDFConvertImgOptions.h>
 #import <ComPDFKit_Conversion/CPDFConvertRtfOptions.h>
 #import <ComPDFKit_Conversion/CPDFConvertHtmlOptions.h>
-#import <ComPDFKit_Conversion/CPDFConverterFactory.h>
+
 #import <ComPDFKit_Conversion/CPDFConverterFP.h>

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/Resources/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>ComPDFKit_Conversion</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.comdocumentaikit.ComDocumentAIKit.ComPDFKit-Conversion-OCR-macOS-Protected-</string>
+	<string>com.compdfkit.conversion</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

KdanAutoTest/KdanAuto/Third Part Library/ComPDFKit_Conversion.framework/Versions/A/_CodeSignature/CodeResources

@@ -106,7 +106,7 @@
 		</data>
 		<key>Resources/Info.plist</key>
 		<data>
-		/aaSW6phFa9Llw7ne07ZMH0P8p4=
+		Gz6kApDUOVv0AcVMqEXYEgs2Nbw=
 		</data>
 		<key>Resources/PDF2Excel.bundle/FPPDFInfo.plist</key>
 		<data>
@@ -1066,22 +1066,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ijUBZqBPHqcR07QrCDUbOZ0CiA4=
+			lqhooTPzHiDzLYFUla+xkR2NkuU=
 			</data>
 			<key>hash2</key>
 			<data>
-			gb6Oqlr3CsFou1VsJi6lagz8iyXkYvxCBrX+2l8PK5k=
+			KkvO6VYKUhl1RO48cuFMV2nlMpNcK9DEZ88bwIS/YUE=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertHtmlOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			gXuNfm2UeA8B3xrCQ46bYFWtFJc=
+			397mq9RAYZ7/0l97AO4Sn1sXf1w=
 			</data>
 			<key>hash2</key>
 			<data>
-			jIhSV6tIgJgw/X0aQpEQx0+AwC4ziiztqyPfTclVOcQ=
+			io1iz7e/MiKcZVTZPv2MHpV7E/g8j3yTk7I3PcML8tk=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertImgOptions.h</key>
@@ -1099,66 +1099,66 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			5bp+L1awkkdMiCqIGROUWCfxwps=
+			BHsTd15lvd+RRJC155UMed2VW4E=
 			</data>
 			<key>hash2</key>
 			<data>
-			rgjYerJzyNRx2hKaVUjN9iXzJorSX8I/0TPoYXHa8VQ=
+			gskVQCGvAz5dfnmal9W8zkRGt4YoNZewxYB8ZaoHm/Q=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			d6sJpLIynYQ1uDyJq0fLuVsEeMY=
+			NxfGm+oEC3cuKe/mmtQSmqOdQZQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			jyJGG+bpiSNCVdeX0YwKUWJZlQBMCPCPiTzK1xUGfK8=
+			m/AMPCko2f/ggrBVFiUhOG83qOyaut7MrlUKzF36xYg=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertPPTOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			74bR8vOlWIeGQ6x6h7fC/VojLro=
+			EfGjrRJugFFUuNG9396EDEPwd0s=
 			</data>
 			<key>hash2</key>
 			<data>
-			2L3PAwnJ07zTkshLFTbkNDN7TQoxJCsDY3piXOq2mjs=
+			7UXzw04YaA8bd/evPeRvavjDErnz4a0zvQTV3PmInMo=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertRtfOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			1ggAWz4vg9CDvLDoQHoYM5mNnog=
+			zHoBwUICj7thEHbRwQqihVk+McU=
 			</data>
 			<key>hash2</key>
 			<data>
-			q/WOEN40EpeckrY/w40yCyIaqx4AmaepOOg8WHULn7M=
+			EYrtymRiQbKo1isz2fY8yl1R0r0l02s5QKcLnUug864=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertTxtOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			3ZqJbTw0oyF2dXCbCkqfp10RbLc=
+			TXxT9nS347tBOrODjlyN5+7/DWE=
 			</data>
 			<key>hash2</key>
 			<data>
-			VhseyWqjkmukDcripmIVVbUwrGwRV63DKs4eIvav48g=
+			DGb6/ClgtZsCovzlPcMrZVRKvM0dmsP2fhdqG6kKM8s=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertWordOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			V9bAlU3iEfliGLjTFU2ssEDc1hM=
+			1weam0nIJuiO3kYPdWS9MgBygR0=
 			</data>
 			<key>hash2</key>
 			<data>
-			3O92+dfYrQKAxW1G+xAq83mOoZNgJtOaU6o71OHK0+4=
+			DoV2krdjivxf7ByPcRqr7R2tA9B9Ipftor3uXawO8Ec=
 			</data>
 		</dict>
 		<key>Headers/CPDFConverter.h</key>
@@ -1205,17 +1205,6 @@
 			Qhj/onUDrhKHVUiWEjBy2Fx09FdYQWCIVaGUTw4K3qM=
 			</data>
 		</dict>
-		<key>Headers/CPDFConverterFactory.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Aj7ObwI+crH+hPQthkJ1TrVJmDs=
-			</data>
-			<key>hash2</key>
-			<data>
-			BErV0n/xDGhsAXmf48JhVGJw1Xxmpy0p0KNI51DHz4k=
-			</data>
-		</dict>
 		<key>Headers/CPDFConverterHtml.h</key>
 		<dict>
 			<key>hash</key>
@@ -1286,11 +1275,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			cdPT1GzNqH4YB+912fX0nCQ1HeM=
+			p9bHTxuFEzl/p71TKdhzW8bfBlY=
 			</data>
 			<key>hash2</key>
 			<data>
-			nwndbU4BL9ZAUT84sEsZeS3AzIHESTRQkiqVCLGi7k4=
+			6ZIyCt2Zlb13lnIR4o8lbUfREfgUv+WwBRt+VkxYT6o=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>
@@ -1583,11 +1572,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			/aaSW6phFa9Llw7ne07ZMH0P8p4=
+			Gz6kApDUOVv0AcVMqEXYEgs2Nbw=
 			</data>
 			<key>hash2</key>
 			<data>
-			Xbw481t38g0R52ym8Ae5Yyp1XMqnSn8O6b2PF7kAyXQ=
+			NXJmlIGHSqU6InivcV94kY2Dlrgi/cMS0cQNsMjmxx0=
 			</data>
 		</dict>
 		<key>Resources/PDF2Excel.bundle/FPPDFInfo.plist</key>