Activity indicator is not shown when image is downloading - fixed

KDCycleBannerView/KDCycleBannerView.h

@@ -15,7 +15,11 @@ typedef void(^CompleteBlock)(void);
 @protocol KDCycleBannerViewDataSource <NSObject>
 
 @required
-- (NSArray *)numberOfKDCycleBannerView:(KDCycleBannerView *)bannerView;
+/**
+ @return Array of UIImage or NSString or NSURL objects with direct image data objects or URLs to images.
+ Heterogeneous array is also allowed, that is with different types of items.
+ */
+- (NSArray *)dataForCycleBannerView:(KDCycleBannerView *)bannerView;
 - (UIViewContentMode)contentModeForImageIndex:(NSUInteger)index;
 
 @optional
@@ -38,6 +42,19 @@ typedef void(^CompleteBlock)(void);
 @property (weak, nonatomic) IBOutlet id<KDCycleBannerViewDataSource> datasource;
 @property (weak, nonatomic) IBOutlet id<KDCycleBannerViewDelegate> delegate;
 
+/**
+ Show activity UIActivityIndicatorView. Default `NO`.
+ */
+@property (assign, nonatomic) BOOL showActivityIndicatorViewWhenDownloadingImages;
+
+/**
+ *  set desired UIActivityIndicatorViewStyle
+ *
+ *  @param style The style of the UIActivityIndicatorView
+ Default value `UIActivityIndicatorViewStyleWhiteLarge`.
+ */
+@property (assign, nonatomic) UIActivityIndicatorViewStyle activityIndicatorStyle;
+
 @property (assign, nonatomic, getter = isContinuous) BOOL continuous;   // if YES, then bannerview will show like a carousel, default is NO
 @property (assign, nonatomic) NSUInteger autoPlayTimeInterval;  // if autoPlayTimeInterval more than 0, the bannerView will autoplay with autoPlayTimeInterval value space, default is 0
 

KDCycleBannerView/KDCycleBannerView.m

@@ -32,28 +32,27 @@ - (id)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
     if (self) {
-        // Initialization code
-        _scrollViewBounces = YES;
+        [self init_common];
     }
     return self;
 }
 
 - (id)initWithCoder:(NSCoder *)aDecoder {
     if (self = [super initWithCoder:aDecoder]) {
-        _scrollViewBounces = YES;
+        [self init_common];
     }
     return self;
 }
 
-- (void)awakeFromNib {
-    [super awakeFromNib];
+- (void)init_common {
+    _scrollViewBounces = YES;
+    _activityIndicatorStyle = UIActivityIndicatorViewStyleWhiteLarge;
 }
 
+// MARK: - Override
+
 - (void)layoutSubviews {
     [super layoutSubviews];
-
-    NSArray *subViews = self.subviews;
-    [subViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
 
     [self initialize];
 
@@ -79,6 +78,7 @@ - (void)initialize {
 }
 
 - (void)initializeScrollView {
+    [_scrollView removeFromSuperview];
     _scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.frame), CGRectGetHeight(self.frame))];
     _scrollView.delegate = self;
     _scrollView.pagingEnabled = YES;
@@ -90,6 +90,7 @@ - (void)initializeScrollView {
 }
 
 - (void)initializePageControl {
+    [_pageControl removeFromSuperview];
     CGRect pageControlFrame = CGRectMake(0, 0, CGRectGetWidth(_scrollView.frame), 30);
     _pageControl = [[UIPageControl alloc] initWithFrame:pageControlFrame];
     _pageControl.center = CGPointMake(CGRectGetWidth(_scrollView.frame)*0.5, CGRectGetHeight(_scrollView.frame) - 12.);
@@ -99,10 +100,9 @@ - (void)initializePageControl {
 
 - (void)loadData {
     NSAssert(_datasource != nil, @"datasource must not nil");
-    _datasourceImages = [_datasource numberOfKDCycleBannerView:self];
+    _datasourceImages = [_datasource dataForCycleBannerView:self];
 
     if (_datasourceImages.count == 0) {
-        //显示默认页，无数据页面
         if ([self.datasource respondsToSelector:@selector(placeHolderImageOfZeroBannerView)]) {
             UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(_scrollView.frame), CGRectGetHeight(_scrollView.frame))];
             imageView.contentMode = UIViewContentModeScaleAspectFill;
@@ -137,20 +137,16 @@ - (void)loadData {
         id imageSource = [_datasourceImages objectAtIndex:i];
         if ([imageSource isKindOfClass:[UIImage class]]) {
             imageView.image = imageSource;
-        }else if ([imageSource isKindOfClass:[NSString class]] || [imageSource isKindOfClass:[NSURL class]]) {
-            UIActivityIndicatorView *activityIndicatorView = [UIActivityIndicatorView new];
-            activityIndicatorView.center = CGPointMake(CGRectGetWidth(_scrollView.frame) * 0.5, CGRectGetHeight(_scrollView.frame) * 0.5);
-            activityIndicatorView.tag = 100;
-            activityIndicatorView.activityIndicatorViewStyle = UIActivityIndicatorViewStyleWhiteLarge;
-            [activityIndicatorView startAnimating];
-            [imageView addSubview:activityIndicatorView];
-            [imageView addObserver:self forKeyPath:@"image" options:NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld context:kContentImageViewObservationContext];
+        } else if ([imageSource isKindOfClass:[NSString class]] || [imageSource isKindOfClass:[NSURL class]]) {
+            [imageView setShowActivityIndicatorView:self.showActivityIndicatorViewWhenDownloadingImages];
+            [imageView setIndicatorStyle:self.activityIndicatorStyle];
 
             if ([self.datasource respondsToSelector:@selector(placeHolderImageOfBannerView:atIndex:)]) {
                 UIImage *placeHolderImage = [self.datasource placeHolderImageOfBannerView:self atIndex:i];
                 NSAssert(placeHolderImage != nil, @"placeHolderImage must not be nil");
                 [imageView sd_setImageWithURL:[imageSource isKindOfClass:[NSString class]] ? [NSURL URLWithString:imageSource] : imageSource placeholderImage:placeHolderImage];
-            }else {
+
+            } else {
                 [imageView sd_setImageWithURL:[imageSource isKindOfClass:[NSString class]] ? [NSURL URLWithString:imageSource] : imageSource];
             }
 
@@ -223,17 +219,6 @@ - (void)autoSwitchBannerView {
     [self performSelector:_cmd withObject:nil afterDelay:self.autoPlayTimeInterval];
 }
 
-#pragma mark - KVO
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-    if (context == kContentImageViewObservationContext) {
-        UIImageView *imageView = (UIImageView *)object;
-        UIActivityIndicatorView *activityIndicatorView = (UIActivityIndicatorView *)[imageView viewWithTag:100];
-        [activityIndicatorView removeFromSuperview];
-        [imageView removeObserver:self forKeyPath:@"image"];
-    }
-}
-
 #pragma mark - UIScrollViewDelegate
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {