Browse Source

PDFTools(iOS) - manager类的修改

yangliuhua 1 year ago
parent
commit
17be4c0d4d

+ 29 - 2
Annotation-Ctrl-Demo/Annotation-Ctrl-Demo/CPDFViewController.m

@@ -31,6 +31,8 @@
 
 @property(nonatomic, strong) CPDFAnnotationBar *annotationBar;
 
+@property(nonatomic, strong) CAnnotationManage *annotationManage;
+
 @end
 
 @implementation CPDFViewController
@@ -56,6 +58,8 @@
     self.pdfListView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [self.view addSubview:self.pdfListView];
     
+    self.annotationManage = [[CAnnotationManage alloc] initWithPDFView:self.pdfListView];
+    
     UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"CPDFThunbnailImageEnter" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] style:UIBarButtonItemStylePlain target:self action:@selector(buttonItemClicked_thumbnail:)];
     self.navigationItem.leftBarButtonItem = leftItem;
     
@@ -80,7 +84,7 @@
     self.searchToolbar = [[CSearchToolbar alloc] initWithPDFView:self.pdfListView];
     self.searchToolbar.delegate = self;
     
-    self.annotationBar = [[CPDFAnnotationBar alloc] initPDFView:self.pdfListView];
+    self.annotationBar = [[CPDFAnnotationBar alloc] initAnnotationManage:self.annotationManage];
     self.annotationBar.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     self.annotationBar.delegate = self;
     [self.annotationBar setParentVC:self];
@@ -96,7 +100,6 @@
     
     if (@available(iOS 11.0, *)) {
         self.pdfListView.frame = CGRectMake(self.view.safeAreaInsets.left, self.view.safeAreaInsets.top, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, self.view.frame.size.height - self.view.safeAreaInsets.bottom- self.view.safeAreaInsets.top);
-        
         self.annotationBar.frame = CGRectMake(0, self.view.frame.size.height - self.view.safeAreaInsets.bottom - 44, self.view.frame.size.width, 44);
     } else {
         self.pdfListView.frame = self.view.bounds;
@@ -248,6 +251,30 @@
     }
 }
 
+#pragma mark - CPDFListViewDelegate
+
+- (void)PDFListViewChangeatioActiveAnnotations:(CPDFListView *)pdfListView forActiveAnnotations:(NSArray<CPDFAnnotation *> *)annotations {
+    self.annotationManage = [[CAnnotationManage alloc] initWithPDFView:pdfListView];
+}
+
+- (void)PDFListViewChangedAnnotationType:(CPDFListView *)pdfListView forAnnotationMode:(CPDFViewAnnotationMode)annotationMode {
+    switch (annotationMode) {
+        case CPDFViewAnnotationModeNote:
+        {
+            
+        }
+            break;
+        case CPDFViewAnnotationModeHighlight:
+        {
+         
+        }
+            
+        default:
+            break;
+    }
+}
+
+
 #pragma mark - CPDFMorelistViewDelegate
 
 - (void)PDFMoreListViewController:(CPDFMoreListViewController *)moreVC didSelectRow:(CPDFMoreListViewType)row {

+ 1 - 1
compdfkit-tools/compdfkit-tools.xcodeproj/project.pbxproj

@@ -32,7 +32,7 @@
 		C918CE8129F621E200D43974 /* CPDFColorPickerView.h in Headers */ = {isa = PBXBuildFile; fileRef = C918CE7F29F621E200D43974 /* CPDFColorPickerView.h */; };
 		C918CE8229F621E200D43974 /* CPDFColorPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = C918CE8029F621E200D43974 /* CPDFColorPickerView.m */; };
 		C918CE8429F62D6F00D43974 /* Image.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C918CE8329F62D6F00D43974 /* Image.xcassets */; };
