Merge pull request #1 from zhangao0086/1.0.0

supports default image
zhangao0086 · Nov 13, 2014 · 49f2126 · 49f2126
2 parents da13f73 + d16c7bc
commit 49f2126
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/DKCarouselView.podspec b/DKCarouselView.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "6.0"
   s.source       = { :git => "https://github.com/zhangao0086/DKCarouselView.git", 
                      :tag => s.version.to_s }
-  s.source_files  = "DKCarouselView.{h,m}"
+  s.source_files  = "DKCarouselView/*.{h,m}"
   s.frameworks = "Foundation", "UIKit"
   s.requires_arc = true
   s.dependency "SDWebImage", "~> 3.7.1"

diff --git a/DKCarouselView/DKCarouselView.h b/DKCarouselView/DKCarouselView.h
@@ -39,11 +39,15 @@ typedef void(^ItemClicked)(DKCarouselItem *ad, NSInteger index);
 
 @interface DKCarouselView : UIView
 
-//@property (nonatomic, assign) BOOL stretchingImage;
 @property (nonatomic, readonly) NSUInteger numberOfItems;
 
 @property (nonatomic, copy) ItemClicked itemClickedBlock;
 
+/**
+ *  Placeholder For DKCarouselURLItem
+ */
+@property (nonatomic, strong) UIImage *defaultImage;
+
 -(void)setItems:(NSArray *)items;
 
 -(void)setAutoPagingForInterval:(NSTimeInterval)timeInterval;

diff --git a/DKCarouselView/DKCarouselView.m b/DKCarouselView/DKCarouselView.m
@@ -178,7 +178,7 @@ -(void)setItems:(NSArray *)items{
         itemView.userInteractionEnabled = YES;
         if ([item isKindOfClass:[DKCarouselURLItem class]]) {
             NSString *imageUrl = [(DKCarouselURLItem *)item imageUrl];
-            [itemView sd_setImageWithURL:[NSURL URLWithString:imageUrl]];
+            [itemView sd_setImageWithURL:[NSURL URLWithString:imageUrl] placeholderImage:self.defaultImage];
         } else if ([item isKindOfClass:[DKCarouselViewItem class]]) {
             UIView *customView = [(DKCarouselViewItem *)item view];
             [itemView addSubview:customView];
@@ -201,13 +201,6 @@ -(void)setItems:(NSArray *)items{
     [self setNeedsLayout];
 }
 
-//-(void)setStretchingImage:(BOOL)stretchingImage{
-//    _stretchingImage = stretchingImage;
-//    for (UIView *adView in self.adViews) {
-//        if (!_stretchingImage) imageView.contentMode = UIViewContentModeCenter;
-//    }
-//}
-
 -(void)setAutoPagingForInterval:(NSTimeInterval)timeInterval{
     assert(timeInterval >= 0);
     if (self.autoPagingTimer.timeInterval == timeInterval) {

diff --git a/...odeproj/project.xcworkspace/xcuserdata/zhangao.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/zhangao.xcuserdatad/UserInterfaceState.xcuserstate