ComPDFKit - 支持模拟器架构Arm64

Annotations/Annotations.xcodeproj/project.pbxproj

@@ -372,7 +372,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Annotations/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Annotations_ComPDFKit;
@@ -414,7 +413,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Annotations/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Annotations_ComPDFKit;

ComPDFKit_Tools/ComPDFKit_Tools.xcodeproj/project.pbxproj

@@ -2037,7 +2037,6 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";
@@ -2071,7 +2070,6 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";

ContentEditor/ContentEditor.xcodeproj/project.pbxproj

@@ -372,7 +372,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ContentEditor/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Content Editor_ComPDFKit";
@@ -406,7 +405,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ContentEditor/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Content Editor_ComPDFKit";

DocsEditor/DocsEditor.xcodeproj/project.pbxproj

@@ -371,7 +371,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = DocsEditor/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Docs Editor_ComPDFKit";
@@ -403,7 +402,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = DocsEditor/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Docs Editor_ComPDFKit";

Forms/Forms.xcodeproj/project.pbxproj

@@ -371,7 +371,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Forms/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Forms_ComPDFKit;
@@ -402,7 +401,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Forms/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Forms_ComPDFKit;

Lib/ComPDFKit.xcframework/ios-x86_64-simulator/ComPDFKit.framework/Headers/CPDFButtonWidgetAnnotation.h