-		C918CE9229F7C3FB00D43974 /* CAnnotationManage.h in Headers */ = {isa = PBXBuildFile; fileRef = C918CE9029F7C3FA00D43974 /* CAnnotationManage.h */; };
+		C918CE9229F7C3FB00D43974 /* CAnnotationManage.h in Headers */ = {isa = PBXBuildFile; fileRef = C918CE9029F7C3FA00D43974 /* CAnnotationManage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C918CE9329F7C3FB00D43974 /* CAnnotationManage.m in Sources */ = {isa = PBXBuildFile; fileRef = C918CE9129F7C3FA00D43974 /* CAnnotationManage.m */; };
 		C918CE9629F8BA6200D43974 /* CPDFNoteViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C918CE9429F8BA6200D43974 /* CPDFNoteViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C918CE9729F8BA6200D43974 /* CPDFNoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C918CE9529F8BA6200D43974 /* CPDFNoteViewController.m */; };

+ 7 - 5
compdfkit-tools/compdfkit-tools/Annotation/PDFAnnotationManage/CAnnotationManage.h

@@ -22,15 +22,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) CPDFListView *pdfListView;
 
-@property (nonatomic, strong) CAnnotStyle *annotStyle;
-
-@property (nonatomic, strong) UIViewController *parentVC;
+@property (nonatomic, readonly) CAnnotStyle *annotStyle;
 
 - (instancetype)initWithPDFView:(CPDFListView *)pdfListView;
 
-- (CAnnotStyle *)getAnnotStyle;
 
-- (void)setAnnotStyle:(CAnnotStyle *)annotStyle;
+- (void)setAnnotStyle:(CPDFAnnotation *)annotStyle;
+
+- (void)setAnnotStyle1:(CPDFViewAnnotationMode)annotStyle;
+
+
+
 
 @end
 

+ 9 - 33
compdfkit-tools/compdfkit-tools/Annotation/PDFAnnotationManage/CAnnotationManage.m

@@ -33,7 +33,6 @@
         self.annotStyle = [[CAnnotStyle alloc] init];
         self.annotStyle.color = [UIColor yellowColor];
         self.annotation.opacity = 1.0;
-        self.pdfListView.performDelegate = self;
     }
     return self;
 }
@@ -56,39 +55,16 @@
     }
 }
 
-#pragma mark - CPDFListViewDelegate
+//- (void)PDFViewPerformOpenNote:(CPDFListView *)pdfView forAnnotation:(CPDFAnnotation *)annotation {
+////    CGRect rect = [pdfView convertRect:annotation.bounds fromPage:annotation.page];
+////    CPDFNoteOpenViewController *noteOpenVC = [[CPDFNoteOpenViewController alloc] init];
+////    noteOpenVC.delegate = self;
+////    [noteOpenVC setContent:annotation.contents];
+////    [noteOpenVC showViewController:self.parentVC inRect:rect];
+////
+////    self.annotation = annotation;
+//}
 
-- (void)PDFViewPerformOpenNote:(CPDFListView *)pdfView forAnnotation:(CPDFAnnotation *)annotation {
-    CGRect rect = [pdfView convertRect:annotation.bounds fromPage:annotation.page];
-    CPDFNoteOpenViewController *noteOpenVC = [[CPDFNoteOpenViewController alloc] init];
-    noteOpenVC.delegate = self;
-    [noteOpenVC setContent:annotation.contents];
-    [noteOpenVC showViewController:self.parentVC inRect:rect];
-    
-    self.annotation = annotation;
-}
-
-- (void)PDFListViewChangeatioActiveAnnotations:(CPDFListView *)pdfListView forActiveAnnotations:(NSArray<CPDFAnnotation *> *)annotations {
-    self.annotation = annotations.firstObject;
-}
-
-- (void)PDFListViewChangedAnnotationType:(CPDFListView *)pdfListView forAnnotationMode:(CPDFViewAnnotationMode)annotationMode {
-    switch (annotationMode) {
-        case CPDFViewAnnotationModeNote:
-        {
-            
-        }
-            break;
-        case CPDFViewAnnotationModeHighlight:
-        {
-            self.annotStyle.color = self.annotation.color;
-            self.annotStyle.opacity = self.annotation.opacity;
-        }
-            
-        default:
-            break;
-    }
-}
 
 #pragma mark - CPDFNoteOpenViewControllerDelegate
 

+ 15 - 6
compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFBase/CPDFAnnotationBaseViewController.m

