v3.7.1 - 批量缓存接口增加结果回调

CoderZhuXH · CoderZhuXH · commit 3618668f5d8f · 2017-10-11T23:55:34.000+08:00
diff --git 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 <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock;
++(void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )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 <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock;
++(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock;
 
 ```
 
diff --git 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 <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock;
++(void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )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 <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock;
++(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock;
 
-#pragma mark - ction
+#pragma mark - Action
 /**
  *  跳过按钮事件
  */
diff --git a/XHLaunchAd/XHLaunchAd/XHLaunchAd.m b/XHLaunchAd/XHLaunchAd/XHLaunchAd.m
@@ -73,7 +73,7 @@ +(void)downLoadImageAndCacheWithURLArray:(NSArray <NSURL *> * )urlArray
 {
     [self downLoadImageAndCacheWithURLArray:urlArray completed:nil];
 }
-+ (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock
++ (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock
 {
     if(urlArray.count==0) return;
     [[XHLaunchAdDownloader sharedDownloader] downLoadImageAndCacheWithURLArray:urlArray completed:completedBlock];
@@ -82,7 +82,7 @@ +(void)downLoadVideoAndCacheWithURLArray:(NSArray <NSURL *> * )urlArray
 {
     [self downLoadVideoAndCacheWithURLArray:urlArray completed:nil];
 }
-+(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock
++(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )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
@@ -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 <NSObject>
@@ -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 <NSURL *> * )urlArray;
-- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock;
+- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock;
 
 - (void)downloadVideoWithURL:(nonnull NSURL *)url progress:(nullable XHLaunchAdDownloadProgressBlock)progressBlock completed:(nullable XHLaunchAdDownloadVideoCompletedBlock)completedBlock;
 
 - (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray;
-- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock;
+- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock;
 
 @end
 
diff --git a/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.m b/XHLaunchAd/XHLaunchAd/XHLaunchAdDownloader.m
@@ -271,7 +271,7 @@ -(void)downLoadImageAndCacheWithURLArray:(NSArray<NSURL *> *)urlArray
 {
     [self downLoadImageAndCacheWithURLArray:urlArray completed:nil];
 }
-- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock
+- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock
 {
     if(urlArray.count==0) return;
     __block NSMutableArray * resultArray = [[NSMutableArray alloc] init];
@@ -335,7 +335,7 @@ - (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray
 {
     [self downLoadVideoAndCacheWithURLArray:urlArray completed:nil];
 }
-- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock
+- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL *> * )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

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ +(void)downLoadImageAndCacheWithURLArray:(NSArray <NSURL > )urlArray`
`73`	`73`	`{`
`74`	`74`	`[self downLoadImageAndCacheWithURLArray:urlArray completed:nil];`
`75`	`75`	`}`
`76`		`-+ (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock`
	`76`	`++ (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock`
`77`	`77`	`{`
`78`	`78`	`if(urlArray.count==0) return;`
`79`	`79`	`[[XHLaunchAdDownloader sharedDownloader] downLoadImageAndCacheWithURLArray:urlArray completed:completedBlock];`
`@@ -82,7 +82,7 @@ +(void)downLoadVideoAndCacheWithURLArray:(NSArray <NSURL > )urlArray`
`82`	`82`	`{`
`83`	`83`	`[self downLoadVideoAndCacheWithURLArray:urlArray completed:nil];`
`84`	`84`	`}`
`85`		`-+(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock`
	`85`	`++(void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock`
`86`	`86`	`{`
`87`	`87`	`if(urlArray.count==0) return;`
`88`	`88`	`[[XHLaunchAdDownloader sharedDownloader] downLoadVideoAndCacheWithURLArray:urlArray completed:completedBlock];`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ -(void)downLoadImageAndCacheWithURLArray:(NSArray<NSURL > )urlArray`
`271`	`271`	`{`
`272`	`272`	`[self downLoadImageAndCacheWithURLArray:urlArray completed:nil];`
`273`	`273`	`}`
`274`		`-- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock`
	`274`	`+- (void)downLoadImageAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock`
`275`	`275`	`{`
`276`	`276`	`if(urlArray.count==0) return;`
`277`	`277`	`__block NSMutableArray * resultArray = [[NSMutableArray alloc] init];`
`@@ -335,7 +335,7 @@ - (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray`
`335`	`335`	`{`
`336`	`336`	`[self downLoadVideoAndCacheWithURLArray:urlArray completed:nil];`
`337`	`337`	`}`
`338`		`-- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray completed:(nullable XHLaunchAdBatchDownLoadCompletedBlock)completedBlock`
	`338`	`+- (void)downLoadVideoAndCacheWithURLArray:(nonnull NSArray <NSURL > )urlArray completed:(nullable XHLaunchAdBatchDownLoadAndCacheCompletedBlock)completedBlock`
`339`	`339`	`{`
`340`	`340`	`if(urlArray.count==0) return;`
`341`	`341`	`__block NSMutableArray * resultArray = [[NSMutableArray alloc] init];`