diff --git a/README.md b/README.md index c68893a..fee0d02 100644 --- a/README.md +++ b/README.md @@ -403,7 +403,7 @@ configuration.customSkipView = [self customSkipView]; @param urlArray image URL Array @param completedBlock 回调结果为一个字典数组,url:图片的url字符串,result:0表示该图片下载缓存失败,1表示该图片下载并缓存完成或本地缓存中已有该图片 */ -+(void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock; ++(void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock; /** * 批量下载并缓存视频(异步) - 已缓存的视频不会再次下载缓存 @@ -418,7 +418,7 @@ configuration.customSkipView = [self customSkipView]; @param urlArray 视频URL Array @param completedBlock 回调结果为一个字典数组,url:视频的url字符串,result:0表示该视频下载缓存失败,1表示该视频下载并缓存完成或本地缓存中已有该视频 */ -+(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock; ++(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock; ``` diff --git a/XHLaunchAd/XHLaunchAd/XHLaunchAd.h b/XHLaunchAd/XHLaunchAd/XHLaunchAd.h index 2f9bd34..232939f 100644 --- a/XHLaunchAd/XHLaunchAd/XHLaunchAd.h +++ b/XHLaunchAd/XHLaunchAd/XHLaunchAd.h @@ -158,7 +158,7 @@ NS_ASSUME_NONNULL_BEGIN @param urlArray image URL Array @param completedBlock 回调结果为一个字典数组,url:图片的url字符串,result:0表示该图片下载缓存失败,1表示该图片下载并缓存完成或本地缓存中已有该图片 */ -+(void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock; ++(void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock; /** * 批量下载并缓存视频(异步) - 已缓存的视频不会再次下载缓存 @@ -173,9 +173,9 @@ NS_ASSUME_NONNULL_BEGIN @param urlArray 视频URL Array @param completedBlock 回调结果为一个字典数组,url:视频的url字符串,result:0表示该视频下载缓存失败,1表示该视频下载并缓存完成或本地缓存中已有该视频 */ -+(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock; ++(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock; -#pragma mark - ction +#pragma mark - Action /** * 跳过按钮事件 */ diff --git a/XHLaunchAd/XHLaunchAd/XHLaunchAd.m b/XHLaunchAd/XHLaunchAd/XHLaunchAd.m index 1f5b356..75877a0 100644 --- a/XHLaunchAd/XHLaunchAd/XHLaunchAd.m +++ b/XHLaunchAd/XHLaunchAd/XHLaunchAd.m @@ -73,7 +73,7 @@ +(void)downLoadImageAndCacheWithURLArray:(NSArray * )urlArray { [self downLoadImageAndCacheWithURLArray:urlArray completed:nil]; } -+ (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock ++ (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock { if(urlArray.count==0) return; [[XHLaunchAdDownloader sharedDownloader] downLoadImageAndCacheWithURLArray:urlArray completed:completedBlock]; @@ -82,7 +82,7 @@ +(void)downLoadVideoAndCacheWithURLArray:(NSArray * )urlArray { [self downLoadVideoAndCacheWithURLArray:urlArray completed:nil]; } -+(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock ++(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock { if(urlArray.count==0) return; [[XHLaunchAdDownloader sharedDownloader] downLoadVideoAndCacheWithURLArray:urlArray completed:completedBlock]; diff --git a/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.h b/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.h index 7f6c723..5f43184 100644 --- a/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.h +++ b/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.h @@ -16,7 +16,7 @@ typedef void(^XHLaunchAdDownloadImageCompletedBlock)(UIImage *_Nullable image, N typedef void(^XHLaunchAdDownloadVideoCompletedBlock)(NSURL * _Nullable location, NSError * _Nullable error); -typedef void(^XHLaunchAdBatchDownLoadCompletedBlock) (NSArray * _Nonnull completedArray); +typedef void(^XHLaunchAdBatchDownLoadAndCacheCompletedBlock) (NSArray * _Nonnull completedArray); @protocol XHLaunchAdDownloadDelegate @@ -47,12 +47,12 @@ typedef void(^XHLaunchAdBatchDownLoadCompletedBlock) (NSArray * _Nonnull complet - (void)downloadImageWithURL:(nonnull NSURL *)url progress:(nullable XHLaunchAdDownloadProgressBlock)progressBlock completed:(nullable XHLaunchAdDownloadImageCompletedBlock)completedBlock; - (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray; -- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock; +- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock; - (void)downloadVideoWithURL:(nonnull NSURL *)url progress:(nullable XHLaunchAdDownloadProgressBlock)progressBlock completed:(nullable XHLaunchAdDownloadVideoCompletedBlock)completedBlock; - (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray; -- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock; +- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock; @end diff --git a/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.m b/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.m index 3ba8dec..29d7804 100644 --- a/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.m +++ b/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.m @@ -271,7 +271,7 @@ -(void)downLoadImageAndCacheWithURLArray:(NSArray *)urlArray { [self downLoadImageAndCacheWithURLArray:urlArray completed:nil]; } -- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock +- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock { if(urlArray.count==0) return; __block NSMutableArray * resultArray = [[NSMutableArray alloc] init]; @@ -335,7 +335,7 @@ - (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray { [self downLoadVideoAndCacheWithURLArray:urlArray completed:nil]; } -- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock +- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock { if(urlArray.count==0) return; __block NSMutableArray * resultArray = [[NSMutableArray alloc] init]; diff --git a/XHLaunchAdExample.xcodeproj/project.xcworkspace/xcuserdata/zhuxiaohui.xcuserdatad/UserInterfaceState.xcuserstate b/XHLaunchAdExample.xcodeproj/project.xcworkspace/xcuserdata/zhuxiaohui.xcuserdatad/UserInterfaceState.xcuserstate index 6540cda..344161c 100644 Binary files a/XHLaunchAdExample.xcodeproj/project.xcworkspace/xcuserdata/zhuxiaohui.xcuserdatad/UserInterfaceState.xcuserstate and b/XHLaunchAdExample.xcodeproj/project.xcworkspace/xcuserdata/zhuxiaohui.xcuserdatad/UserInterfaceState.xcuserstate differ