@@ -54,7 +54,7 @@
     self.sampleView.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
     [self.view addSubview:self.sampleView];
     
-    self.colorView = [[CPDFColorSelectView alloc] initWithFrame:CGRectMake(0, 190, self.view.frame.size.width, 90)];
+    self.colorView = [[CPDFColorSelectView alloc] init];
     self.colorView.delegate = self;
     self.colorView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     [self.view addSubview:self.colorView];
@@ -71,11 +71,20 @@
 
 - (void)viewWillLayoutSubviews {
     [super viewWillLayoutSubviews];
-    self.titleLabel.frame = CGRectMake((self.view.frame.size.width - 120)/2, 5, 120, 50);
-    self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, 50);
-    self.sampleView.frame  = CGRectMake((self.view.frame.size.width - 300)/2, 60, 300, 120);
-    self.opacitySliderView.frame = CGRectMake(10, 280, self.view.frame.size.width - 20, 90);
-    self.colorPicker.frame = self.view.frame;
+    self.titleLabel.frame = CGRectMake((self.view.frame.size.width - 120)/2, 5, 120, ((self.view.frame.size.height)/8));
+    self.sampleView.frame  = CGRectMake((self.view.frame.size.width - 300)/2, ((self.view.frame.size.height)/8), 300, ((self.view.frame.size.height)/8)*3);
+    
+    if (@available(iOS 11.0, *)) {
+        self.colorPicker.frame = CGRectMake(self.view.safeAreaInsets.left, 0, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, self.view.frame.size.height);
+        self.colorView.frame = CGRectMake(self.view.safeAreaInsets.left, ((self.view.frame.size.height)/8)*4,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, ((self.view.frame.size.height)/8)*2);
+        self.opacitySliderView.frame = CGRectMake(self.view.safeAreaInsets.left, ((self.view.frame.size.height)/8)*6, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, ((self.view.frame.size.height)/8)*2);
+        self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60 - self.view.safeAreaInsets.right, 5, 50, ((self.view.frame.size.height)/8));
+    } else {
+        self.colorPicker.frame = self.view.frame;
+        self.colorView.frame = CGRectMake(0, ((self.view.frame.size.height)/8)*4, self.view.frame.size.width, ((self.view.frame.size.height)/8)*2);
+        self.opacitySliderView.frame = CGRectMake(0, ((self.view.frame.size.height)/8)*6, self.view.frame.size.width, ((self.view.frame.size.height)/8)*2);
+        self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, ((self.view.frame.size.height)/8));
+    }
 }
 
 - (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {

+ 14 - 6
compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFNote/CPDFNoteViewController.m

@@ -81,11 +81,19 @@
 }
 
 - (void)viewWillLayoutSubviews {
-    self.titleLabel.frame = CGRectMake((self.view.frame.size.width - 120)/2, 5, 120, ((self.view.frame.size.height)/8)*2 - 10);
-    self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, ((self.view.frame.size.height)/8)*2 -10);
-    self.sampleView.frame  = CGRectMake((self.view.frame.size.width - 300)/2, ((self.view.frame.size.height)/8)*2 -10, 300, ((self.view.frame.size.height)/8)*3);
-    self.colorPicker.frame = self.view.frame;
-    self.colorView.frame = CGRectMake(0, ((self.view.frame.size.height)/7)*4, self.view.frame.size.width, ((self.view.frame.size.height)/7)*3);
+    self.titleLabel.frame = CGRectMake((self.view.frame.size.width - 120)/2, 5, 120, ((self.view.frame.size.height)/7));
+    self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, ((self.view.frame.size.height)/7));
+    self.sampleView.frame  = CGRectMake((self.view.frame.size.width - 300)/2, ((self.view.frame.size.height)/7), 300, ((self.view.frame.size.height)/7)*3);
+    self.colorView.frame = CGRectMake(0, ((self.view.frame.size.height)/7)*4, self.view.frame.size.width, ((self.view.frame.size.height)/7)*2);
+    if (@available(iOS 11.0, *)) {
+        self.colorPicker.frame = CGRectMake(self.view.safeAreaInsets.left, 0, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, self.view.frame.size.height);
+        self.colorView.frame = CGRectMake(self.view.safeAreaInsets.left, ((self.view.frame.size.height)/7)*4,self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, ((self.view.frame.size.height)/7)*2);
+        self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60 - self.view.safeAreaInsets.right, 5, 50, ((self.view.frame.size.height)/7));
+    } else {
+        self.colorPicker.frame = self.view.frame;
+        self.colorView.frame = CGRectMake(0, ((self.view.frame.size.height)/7)*4, self.view.frame.size.width, ((self.view.frame.size.height)/7)*2);
+        self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, ((self.view.frame.size.height)/7));
+    }
 }
 
 - (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
@@ -97,7 +105,7 @@
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
 {
-    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 270 : 320);
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 200 : 320);
 }
 
 #pragma mark - Action

