换库 - 替换转换库；

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

@@ -17,4 +17,9 @@
  */
 @interface CPDFConvertCsvOptions : CPDFConvertOptions
 
+/**
+ * Whether to merge CSV when converting.
+ */
+@property (nonatomic,assign) BOOL isMergeCSV;
+
 @end

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

@@ -39,4 +39,29 @@ typedef NS_ENUM(NSInteger, CPDFConvertExcelWorksheetOptions) {
  */
 @property (nonatomic,assign) CPDFConvertExcelWorksheetOptions worksheetOptions;
 
+/**
+ * Whether to use OCR.
+ */
+@property (nonatomic,assign) BOOL isAllowOCR;
+
+/**
+ * Whether the OCR background image is contained,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) BOOL isContainOCRBgImage;
+
+/**
+ * Set the OCR language,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) COCRLanguage language;
+
+/**
+ * Whether to contain annotations when converting.
+ */
+@property (nonatomic,assign) BOOL isContainAnnotations;
+
+/**
+ * Whether to contain images when converting.
+ */
+@property (nonatomic,assign) BOOL isContainImages;
+
 @end

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

@@ -34,4 +34,24 @@ typedef NS_ENUM(NSInteger, CPDFConvertHtmlPageAndNavigationPaneOptions) {
  */
 @property (nonatomic,assign) CPDFConvertHtmlPageAndNavigationPaneOptions paneOptions;
 
+/**
+ * Whether to use OCR.
+ */
+@property (nonatomic,assign) BOOL isAllowOCR;
+
+/**
+ * Set the OCR language,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) COCRLanguage language;
+
+/**
+ * Whether to contain annotations when converting.
+ */
+@property (nonatomic,assign) BOOL isContainAnnotations;
+
+/**
+ * Whether to contain images when converting.
+ */
+@property (nonatomic,assign) BOOL isContainImages;
+
 @end

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

@@ -29,4 +29,14 @@ typedef NS_ENUM(NSInteger, CPDFConvertImgType) {
  */
 @property (nonatomic,assign) CPDFConvertImgType type;
 
+/**
+ * Whether to contain annotations when converting.
+ */
+@property (nonatomic,assign) BOOL isContainAnnotations;
+
+/**
+ * Sets the image Dpi.
+ */
+@property (nonatomic,assign) int  imageDpi;
+
 @end

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

@@ -12,6 +12,14 @@
 
 #import <Foundation/Foundation.h>
 
+typedef NS_ENUM(NSInteger, COCRLanguage) {
+    COCRLanguageChinese = 0,
+    COCRLanguageChineseTraditional = 1,
+    COCRLanguageEnglish      = 3,
+    COCRLanguageJapanese     = 4,
+    COCRLanguageKorean  = 5,
+};
+
 /**
  * This is the base class for all conversion parameters.
  */

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

@@ -17,4 +17,29 @@
  */
 @interface CPDFConvertPPTOptions : CPDFConvertOptions
 
+/**
+ * Whether to use OCR.
+ */
+@property (nonatomic,assign) BOOL isAllowOCR;
+
+/**
+ * Whether the OCR background image is contained,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) BOOL isContainOCRBgImage;
+
+/**
+ * Set the OCR language,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) COCRLanguage language;
+
+/**
+ * Whether to contain annotations when converting.
+ */
+@property (nonatomic,assign) BOOL isContainAnnotations;
+
+/**
+ * Whether to contain images when converting.
+ */
+@property (nonatomic,assign) BOOL isContainImages;
+
 @end

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

@@ -17,4 +17,24 @@
  */
 @interface CPDFConvertRtfOptions : CPDFConvertOptions
 
+/**
+ * Whether to use OCR.
+ */
+@property (nonatomic,assign) BOOL isAllowOCR;
+
+/**
+ * Set the OCR language,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) COCRLanguage language;
+
+/**
+ * Whether to contain annotations when converting.
+ */
+@property (nonatomic,assign) BOOL isContainAnnotations;
+
+/**
+ * Whether to contain images when converting.
+ */
+@property (nonatomic,assign) BOOL isContainImages;
+
 @end

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

@@ -17,4 +17,14 @@
  */
 @interface CPDFConvertTxtOptions : CPDFConvertOptions
 
+/**
+ * Whether to use OCR.
+ */
+@property (nonatomic,assign) BOOL isAllowOCR;
+
+/**
+ * Set the OCR language,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) COCRLanguage language;
+
 @end

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

@@ -17,4 +17,29 @@
  */
 @interface CPDFConvertWordOptions : CPDFConvertOptions
 
+/**
+ * Whether to use OCR.
+ */
+@property (nonatomic,assign) BOOL isAllowOCR;
+
+/**
+ * Whether the OCR background image is contained,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) BOOL isContainOCRBgImage;
+
+/**
+ * Set the OCR language,this takes effect only when IsAllowOCR is true.
+ */
+@property (nonatomic,assign) COCRLanguage language;
+
+/**
+ * Whether to contain annotations when converting.
+ */
+@property (nonatomic,assign) BOOL isContainAnnotations;
+
+/**
+ * Whether to contain images when converting.
+ */
+@property (nonatomic,assign) BOOL isContainImages;
+
 @end

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

@@ -14,8 +14,8 @@
 #import <ComPDFKit_Conversion/CPDFConvertOptions.h>
 
 extern NSErrorDomain const CPDFConverterErrorDomain;
-
 NS_ERROR_ENUM(CPDFConverterErrorDomain) {
+    CPDFConverterSuccess          = 0,  // Success
     CPDFConverterEncryptError     = 1,  // Password required or incorrect password.
     CPDFConverterPermissionError  = 2,  // The license doesn't allow the permission.
     CPDFConverterMallocError      = 3,  // Malloc failure.
@@ -27,6 +27,8 @@ NS_ERROR_ENUM(CPDFConverterErrorDomain) {
     CPDFConverterPDFPageError     = 9   // Page not found or content error.
 };
 
+
+
 @class CPDFConverter;
 
 /**
@@ -51,6 +53,7 @@ NS_ERROR_ENUM(CPDFConverterErrorDomain) {
  */
 - (void)converter:(CPDFConverter *)converter pageIndex:(NSUInteger)index pageCount:(NSUInteger)count;
 
+
 @end
 
 /**

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

@@ -21,32 +21,32 @@ extern CPDFConvertOptionsKey CPDFConvertOptionsKeyAllInOneSheet; // BOOL
 
 @optional
 
-// 将要开始转换
+// Going to start the transformation
 - (void)FPPDFConverter:(id)converter didStartConversion:(NSError *)error;
 
-// 完成转换
+// Complete the conversion
 - (void)FPPDFConverter:(id)converter didEndConversion:(NSError *)error;
 
-// 该页进度 - OCR
+// 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;
 

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

@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>21F79</string>
+	<string>22A400</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
 	<string>ComPDFKit_Conversion</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.compdfkit.conversion</string>
+	<string>com.comdocumentaikit.ComDocumentAIKit.ComPDFKit-Conversion-OCR-macOS-Protected-</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,17 +17,17 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>150</string>
+	<string>160</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>13F100</string>
+	<string>14A400</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
@@ -37,10 +37,12 @@
 	<key>DTSDKName</key>
 	<string>macosx12.3</string>
 	<key>DTXcode</key>
-	<string>1341</string>
+	<string>1401</string>
 	<key>DTXcodeBuild</key>
-	<string>13F100</string>
+	<string>14A400</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.10</string>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
 </dict>
 </plist>

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

@@ -106,7 +106,7 @@
 		</data>
 		<key>Resources/Info.plist</key>
 		<data>
-		noLukZTEN5qizQzFf/vc5HuphNo=
+		oziEkFw/I7ow9RN37OB/MQejpZ8=
 		</data>
 		<key>Resources/PDF2Excel.bundle/FPPDFInfo.plist</key>
 		<data>
@@ -1055,44 +1055,44 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			MRI4yc/YgJ1jl+J3TfTbl2yVDhg=
+			UpMDXHJ8X3ROt/Fm1cbmKHMPxiA=
 			</data>
 			<key>hash2</key>
 			<data>
-			zQ6rKS+hJMxYjprakuT3r1SuTFuLrrHatLGOsXRecCo=
+			BgWWVZUcFvbDxljRJ/Mtw4PKXSVTf/MoeQ0/ME6Gi0U=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertExcelOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			1bUb0dUVVgK0XiXm4IEESzCXR6A=
+			lqhooTPzHiDzLYFUla+xkR2NkuU=
 			</data>
 			<key>hash2</key>
 			<data>
-			Fa56vGRaelYcddBtlNZ0+EQS5wHIeQNZHM+8AsDH5qY=
+			KkvO6VYKUhl1RO48cuFMV2nlMpNcK9DEZ88bwIS/YUE=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertHtmlOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			ClRPxeapXhFX8xe1pCGYwcYTKNc=
+			397mq9RAYZ7/0l97AO4Sn1sXf1w=
 			</data>
 			<key>hash2</key>
 			<data>
-			MbM9RpKTh8U2ypvmc0Lt9koEudxJ58pTyXGMv7JF7zs=
+			io1iz7e/MiKcZVTZPv2MHpV7E/g8j3yTk7I3PcML8tk=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertImgOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			qvO2lMovGPwOqtA+4db3vsnDyLg=
+			wZNy+vi19vvbXKb7R9XPTJ9IDbE=
 			</data>
 			<key>hash2</key>
 			<data>
-			e09oLscZfEq0SU8o6kQBGrYETvO58LmqoDsBtTbBo4Y=
+			kGdwbNn/1hN6e+W6Lmjf7GSfNSpH2K6gJCPncwoJqDU=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertKit.h</key>
@@ -1110,66 +1110,66 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			x6+d2yY2qnBAsI3VsPAVoQABwEY=
+			NxfGm+oEC3cuKe/mmtQSmqOdQZQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			8mxls6mk8tiXKInm3ZFsRs6vA41GbBV0RnsPnXbfvoo=
+			m/AMPCko2f/ggrBVFiUhOG83qOyaut7MrlUKzF36xYg=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertPPTOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			27E89ujGP+6CgNir5i+JhqKdZ6o=
+			EfGjrRJugFFUuNG9396EDEPwd0s=
 			</data>
 			<key>hash2</key>
 			<data>
-			zW8EbIi7tTXyv2ly53YrtroBTpUz0b8FTTKYMXOOHY0=
+			7UXzw04YaA8bd/evPeRvavjDErnz4a0zvQTV3PmInMo=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertRtfOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			QnHj7AM6h/NOjrALZP2zhJnNLhI=
+			zHoBwUICj7thEHbRwQqihVk+McU=
 			</data>
 			<key>hash2</key>
 			<data>
-			M+eJkMkmuzIwrP1AKy8L8bwRM+m+sldq2jPouN0JIlw=
+			EYrtymRiQbKo1isz2fY8yl1R0r0l02s5QKcLnUug864=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertTxtOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			joAZ2lcvQK8IMLXxzCWCB/hmjXE=
+			TXxT9nS347tBOrODjlyN5+7/DWE=
 			</data>
 			<key>hash2</key>
 			<data>
-			vf067J/dvICZtLCVywMBmLB3maclWQ3wLyaJ55SCmBY=
+			DGb6/ClgtZsCovzlPcMrZVRKvM0dmsP2fhdqG6kKM8s=
 			</data>
 		</dict>
 		<key>Headers/CPDFConvertWordOptions.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			l67fFaOBFiivSDI8WrOzivYqhfo=
+			1weam0nIJuiO3kYPdWS9MgBygR0=
 			</data>
 			<key>hash2</key>
 			<data>
-			r0Jkgh4oWeVh09t8u/qSGQDljuo73NDu0zd93uYgtJ8=
+			DoV2krdjivxf7ByPcRqr7R2tA9B9Ipftor3uXawO8Ec=
 			</data>
 		</dict>
 		<key>Headers/CPDFConverter.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			Wy0eTTTApbMXwBrLVOJTqUxjPfI=
+			KR4556+rzgeXNergRlOtyIfuPcM=
 			</data>
 			<key>hash2</key>
 			<data>
-			aDaanO3YRMpP1c0awrQ7Z3HTusl4IvKxTXBqFCAcm0Q=
+			ufoFnbBVqvrF96cb/AJmgvcd7GIRHLiXMg+xBlKsuN8=
 			</data>
 		</dict>
 		<key>Headers/CPDFConverterCsv.h</key>
@@ -1198,11 +1198,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			kRr2b7mgAsfpEwpRTWDmBFvd2Y8=
+			H7Hg+wz4uL6ywGFakoRQYYJBegk=
 			</data>
 			<key>hash2</key>
 			<data>
-			ZOpRhbHN9GSZrwHB0oKVQRja2DAHrfVVOeIxmd8TKEs=
+			Qhj/onUDrhKHVUiWEjBy2Fx09FdYQWCIVaGUTw4K3qM=
 			</data>
 		</dict>
 		<key>Headers/CPDFConverterHtml.h</key>
@@ -1572,11 +1572,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			noLukZTEN5qizQzFf/vc5HuphNo=
+			oziEkFw/I7ow9RN37OB/MQejpZ8=
 			</data>
 			<key>hash2</key>
 			<data>
-			MLnISFhi8NEOCYMw5ntmi2sGyTdAN5HM6g1cf5J94Gg=
+			fIsM4HTClvVYVK4Tnr0CauXDclkNUjJqN67n037GHOU=
 			</data>
 		</dict>
 		<key>Resources/PDF2Excel.bundle/FPPDFInfo.plist</key>