新增引导一页一页添加的功能

修复了显示方面的bug

Author: 沙少盼

SPGuidePage/GuideCoverView.m

@@ -8,21 +8,49 @@
 
 #import "GuideCoverView.h"
 
+@interface GuideCoverView ()
+{
+    NSUInteger _currentPageDraw;
+}
+@end
 
 @implementation GuideCoverView
 - (instancetype)initWithItems:(NSArray *)items{
     if (self = [super init]) {
         self.ItemArr = items.mutableCopy;
         self.frame = [UIScreen mainScreen].bounds;
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(next:)];
+        [self addGestureRecognizer:tap];
+        _currentPageDraw = 0;
         [self drawRegions];
     }
     return self;
 }
+- (void)next:(UITapGestureRecognizer *)sender{
+    [self removeAllSubLayers];
+    _currentPageDraw ++;
+    if (_currentPageDraw < self.ItemArr.count) {
+        [self drawRegions];
+    }else{
+        [self removeFromSuperview];
+    }
+}
 - (void)drawRegions{
-    if (self.ItemArr.count) {
+    if (self.ItemArr.count && _currentPageDraw < self.ItemArr.count) {
+        id item = self.ItemArr[_currentPageDraw];
+        if ([item isKindOfClass:[NSArray class]]) {
+            [self drawOneGroup:item];
+        }else if ([item isKindOfClass:[LoaderItemModel class]]){
+            [self drawOneGroup:@[item]];
+        }
+    }
+}
+
+- (void)drawOneGroup:(NSArray *)models{
+    if (models.count) {
         UIBezierPath *path = [UIBezierPath bezierPathWithRect:self.frame];
         CAShapeLayer *layer = [CAShapeLayer layer];
-        for (LoaderItemModel *model in self.ItemArr) {
+        for (LoaderItemModel *model in models) {
             if (model.loaderImage.length) {
                 UIImageView *image = [[UIImageView alloc]initWithImage:[UIImage imageNamed:model.loaderImage]];
                 image.frame = CGRectMake(model.loaderRect.origin.x, model.loaderRect.origin.y, image.image.size.width, image.image.size.height);
@@ -66,7 +94,11 @@ - (UIBezierPath *)drawRegionWith:(LoaderItemModel *)model{
         case Circle:
         {
             CGFloat rad = MAX(model.region.rect.size.width, model.region.rect.size.height);
-            bezierPath = [UIBezierPath bezierPathWithOvalInRect:CGRectMake(model.region.rect.origin.x,model.region.rect.origin.y, rad, rad)];
+            if (rad == model.region.rect.size.width) {
+                bezierPath = [UIBezierPath bezierPathWithOvalInRect:CGRectMake(model.region.rect.origin.x,model.region.rect.origin.y - (rad - model.region.rect.size.height)/2, rad, rad)];
+            }else{
+                bezierPath = [UIBezierPath bezierPathWithOvalInRect:CGRectMake(model.region.rect.origin.x - (rad - model.region.rect.size.width)/2,model.region.rect.origin.y, rad, rad)];
+            }
         }
             break;
         case Oval:
@@ -235,6 +267,11 @@ - (UIImage*) imageWithUIView:(UIView*) view
     UIGraphicsEndImageContext();
     return tImage;
 }
+- (void)removeAllSubLayers{
+    for (CALayer *layer in self.layer.sublayers) {
+        [layer removeFromSuperlayer];
+    }
+}
 - (void)showInView:(UIView *)view{
     [view addSubview:self];
 }

SPGuidePage/LinkImageModel.h

@@ -17,6 +17,7 @@ typedef NS_ENUM(NSInteger ,LinkImageStyle) {
     LinkImageStyleTortuousArrow,
     LinkImageStyleTapGesture,
     LinkImageStyleRad,
+    LinkImageStyleLeftRad,
     LinkImageStyleCustom
 };
 

SPGuidePage/LinkImageModel.m

@@ -13,7 +13,8 @@
 static NSString *LineMediumArrow = @"直线箭头粗";
 static NSString *TortuousArrow = @"折线箭头";
 static NSString *TapGesture = @"点击手势";
-static NSString *Rad = @"旋转箭头";
+static NSString *Rad = @"弯箭头";
+static NSString *LeftRad = @"左弯箭头";
 
 @implementation LinkImageModel
 
@@ -33,6 +34,11 @@ + (instancetype)initWithStyle:(LinkImageStyle)style
                 model.customImageName = Rad;
             }
                 break;
+            case LinkImageStyleLeftRad:
+            {
+                model.customImageName = LeftRad;
+            }
+                break;
             case LinkImageStyleDefult:
             {
                 model.customImageName = RotationArrow;

SPGuidePage/ViewController.m

@@ -44,10 +44,7 @@ - (void)viewDidLoad {
     LinkImageModel *link2 = [LinkImageModel initWithStyle:LinkImageStyleTortuousArrow CustomImage:nil Position:LinkImagePositionLeftUnder OffsetX:0 OffsetY:0];
     TextModel *title1 = [TextModel initWithFont:[UIFont systemFontOfSize:18] text:@"你你你你你你你你你你你你你你你你" Alignment:TextAlignmentLeft];
     LoaderItemModel *itemLineroundedRect = [LoaderItemModel initWithLink:link2 Title:title1 Region:LineroundedRect];
-    
-    
     GuideCoverView *guideV = [[GuideCoverView alloc]initWithItems:@[itemOval,itemCircle,itemRounded,itemLineroundedRect,itemImage]];
-    
     [guideV showInView:self.view];
 }