+ 4 - 0
compdfkit-tools/compdfkit-tools/Common/Model/CAnnotStyle.h

@@ -41,6 +41,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, assign) BOOL isNoRotate;
 
+@property (nonatomic, assign) NSInteger annotMode;
+
+@property (nonatomic, assign) BOOL isSelectAnnot;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 2 - 1
compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/CPDFAnnotationBar.h

@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class CPDFAnnotationBar;
 @class CPDFListView;
 @class CPDFInkTopToolBar;
+@class CAnnotationManage;
 
 @protocol CPDFAnnotationBarDelegate <NSObject>
 
@@ -61,7 +62,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)reloadData;
 
-- (instancetype)initPDFView:(CPDFListView *)pdfListView;
+- (instancetype)initAnnotationManage:(CAnnotationManage *)annotationManage;
 
 @end
 

+ 21 - 3
compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/CPDFAnnotationBar.m

@@ -50,6 +50,8 @@
 
 @property (nonatomic, strong) CAnnotationManage *annotManage;
 
+@property (nonatomic, strong) CAnnotStyle *annotStyle;
+
 @property (nonatomic, strong) CPDFSignatureViewController *signatureVC;
 
 @end
@@ -58,8 +60,10 @@
 
 #pragma mark - Initializers
 
-- (instancetype)initPDFView:(CPDFListView *)pdfListView {
+- (instancetype)initAnnotationManage:(CAnnotationManage *)annotationManage {
     if (self = [super init]) {
+        self.annotManage = annotationManage;
+        
         UIBlurEffect *blur = [UIBlurEffect effectWithStyle:UIBlurEffectStyleExtraLight];
         UIVisualEffectView *effectView = [[UIVisualEffectView alloc] initWithEffect:blur];
         effectView.frame = self.bounds;
@@ -73,9 +77,9 @@
         
         self.selectedIndex = -1;
         
-        self.pdfListView = pdfListView;
+        self.pdfListView = annotationManage.pdfListView;
         
-        self.annotManage = [[CAnnotationManage alloc] initWithPDFView:pdfListView];
+        self.annotStyle = [[CAnnotStyle alloc] init];
 
         [self initSubview];
     }
@@ -206,63 +210,77 @@
         case CPDFToolbarNote:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeNote;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeNote;
         }
             break;
         case CPDFToolbarHighlight:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeHighlight;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeHighlight;
         }
             break;
         case CPDFToolbarUnderline:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeUnderline;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeUnderline;
         }
             break;
         case CPDFToolbarStrikeout:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeStrikeout;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeStrikeout;
         }
             break;
         case CPDFToolbarSquiggly:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeSquiggly;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeSquiggly;
         }
             break;
         case CPDFToolbarFreehand:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeInk;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeInk;
         }
             break;
         case CPDFToolbarShapeCircle:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeCircle;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeCircle;
         }
             break;
         case CPDFToolbarShapeRectangle:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeSquare;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeSquare;
         }
             break;
         case CPDFToolbarShapeArrow:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeArrow;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeArrow;
         }
             break;
         case CPDFToolbarShapeLine:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeLine;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeLine;
         }
             break;
             
         default:
         {
             self.pdfListView.annotationMode = CPDFViewAnnotationModeNone;
+            self.annotStyle.annotMode = CPDFViewAnnotationModeNone;
         }
             break;
     }
 }
 
 - (void)buttonItemClicked_open:(UIButton *)button {
+    if (self.pdfListView.activeAnnotations.firstObject) {
+        
+    }
     CAnnotStyle *annotStytle = [self.annotManage getAnnotStyle];
     AAPLCustomPresentationController *presentationController NS_VALID_UNTIL_END_OF_SCOPE;
     switch (button.tag) {

+ 1 - 1
compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFAnnotationSampleView.m

@@ -36,7 +36,7 @@
 - (void)drawRect:(CGRect)rect {
     [super drawRect:rect];
     CGContextRef context = UIGraphicsGetCurrentContext();
-    self.centerRect = CGRectInset(rect, 130, 40);
+    self.centerRect = CGRectInset(rect, 130, self.bounds.size.height/3);
     self.arrowRect = CGRectInset(rect, 100, 20);
     
     [self drawSamples:context];

+ 2 - 0
compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFColorPickerView.m

@@ -41,12 +41,14 @@
     if (self == [super initWithFrame:frame]) {
         _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake((self.frame.size.width - 120)/2, 0, 120, (self.bounds.size.height - 40)/6)];
         _titleLabel.text = NSLocalizedString(@"Custom Color", nil);
+        _titleLabel.adjustsFontSizeToFitWidth = YES;
         _titleLabel.autoresizingMask  = UIViewAutoresizingFlexibleHeight;
         [self addSubview:self.titleLabel];
         
         _backBtn = [[UIButton alloc] initWithFrame:CGRectMake(10, 0, 40, (self.bounds.size.height - 40)/6)];
         _backBtn.autoresizingMask = UIViewAutoresizingFlexibleHeight;
         [_backBtn setImage:[UIImage imageNamed:@"CPDFAnnotationBarImageUndo" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] forState:UIControlStateNormal];
+        [_backBtn sizeToFit];
         [_backBtn addTarget:self action:@selector(buttonItemClicked_back:) forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:self.backBtn];
         

+ 5 - 3
compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFColorSelectView.m

@@ -31,7 +31,7 @@
 
 - (instancetype)initWithFrame:(CGRect)frame {
     if (self = [super initWithFrame:frame]) {
-        self.colorLabel = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, 50, 30)];
+        self.colorLabel = [[UILabel alloc] init];
         self.colorLabel.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
         self.colorLabel.text = NSLocalizedString(@"Fill:", nil);
         self.colorLabel.adjustsFontSizeToFitWidth = YES;
@@ -72,8 +72,8 @@
                         [UIColor clearColor]];
     for (int i = 0; i < 6; i++) {
         UIButton *button = (UIButton *)self.colorArray[i];
-        button.frame = CGRectMake((self.bounds.size.width - 300)/7 * (i+1) + 50 * i, 5, 50, 50);
-        [[button layer] setCornerRadius:25];
+        button.frame = CGRectMake((self.bounds.size.width - 300)/7 * (i+1) + 50 * i, 5, self.colorPickerView.bounds.size.height - 10, self.colorPickerView.bounds.size.height - 10);
+        [[button layer] setCornerRadius:(self.colorPickerView.bounds.size.height - 10)/2];
         button.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleLeftMargin;
         button.backgroundColor = colors[i];
         button.tag = i;
@@ -86,6 +86,8 @@
 
 - (void)layoutSubviews {
     [super layoutSubviews];
+    self.colorLabel.frame = CGRectMake(5, 0, 50, self.bounds.size.height/3);
+    self.colorPickerView.frame = CGRectMake(0, self.bounds.size.height/3, self.bounds.size.width, (self.bounds.size.height/3)*2);
     [self pickerBarInit];
 }
 

+ 1 - 0
compdfkit-tools/compdfkit-tools/compdfkit_tools.h

@@ -59,6 +59,7 @@
 #import <compdfkit_tools/CPDFStrikeoutViewController.h>
 #import <compdfkit_tools/AAPLCustomPresentationController.h>
 #import <compdfkit_tools/CPDFInkTopToolBar.h>
+#import <compdfkit_tools/CAnnotationManage.h>
 
 //Edit
 #import <compdfkit_tools/CPDFEditToolBar.h>