更新到0.5.1

Author: PFei-He

Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate

@@ -13,7 +13,7 @@
 {
     NSMutableArray  *viewsArray;    //视图数组
 
-    NSArray         *textArray;     //文本数组
+    NSArray         *textsArray;    //文本数组
 }
 
 @end

Demo/Demo/RootVC.h

@@ -32,7 +32,7 @@ - (void)viewDidLoad
 
     //视图背景颜色的数组
     NSArray *colorArray = @[[UIColor cyanColor], [UIColor blueColor], [UIColor greenColor], [UIColor yellowColor], [UIColor purpleColor]];
-    textArray = @[@"0", @"1", @"2", @"3", @"4"];
+    textsArray = @[@"0", @"1", @"2", @"3", @"4"];
 
     //遍历视图
     for (int i = 0; i < colorArray.count; ++i) {
@@ -46,28 +46,33 @@ - (void)viewDidLoad
 
     //轮播图的背景
     carouselView.backgroundColor = [[UIColor purpleColor] colorWithAlphaComponent:0.1];
-    /*
-     //设置页数
-     [carouselView numberOfPagesUsingBlock:^NSInteger(PFCarouselView *carouselView){
-     return 5;
-     }];
-
-     //设置视图
-     [carouselView setupContentViewUsingBlock:^UIView *(PFCarouselView *carouselView, NSInteger index) {
-     return viewsArray[index];
-     }];
-
-     //设置文本
-     [carouselView resetTextLabelUsingBlock:^void (PFCarouselView *carouselView, UILabel *textLabel, NSInteger index) {
-     textLabel.text = textArray[index];
-     NSLog(@"%d", index);
-     }];
-
-     //设置点击事件
-     [carouselView didSelectViewUsingBlock:^(PFCarouselView *carouselView, NSInteger index) {
-     NSLog(@"点击了第%d个", index);
-     }];
-     */
+/*
+    //设置页数
+    @weakify(viewsArray)
+    [carouselView numberOfPagesUsingBlock:^NSInteger(PFCarouselView *carouselView){
+        @strongify(viewsArray)
+        return strong_viewsArray.count;
+    }];
+
+    //设置视图
+    [carouselView setupContentViewUsingBlock:^UIView *(PFCarouselView *carouselView, NSInteger index) {
+        @strongify(viewsArray)
+        return strong_viewsArray[index];
+    }];
+
+    //设置文本
+    @weakify(textsArray)
+    [carouselView resetTextLabelUsingBlock:^void (PFCarouselView *carouselView, UILabel *textLabel, NSInteger index) {
+        @strongify(textsArray)
+        textLabel.text = strong_textsArray[index];
+        NSLog(@"%d", index);
+    }];
+
+    //设置点击事件
+    [carouselView didSelectViewUsingBlock:^(PFCarouselView *carouselView, NSInteger index) {
+        NSLog(@"点击了第%d个", index);
+    }];
+*/
     [self.view addSubview:carouselView];
 }
 
@@ -76,7 +81,7 @@ - (void)viewDidLoad
 //设置页数
 - (NSInteger)numberOfPagesInCarouselView:(PFCarouselView *)automaticScrollView
 {
-    return 5;
+    return viewsArray.count;
 }
 
 //设置视图
@@ -88,7 +93,7 @@ - (UIView *)carouselView:(PFCarouselView *)carouselView setupContentViewAtIndex:
 //设置文本
 - (void)carouselView:(PFCarouselView *)carouselView resetTextLabel:(UILabel *)textLabel atIndex:(NSInteger)index
 {
-    textLabel.text = textArray[index];
+    textLabel.text = textsArray[index];
 }
 
 //设置点击事件

Demo/Demo/RootVC.m

@@ -7,7 +7,7 @@
 //
 //  https://github.com/PFei-He/PFCarouselView
 //
-//  vesion: 0.5.1-beta5
+//  vesion: 0.5.1
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -66,25 +66,25 @@
  *  强弱引用转换，用于解决代码块（block）与强引用对象之间的循环引用问题
  *  调用方式: `@weakify(object)`实现弱引用转换，`@strongify(object)`实现强引用转换
  *
- *  示例:
+ *  示例：
  *  @weakify(object)
  *  [obj block:^{
  *      @strongify(object)
- *      object = something;
+ *      strong_object = something;
  *  }];
  */
 #ifndef	weakify
     #if __has_feature(objc_arc)
-        #define weakify(object)	autoreleasepool{} __weak __typeof__(object) __weak_##x##__ = x;
+        #define weakify(object)	autoreleasepool{} __weak __typeof__(object) weak##_##object = object;
     #else
-        #define weakify(object)	autoreleasepool{} __block __typeof__(object) __block_##x##__ = x;
+        #define weakify(object)	autoreleasepool{} __block __typeof__(object) block##_##object = object;
     #endif
 #endif
 #ifndef	strongify
     #if __has_feature(objc_arc)
-        #define strongify(object) try{} @finally{} __typeof__(object) x = __weak_##x##__;
+        #define strongify(object) try{} @finally{} __typeof__(object) strong##_##object = weak##_##object;
     #else
-        #define strongify(object) try{} @finally{} __typeof__(object) x = __block_##x##__;
+        #define strongify(object) try{} @finally{} __typeof__(object) strong##_##object = block##_##object;
     #endif
 #endif
 

PFCarouselView/PFCarouselView.h

@@ -7,7 +7,7 @@
 //
 //  https://github.com/PFei-He/PFCarouselView
 //
-//  vesion: 0.5.1-beta5
+//  vesion: 0.5.1
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal