v3.7.0 - 1.增加几种清除缓存的接口,2.增加几种倒计时按钮类型,3.已知问题优化与修复...

Author: CoderZhuXH

README.md

@@ -29,6 +29,7 @@
 
 ### 更新记录:  
 
+*   2017.10.09 -- v3.7.0 -->1.增加几种清除缓存的接口,2.增加几种倒计时按钮类型,3.已知问题优化与修复...
 *   2017.09.29 -- v3.6.1 -->1.增加清除指定图片/视频缓存接口,2.优化在iPhoneX上显示效果,3.已知问题优化与修复...
 *   2017.09.18 -- v3.6.0 -->1.优化图片解码方案,2.支持设置GIF动图是否循环播放...
 *   2017.09.13 -- v3.5.8 -->增加几种显示完成的动画...

XHLaunchAd.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "XHLaunchAd"
-  s.version      = "3.6.1"
+  s.version      = "3.7.0"
   s.summary      = "The screen opening advertising solutions -开屏广告、启动广告解决方案,支持图片/视频、静态/动态、全屏/半屏广告,支持iPhone/iPad,自带图片下载、缓存功能"
   s.homepage     = "https://github.com/CoderZhuXH/XHLaunchAd"
   s.license      = { :type => "MIT", :file => "LICENSE" }

XHLaunchAd/XHLaunchAd/XHLaunchAd.h

@@ -6,8 +6,8 @@
 //  Copyright © 2016年 it7090.com. All rights reserved.
 //  代码地址:https://github.com/CoderZhuXH/XHLaunchAd
 
-//  版本:3.6.1
-//  发布:2017.09.29
+//  版本:3.7.0
+//  发布:2017.10.09
 
 //  如果你在使用过程中出现bug,请及时以下面任意一种方式联系我，我会及时修复bug并帮您解决问题。
 //  QQ交流群:537476189
@@ -101,7 +101,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,assign) id<XHLaunchAdDelegate> delegate;
 
 /**
- *  设置等待数据源时间(default 3)
+ *  设置等待数据源时间(建议值:3)
  *
  *  @param waitDataDuration waitDataDuration
  */
@@ -146,14 +146,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - 如果你需要提前下载并缓存广告图片或视频 请调用下面方法
 /**
- *  批量下载并缓存image(异步)
+ *  批量下载并缓存image(异步) - 已缓存的image不会再次下载缓存
  *
  *  @param urlArray image URL Array
  */
 +(void)downLoadImageAndCacheWithURLArray:(NSArray <NSURL *> * )urlArray;
 
 /**
- *  批量下载并缓存视频(异步)
+ *  批量下载并缓存视频(异步) - 已缓存的视频不会再次下载缓存
  *
  *  @param urlArray 视频URL Array
  */
@@ -199,26 +199,40 @@ NS_ASSUME_NONNULL_BEGIN
  */
 +(NSString *)cacheVideoURLString;
 
-#pragma mark - 缓存清除及大小
+#pragma mark - 缓存相关
 /**
- *  清除XHLaunch本地缓存
+ *  清除XHLaunchAd本地所有缓存(异步)
  */
 +(void)clearDiskCache;
 
 /**
- 清除指定Url的图片本地缓存
+ 清除指定Url的图片本地缓存(异步)
 
- @param imageUrlArray 图片Url数组
+ @param imageUrlArray 需要清除缓存的图片Url数组
  */
 +(void)clearDiskCacheWithImageUrlArray:(NSArray<NSURL *> *)imageUrlArray;
 
 /**
- 清除指定Url的视频本地缓存
+ 清除指定Url除外的图片本地缓存(异步)
+ 
+ @param exceptImageUrlArray 不需要清除缓存的图片Url数组,此url数组的图片缓存将被保留
+ */
++(void)clearDiskCacheExceptImageUrlArray:(NSArray<NSURL *> *)exceptImageUrlArray;
+
+/**
+ 清除指定Url的视频本地缓存(异步)
 
- @param videoUrlArray 视频url数组
+ @param videoUrlArray 需要清除缓存的视频url数组
  */
 +(void)clearDiskCacheWithVideoUrlArray:(NSArray<NSURL *> *)videoUrlArray;
 
+/**
+ 清除指定Url除外的视频本地缓存(异步)
+ 
+ @param exceptVideoUrlArray 不需要清除缓存的视频Url数组,此url数组的视频缓存将被保留
+ */
++(void)clearDiskCacheExceptVideoUrlArray:(NSArray<NSURL *> *)exceptVideoUrlArray;
+
 /**
  *  获取XHLaunch本地缓存大小(M)
  */

XHLaunchAd/XHLaunchAd/XHLaunchAd.m

@@ -29,7 +29,7 @@ @interface XHLaunchAd()
 @property(nonatomic,assign)NSInteger waitDataDuration;
 @property(nonatomic,strong)XHLaunchImageAdConfiguration * imageAdConfiguration;
 @property(nonatomic,strong)XHLaunchVideoAdConfiguration * videoAdConfiguration;
-@property(nonatomic,strong)XHLaunchAdButton * adSkipButton;
+@property(nonatomic,strong)XHLaunchAdButton * skipButton;
 @property(nonatomic,strong)XHLaunchAdVideoView * adVideoView;
 @property(nonatomic,strong)UIWindow * window;
 @property(nonatomic,copy)dispatch_source_t waitDataTimer;
@@ -103,11 +103,21 @@ +(void)clearDiskCacheWithImageUrlArray:(NSArray<NSURL *> *)imageUrlArray
     [XHLaunchAdCache clearDiskCacheWithImageUrlArray:imageUrlArray];
 }
 
++(void)clearDiskCacheExceptImageUrlArray:(NSArray<NSURL *> *)exceptImageUrlArray
+{
+    [XHLaunchAdCache clearDiskCacheExceptImageUrlArray:exceptImageUrlArray];
+}
+
 +(void)clearDiskCacheWithVideoUrlArray:(NSArray<NSURL *> *)videoUrlArray
 {
     [XHLaunchAdCache clearDiskCacheWithVideoUrlArray:videoUrlArray];
 }
 
++(void)clearDiskCacheExceptVideoUrlArray:(NSArray<NSURL *> *)exceptVideoUrlArray
+{
+    [XHLaunchAdCache clearDiskCacheExceptVideoUrlArray:exceptVideoUrlArray];
+}
+
 +(float)diskCacheSize
 {
     return [XHLaunchAdCache diskCacheSize];
@@ -158,7 +168,7 @@ - (instancetype)init
         }];
 
         [[NSNotificationCenter defaultCenter] addObserverForName:XHLaunchAdDetailPageShowFinishNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
-           
+            
             _detailPageShowing = NO;
 
         }];
@@ -279,11 +289,11 @@ -(void)setupImageAdForConfiguration:(XHLaunchImageAdConfiguration *)configuratio
 
     }
 
-    [self startSkipDispathTimer];
-    
     /** skipButton */
     [self addSkipButtonForConfiguration:configuration];
 
+    [self startSkipDispathTimer];
+
     /** customView */
     if(configuration.subViews.count>0)  [self addSubViews:configuration.subViews];
 
@@ -305,19 +315,16 @@ -(void)addSkipButtonForConfiguration:(XHLaunchAdConfiguration *)configuration
 
     }else{
 
-        if(_adSkipButton == nil){
-            
-            CGFloat y = XH_IPHONEX ? 44 : 20;
-            _adSkipButton = [[XHLaunchAdButton alloc] initWithFrame:CGRectMake([UIScreen mainScreen].bounds.size.width-80,y, 70, 35)];
-            _adSkipButton.hidden = YES;
-            [_adSkipButton addTarget:self action:@selector(adSkipButtonClick) forControlEvents:UIControlEventTouchUpInside];
-            _adSkipButton.leftRightSpace = 5;
-            _adSkipButton.topBottomSpace = 2.5;
+        if(_skipButton == nil){
 
+            _skipButton = [[XHLaunchAdButton alloc] initWithSkipType:configuration.skipButtonType];
+            _skipButton.hidden = YES;
+            [_skipButton addTarget:self action:@selector(adSkipButtonClick) forControlEvents:UIControlEventTouchUpInside];
         }
 
-        [_window addSubview:_adSkipButton];
-        [_adSkipButton stateWithSkipType:configuration.skipButtonType andDuration:configuration.duration];
+        [_window addSubview:_skipButton];
+        [_skipButton setTitleWithSkipType:configuration.skipButtonType duration:configuration.duration];
+        
     }
 }
 
@@ -391,11 +398,11 @@ -(void)setupVideoAdForConfiguration:(XHLaunchVideoAdConfiguration *)configuratio
         }
     }
 
-    [self startSkipDispathTimer];
-    
     /** skipButton */
     [self addSkipButtonForConfiguration:configuration];
 
+    [self startSkipDispathTimer];
+
     /** customView */
     if(configuration.subViews.count>0) [self addSubViews:configuration.subViews];
 
@@ -442,7 +449,7 @@ -(void)click
     XHLaunchAdConfiguration * configuration = [self commonConfiguration];
 
     if ([self.delegate respondsToSelector:@selector(xhLaunchAd:clickAndOpenURLString:)] && configuration.openURLString.length) {
-
+        
         [self.delegate xhLaunchAd:self clickAndOpenURLString:configuration.openURLString];
 
         [self removeAndAnimateDefault];
@@ -469,9 +476,8 @@ -(void)startWaitDataDispathTiemr
 {
     __block NSInteger duration = defaultWaitDataDuration;
     if(_waitDataDuration) duration = _waitDataDuration;
+    _waitDataTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
     NSTimeInterval period = 1.0;
-    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-    _waitDataTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
     dispatch_source_set_timer(_waitDataTimer, dispatch_walltime(NULL, 0), period * NSEC_PER_SEC, 0);
     dispatch_source_set_event_handler(_waitDataTimer, ^{
 
@@ -496,9 +502,12 @@ -(void)startSkipDispathTimer
     if(!configuration.skipButtonType) configuration.skipButtonType = SkipTypeTimeText;//默认
     __block NSInteger duration = 5;//默认
     if(configuration.duration) duration = configuration.duration;
+    if(configuration.skipButtonType == SkipTypeRoundProgressTime || configuration.skipButtonType == SkipTypeRoundProgressText)
+    {
+        [_skipButton startRoundDispathTimerWithDuration:duration];
+    }
     NSTimeInterval period = 1.0;
-    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-    _skipTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, queue);
+    _skipTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
     dispatch_source_set_timer(_skipTimer, dispatch_walltime(NULL, 0), period * NSEC_PER_SEC, 0);
     dispatch_source_set_event_handler(_skipTimer, ^{
 
@@ -510,13 +519,14 @@ -(void)startSkipDispathTimer
             }
             if(!configuration.customSkipView){
 
-                [_adSkipButton stateWithSkipType:configuration.skipButtonType andDuration:duration];
+                [_skipButton setTitleWithSkipType:configuration.skipButtonType duration:duration];
             }
             if(duration==0){
 
                 DISPATCH_SOURCE_CANCEL_SAFE(_skipTimer);
                 [self removeAndAnimate]; return ;
             }
+            
             duration--;
         });
     });
@@ -606,7 +616,7 @@ -(void)remove{
 
     DISPATCH_SOURCE_CANCEL_SAFE(_waitDataTimer)
     DISPATCH_SOURCE_CANCEL_SAFE(_skipTimer)
-    REMOVE_FROM_SUPERVIEW_SAFE(_adSkipButton)
+    REMOVE_FROM_SUPERVIEW_SAFE(_skipButton)
     if(_launchAdType==XHLaunchAdTypeVideo){
 
         if(_adVideoView==nil) return;

XHLaunchAd/XHLaunchAd/XHLaunchAdButton.h

@@ -14,18 +14,23 @@
 typedef NS_ENUM(NSInteger,SkipType) {
 
     SkipTypeNone      = 1,//无
-    SkipTypeTime      = 2,//倒计时
-    SkipTypeText      = 3,//跳过
-    SkipTypeTimeText  = 4,//倒计时+跳过
 
+    /** 方形 */
+    SkipTypeTime      = 2,//方形:倒计时
+    SkipTypeText      = 3,//方形:跳过
+    SkipTypeTimeText  = 4,//方形:倒计时+跳过 (default)
+    
+    /** 圆形 */
+    SkipTypeRoundTime = 5,//圆形:倒计时
+    SkipTypeRoundText = 6,//圆形:跳过
+    SkipTypeRoundProgressTime = 7,//圆形:进度圈+倒计时
+    SkipTypeRoundProgressText = 8,//圆形:进度圈+跳过
 };
 
 @interface XHLaunchAdButton : UIButton
 
-@property(nonatomic,strong)UILabel *timeLab;
-@property(nonatomic,assign)CGFloat leftRightSpace;
-@property(nonatomic,assign)CGFloat topBottomSpace;
-
--(void)stateWithSkipType:(SkipType)skipType andDuration:(NSInteger)duration;
+- (instancetype)initWithSkipType:(SkipType)skipType;
+-(void)startRoundDispathTimerWithDuration:(CGFloat )duration;
+- (void)setTitleWithSkipType:(SkipType)skipType duration:(NSInteger)duration;
 
 @end