@@ -85,14 +85,14 @@ typedef NS_ENUM(NSInteger, CPDFWidgetButtonStyle) {
 - (void)setIsTick:(NSInteger)isTick;
 
 /**
- * Gets the fill style of CheckBox or Radiobutton;
+ *Get the button selected style of check boxes or radio buttons.
  *
  * @see CPDFWidgetButtonStyle
  */
 - (CPDFWidgetButtonStyle)widgetCheckStyle;
 
 /**
- * Sets the fill style of CheckBox or Radiobutton
+ * Set the button selected style of check boxes or radio buttons.
  *
  * @see CPDFWidgetButtonStyle
  */

Lib/ComPDFKit.xcframework/ios-x86_64-simulator/ComPDFKit.framework/Headers/CPDFView.h

@@ -27,6 +27,19 @@ typedef NS_OPTIONS(NSInteger, CEditingLoadType) {
     CEditingLoadTypeImage =           (1UL << 1),
 };
 
+typedef NS_OPTIONS(NSInteger, CEditingLocation) {
+    CEditingLocationLineBegin      =  0,
+    CEditingLoadTypeLineEnd,
+    CEditingLoadTypeSectionBegin,
+    CEditingLoadTypeSectionEnd,
+    CEditingLoadTypePreWord,
+    CEditingLoadTypeNextWord,
+    CEditingLoadTypePreCharPlace,
+    CEditingLoadTypeNextCharPlace,
+    CEditingLoadTypeUpCharPlace,
+    CEditingLoadTypeDownCharPlace,
+};
+
 typedef NS_ENUM(NSInteger, CPDFDisplayDirection) {
     CPDFDisplayDirectionVertical = 0,
     CPDFDisplayDirectionHorizontal = 1,
@@ -40,6 +53,12 @@ typedef NS_ENUM(NSInteger, CPDFDisplayMode) {
     CPDFDisplayModeCustom = 4
 };
 
+typedef NS_OPTIONS(NSInteger, CAddEditingAreaType) {
+    CAddEditingAreaTypeNone  = 0,
+    CAddEditingAreaTypeText,
+    CAddEditingAreaTypeImage,
+};
+
 extern NSNotificationName const CPDFViewDocumentChangedNotification;
 extern NSNotificationName const CPDFViewPageChangedNotification;
 
@@ -78,6 +97,8 @@ extern NSNotificationName const CPDFViewPageChangedNotification;
 
 @interface CPDFEditTextArea : CPDFEditArea
 
+- (nullable NSString *)editTextAreaString;
+
 @end
 
 
@@ -89,6 +110,8 @@ extern NSNotificationName const CPDFViewPageChangedNotification;
 
 @property (nonatomic,assign) BOOL isCropMode;
 
+- (nullable UIImage *)thumbnailImageWithSize:(CGSize)thumbSize;
+
 @end
 
 #pragma mark - CPDFEditingConfig
@@ -165,6 +188,10 @@ extern NSNotificationName const CPDFViewPageChangedNotification;
 
 - (void)PDFEditingViewShouldEndEditing:(CPDFView *)pdfView textView:(UITextView *)textView;
 
+- (void)PDFViewEditingAddTextArea:(CPDFView * _Nonnull)pdfView addPage:(CPDFPage * _Nonnull )page addRect:(CGRect)rect;
+
+- (void)PDFViewEditingAddImageArea:(CPDFView * _Nonnull)pdfView addPage:(CPDFPage * _Nonnull)page addRect:(CGRect)rect;
+
 - (BOOL)PDFEditingViewCanPerformAction:(SEL)action withSender:(id)sender;
 
 @end
@@ -446,18 +473,25 @@ extern NSNotificationName const CPDFViewPageChangedNotification;
  * This method is about configuring of editing content.
  */
 @property (nonatomic,retain) CPDFEditingConfig *editingConfig;
-
-@property (nonatomic,readonly) CEditingLoadType editingLoadType ;
+/**
+ * The properties of the editing modes: Edit text, edit images, edit text & images.
+ */
+@property (nonatomic,readonly) CEditingLoadType editingLoadType;
 
 /**
  * Begins editing content.
  */
 - (void)beginEditingLoadType:(CEditingLoadType)editingLoadType;
 /**
- * Change editing content.
+ * Change the editing modes.
  */
 - (void)changeEditingLoadType:(CEditingLoadType)editingLoadType;
 
+
+- (CAddEditingAreaType)shouAddEditAreaType;
+
+- (void)setShouAddEditAreaType:(CAddEditingAreaType)shouAddEditAreaType;
+
 /**
  * Ends editing content.
  */
@@ -495,6 +529,12 @@ extern NSNotificationName const CPDFViewPageChangedNotification;
  */
 - (CEditingSelectState )editStatus;
 
+- (void)endEditIsRemoveBlockWithEditArea:(CPDFEditArea *)editArea;
+
+- (void)clearEditingSelectCharItem;
+
+- (void)clearEditingSelectCharRange;
+
 
 #pragma mark - Edit Text & Image
 
@@ -532,64 +572,78 @@ extern NSNotificationName const CPDFViewPageChangedNotification;
 
 /**
  * Gets the font size of a text block or a piece of text.
+ *
  */
-- (CGFloat)editingSelectionFontSize;
+- (CGFloat)editingSelectionFontSize DEPRECATED_MSG_ATTRIBUTE("use editingSelectionFontSizesWithTextArea instead.");
+- (CGFloat)editingSelectionFontSizesWithTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Sets the font size of a text block or a piece of text.
  */
-- (void)setEditingSelectionFontSize:(CGFloat)fontSize;
+- (void)setEditingSelectionFontSize:(CGFloat)fontSize withTextArea:(CPDFEditTextArea *)textArea isAutoSize:(BOOL)isAutoSize;
 
+- (void)setEditingSelectionFontSize:(CGFloat)fontSize DEPRECATED_MSG_ATTRIBUTE("use setEditingAutoSelectionFontSize:withTextArea:isAutoSize: instead.");
 /**
  * Gets the font color of a text block or a piece of text.
  */
-- (CPDFKitPlatformColor *)editingSelectionFontColor;
+- (CPDFKitPlatformColor *)editingSelectionFontColor DEPRECATED_MSG_ATTRIBUTE("use editingSelectionFontColorWithTextArea instead,");
+
+- (CPDFKitPlatformColor *)editingSelectionFontColorWithTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Sets the font color of a text block or a piece of text.
  */
-- (void)setEditingSelectionFontColor:(CPDFKitPlatformColor *)fontColor;
+- (void)setEditingSelectionFontColor:(CPDFKitPlatformColor *)fontColor DEPRECATED_MSG_ATTRIBUTE("use setEditingSelectionFontColor:withTextArea: instead.");
+
+- (void)setEditingSelectionFontColor:(CPDFKitPlatformColor *)fontColor withTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Gets the alignment of a text block or a piece of text.
  */
-- (NSTextAlignment)editingSelectionAlignment;
+- (NSTextAlignment)editingSelectionAlignment DEPRECATED_MSG_ATTRIBUTE("use editingSelectionAlignmentWithTextArea: instead.");
+- (NSTextAlignment)editingSelectionAlignmentWithTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Sets the alignment of a text block or a piece of text.
  */
-- (void)setCurrentSelectionAlignment:(NSTextAlignment)alignment;
+- (void)setCurrentSelectionAlignment:(NSTextAlignment)alignment DEPRECATED_MSG_ATTRIBUTE("use setCurrentSelectionAlignment:withTextArea: instead.");
+- (void)setCurrentSelectionAlignment:(NSTextAlignment)alignment withTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * The font name of the currently selected text block.
  */
-- (NSString *)editingSelectionFontName;
+- (NSString *)editingSelectionFontName DEPRECATED_MSG_ATTRIBUTE("use editingSelectionFontNameWithTextArea instead.");
+- (NSString *)editingSelectionFontNameWithTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Sets the font name of the selected text block. (Several standard fonts are currently supported)
  */
-- (void)setEditingSelectionFontName:(NSString *)fontName;
+- (void)setEditingSelectionFontName:(NSString *)fontName DEPRECATED_MSG_ATTRIBUTE("use setEditingSelectionFontName: withTextArea: instead.");
+- (void)setEditingSelectionFontName:(NSString *)fontName withTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Sets the currently selected text is italic.
  */
-- (void)setCurrentSelectionIsItalic:(BOOL)isItalic;
+- (void)setCurrentSelectionIsItalic:(BOOL)isItalic DEPRECATED_MSG_ATTRIBUTE("use setCurrentSelectionIsItalic: withTextArea: instead.");
+- (void)setCurrentSelectionIsItalic:(BOOL)isItalic withTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Whether the font of the currently selected text block is italic.
  */
-- (BOOL)isItalicCurrentSelection;
+- (BOOL)isItalicCurrentSelection DEPRECATED_MSG_ATTRIBUTE("use isItalicCurrentSelectionWithTextArea: instead.");
+- (BOOL)isItalicCurrentSelectionWithTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Sets the currently selected text is bold.
  */
-- (void)setCurrentSelectionIsBold:(BOOL)isBold;
+- (void)setCurrentSelectionIsBold:(BOOL)isBold DEPRECATED_MSG_ATTRIBUTE("use setCurrentSelectionIsBold:withTextArea: instead.");
+- (void)setCurrentSelectionIsBold:(BOOL)isBold withTextArea:(CPDFEditTextArea *)textArea;
 
 /**
  * Whether the font of the currently selected text block is bold.
  */
-- (BOOL)isBoldCurrentSelection;
-
+- (BOOL)isBoldCurrentSelection DEPRECATED_MSG_ATTRIBUTE("isBoldCurrentSelectionWithTextArea:");
+- (BOOL)isBoldCurrentSelectionWithTextArea:(CPDFEditTextArea *)textArea;
 /**
  * Create a blank text block.
  * @param rect The area of the text box.
@@ -598,19 +652,53 @@ extern NSNotificationName const CPDFViewPageChangedNotification;
  * @return Returns whether the creation is successful.
  */
 - (BOOL)createEmptyStringBounds:(CGRect)rect withAttributes:(NSDictionary<NSAttributedStringKey, id> *)attributes page:(CPDFPage *)page;
-
 /**
  * Sets text transparency.
  */
-- (BOOL)setCharsFontTransparency:(float)transparency;
+- (BOOL)setCharsFontTransparency:(float)transparency DEPRECATED_MSG_ATTRIBUTE("use setCharsFontTransparency:withTextArea: instead.");
+- (BOOL)setCharsFontTransparency:(float)transparency withTextArea:(CPDFEditTextArea *)textArea;
 
+- (void)jumpEditingLoction:(CEditingLocation)editingLocation withTextArea:(CPDFEditTextArea *)editArea isSelectRanage:(BOOL)isSelectRanage;
+/**
+ * Get the opacity of image boxes or the last character of the text.
+ */
 - (CGFloat)getCurrentOpacity;
-
+/**
+ * Get the font size of a certain range of text.
+ */
+- (CGFloat)editingSelectionFontSizeByRangeEditArea:(CPDFEditTextArea *)editArea;
+/**
+ * Get the font color of a certain range of text.
+ */
+- (CPDFKitPlatformColor *)editingSelectionFontColorByRangeEditArea:(CPDFEditTextArea *)editArea;
+/**
+ * Get the font name of a certain range of text.
+ */
+- (NSString *)editingSelectionFontNameByRangeEditArea:(CPDFEditTextArea *)editArea;
+/**
+ * Determine whether a certain range of text is italic.
+ */
+- (BOOL)isItalicCurrentSelectionByRangeEditArea:(CPDFEditTextArea *)editArea;
+/**
+ * Determine whether a certain range of text is bold.
+ */
+- (BOOL)isBoldCurrentSelectionByRangeEditArea:(CPDFEditTextArea *)editArea;
+/**
+ * Get the alignment of a certain range of text.
+ */
+- (NSTextAlignment)currentSelectionAlignmentByRangeEditArea:(CPDFEditTextArea *)editArea;
+/**
+ * Get the opacity of a certain range of text.
+ */
+- (CGFloat)opacityByRangeForEditArea:(CPDFEditArea *)editArea;
 /**
  * Gets the Edit supported font name.
  */
 - (NSArray*)getFontList;
 
+- (BOOL)textFocusedOnWithTextArea:(CPDFEditTextArea *)textArea;
+- (BOOL)textFocusedOffWithTextArea:(CPDFEditTextArea *)textArea;
+
 #pragma mark - Edit Image
 
 /*

Lib/ComPDFKit.xcframework/ios-x86_64-simulator/ComPDFKit.framework/_CodeSignature/CodeResources

@@ -34,7 +34,7 @@
 		</data>
 		<key>Headers/CPDFButtonWidgetAnnotation.h</key>
 		<data>
-		SuC9Pwq4sozPLWDQnrLcSDL5Uq0=
+		5Yf9K8wOkcfg2C7b1793xMT+ffY=
 		</data>
 		<key>Headers/CPDFChoiceWidgetAnnotation.h</key>
 		<data>
@@ -158,7 +158,7 @@
 		</data>
 		<key>Headers/CPDFView.h</key>
 		<data>
-		yg9HQnXumHMGwtI4xrIDI82HvIg=
+		GgiCz6qF1YlTLN6XfhmBqJeYpsg=
 		</data>
 		<key>Headers/CPDFWatermark.h</key>
 		<data>
@@ -174,7 +174,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		wQJfdXBYOXxzXs/LYCOqmyX2FLs=
+		CUxFkLUzyDOYdGKqWV1t9Ihl1IA=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -348,11 +348,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			SuC9Pwq4sozPLWDQnrLcSDL5Uq0=
+			5Yf9K8wOkcfg2C7b1793xMT+ffY=
 			</data>
 			<key>hash2</key>
 			<data>
-			MTU7xuXOljazrEuOZ3zngQ1+jMiJVlnaBPefuGsoQvU=
+			3xcxrCzVOASnt0AFrEt3i8D7deBzPAWmcURfPY/VlQw=
 			</data>
 		</dict>
 		<key>Headers/CPDFChoiceWidgetAnnotation.h</key>
@@ -689,11 +689,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			yg9HQnXumHMGwtI4xrIDI82HvIg=
+			GgiCz6qF1YlTLN6XfhmBqJeYpsg=
 			</data>
 			<key>hash2</key>
 			<data>
-			ecJRznHjzhCJehvhkwWfr55WZf7rx949xPXSijTiAPk=
+			klJ+cGXr1sUSeW7qD26OVxdE/v0xqLrU6ZIeU7fOmoE=
 			</data>
 		</dict>
 		<key>Headers/CPDFWatermark.h</key>

PDFViewer/PDFViewer.xcodeproj/project.pbxproj

@@ -371,7 +371,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = PDFViewer/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ComPDFKit;
@@ -411,7 +411,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = PDFViewer/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ComPDFKit;

Viewer/Viewer.xcodeproj/project.pbxproj

@@ -360,7 +360,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Viewer/Info.plist;
@@ -392,7 +391,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 4GGQPGRTSV;
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Viewer/Info.plist;