v3.6.1 - 1.增加清除指定图片/视频缓存接口,2.优化在iPhoneX上显示效果,3.已知问题优化与修复...

Author: CoderZhuXH

Class/WebViewController.m

@@ -9,13 +9,37 @@
 
 #import "WebViewController.h"
 #import <WebKit/WebKit.h>
+#import "XHLaunchAd.h"
+
 @interface WebViewController ()
 @property(nonatomic,strong)WKWebView *webView;
 @property (nonatomic, strong) UIProgressView *progressView;
 @end
 
 @implementation WebViewController
 
+-(void)dealloc
+{
+    /**
+     如果你设置了APP从后台恢复时也显示广告,
+     当用户停留在广告详情页时,APP从后台恢复时,你不想再次显示启动广告,
+     请在广告详情控制器销毁时,发下面通知,告诉XHLaunchAd,广告详情页面已显示完
+     */
+    [[NSNotificationCenter defaultCenter] postNotificationName:XHLaunchAdDetailPageShowFinishNotification object:nil];
+    
+    [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];
+}
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    /**
+     如果你设置了APP从后台恢复时也显示广告,
+     当用户停留在广告详情页时,APP从后台恢复时,你不想再次显示启动广告,
+     请在广告详情控制器将要显示时,发下面通知,告诉XHLaunchAd,广告详情页面将要显示
+     */
+    [[NSNotificationCenter defaultCenter] postNotificationName:XHLaunchAdDetailPageWillShowNotification object:nil];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.navigationItem.title = @"详情";
@@ -38,6 +62,11 @@ - (void)viewDidLoad {
     self.progressView.progressTintColor = [UIColor blackColor];
     [self.navigationController.view addSubview:self.progressView];
 }
+-(void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    [self.progressView removeFromSuperview];
+}
 -(void)back{
 
     if([_webView canGoBack])
@@ -49,13 +78,6 @@ -(void)back{
         [self.navigationController popViewControllerAnimated:YES];
     }
 }
-
--(void)viewWillDisappear:(BOOL)animated
-{
-    [super viewWillDisappear:animated];
-    [self.progressView removeFromSuperview];
-}
-
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context{
     if ([keyPath isEqualToString:@"estimatedProgress"]) {
 
@@ -73,10 +95,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
         [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
     }
 }
-- (void)dealloc{
-    
-    [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];
-}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

README.md

@@ -22,13 +22,15 @@
 * 9.自带图片/视频下载,缓存功能.
 * 10.支持预缓存图片及视频.
 * 11.支持设置完成动画.
-* 12.等等等...
+* 12.支持清除指定资源缓存.
+* 13.等等等...
 
 ### 技术交流群(群号:537476189).
 
 ### 更新记录:  
 
-*   2017.09.18 -- v3.6.0 -->1.优化图片解码方案,2.支持设置GIF动图是否循环播放
+*   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 -->增加几种显示完成的动画...
 *   2017.08.20 -- v3.5.6 -->已知问题修复及内存优化...
 *   2017.05.26 -- v3.5.4 -->修复横屏启动造成的界面问题...
@@ -240,6 +242,7 @@ configuration.customSkipView = [self customSkipView];
     [button setTitle:[NSString stringWithFormat:@"自定义%lds",duration] forState:UIControlStateNormal];
 }
 ```
+
 ### 5.预缓存接口(如果你需要提前下载并缓存广告图片或视频 请调用下面方法)
 ```objc
 /**
@@ -340,10 +343,24 @@ configuration.customSkipView = [self customSkipView];
 ```objc
 
 /**
- *  清除XHLaunch本地缓存
+ *  清除XHLaunch本地所有缓存
  */
 +(void)clearDiskCache;
 
+/**
+ 清除指定Url的图片本地缓存
+
+ @param imageUrlArray 图片Url数组
+ */
++(void)clearDiskCacheWithImageUrlArray:(NSArray<NSURL *> *)imageUrlArray;
+
+/**
+ 清除指定Url的视频本地缓存
+
+ @param videoUrlArray 视频url数组
+ */
++(void)clearDiskCacheWithVideoUrlArray:(NSArray<NSURL *> *)videoUrlArray;
+
 /**
  *  获取XHLaunch本地缓存大小(M)
  */
@@ -355,6 +372,7 @@ configuration.customSkipView = [self customSkipView];
 +(NSString *)xhLaunchAdCachePath;
 
 ```
+
 ##  依赖
 ####    1.本库依赖于:FLAnimatedImage
 

XHLaunchAd.podspec

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

XHLaunchAd/XHLaunchAd/XHLaunchAd.h

@@ -20,7 +20,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "XHLaunchAdConfiguration.h"
-
+#import "XHLaunchAdConst.h"
 
 NS_ASSUME_NONNULL_BEGIN
 @class XHLaunchAd;
@@ -159,7 +159,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 +(void)downLoadVideoAndCacheWithURLArray:(NSArray <NSURL *> * )urlArray;
 
-#pragma mark - skipAction
+#pragma mark - ction
 /**
  *  跳过按钮事件
  */
@@ -205,6 +205,20 @@ NS_ASSUME_NONNULL_BEGIN
  */
 +(void)clearDiskCache;
 
+/**
+ 清除指定Url的图片本地缓存
+
+ @param imageUrlArray 图片Url数组
+ */
++(void)clearDiskCacheWithImageUrlArray:(NSArray<NSURL *> *)imageUrlArray;
+
+/**
+ 清除指定Url的视频本地缓存
+
+ @param videoUrlArray 视频url数组
+ */
++(void)clearDiskCacheWithVideoUrlArray:(NSArray<NSURL *> *)videoUrlArray;
+
 /**
  *  获取XHLaunch本地缓存大小(M)
  */

XHLaunchAd/XHLaunchAd/XHLaunchAd.m

@@ -7,7 +7,6 @@
 //  代码地址:https://github.com/CoderZhuXH/XHLaunchAd
 
 #import "XHLaunchAd.h"
-#import "XHLaunchAdConst.h"
 #import "XHLaunchAdView.h"
 #import "XHLaunchAdImageView+XHLaunchAdCache.h"
 #import "XHLaunchAdDownloader.h"
@@ -35,6 +34,7 @@ @interface XHLaunchAd()
 @property(nonatomic,strong)UIWindow * window;
 @property(nonatomic,copy)dispatch_source_t waitDataTimer;
 @property(nonatomic,copy)dispatch_source_t skipTimer;
+@property (nonatomic, assign) BOOL detailPageShowing;
 
 @end
 
@@ -83,6 +83,7 @@ +(void)skipAction
 {
     [[XHLaunchAd shareLaunchAd] adSkipButtonClick];
 }
+
 +(BOOL)checkImageInCacheWithURL:(NSURL *)url
 {
     return [XHLaunchAdCache checkImageInCacheWithURL:url];
@@ -97,6 +98,16 @@ +(void)clearDiskCache
     [XHLaunchAdCache clearDiskCache];
 }
 
++(void)clearDiskCacheWithImageUrlArray:(NSArray<NSURL *> *)imageUrlArray
+{
+    [XHLaunchAdCache clearDiskCacheWithImageUrlArray:imageUrlArray];
+}
+
++(void)clearDiskCacheWithVideoUrlArray:(NSArray<NSURL *> *)videoUrlArray
+{
+    [XHLaunchAdCache clearDiskCacheWithVideoUrlArray:videoUrlArray];
+}
+
 +(float)diskCacheSize
 {
     return [XHLaunchAdCache diskCacheSize];
@@ -139,6 +150,19 @@ - (instancetype)init
 
         }];
 
+        
+        [[NSNotificationCenter defaultCenter] addObserverForName:XHLaunchAdDetailPageWillShowNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+            
+            _detailPageShowing = YES;
+            
+        }];
+        
+        [[NSNotificationCenter defaultCenter] addObserverForName:XHLaunchAdDetailPageShowFinishNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+           
+            _detailPageShowing = NO;
+            
+        }];
+        
     }
     return self;
 }
@@ -148,14 +172,14 @@ -(void)setupLaunchAdEnterForeground
     switch (_launchAdType) {
         case XHLaunchAdTypeImage:
         {
-            if(!_imageAdConfiguration.showEnterForeground) return;
+            if(!_imageAdConfiguration.showEnterForeground || _detailPageShowing) return;
             [self setupLaunchAd];
             [self setupImageAdForConfiguration:_imageAdConfiguration];
         }
             break;
         case XHLaunchAdTypeVideo:
         {
-            if(!_videoAdConfiguration.showEnterForeground) return;
+            if(!_videoAdConfiguration.showEnterForeground || _detailPageShowing) return;
             [self setupLaunchAd];
             [self setupVideoAdForConfiguration:_videoAdConfiguration];
         }
@@ -283,7 +307,8 @@ -(void)addSkipButtonForConfiguration:(XHLaunchAdConfiguration *)configuration
 
         if(_adSkipButton == nil){
 
-            _adSkipButton = [[XHLaunchAdButton alloc] initWithFrame:CGRectMake([UIScreen mainScreen].bounds.size.width-80,20, 70, 35)];
+            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;
@@ -417,7 +442,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];

XHLaunchAd/XHLaunchAd/XHLaunchAdCache.h

@@ -136,10 +136,24 @@ typedef void(^VideoSaveCompletionBlock)(BOOL result , NSURL * pathURL);
 + (NSString *)xhLaunchAdCachePath;
 
 /**
- *  清除XHLaunch本地缓存
+ *  清除XHLaunch本地所有缓存
  */
 +(void)clearDiskCache;
 
+/**
+ 清除指定Url的图片本地缓存
+ 
+ @param imageUrlArray 图片Url数组
+ */
++(void)clearDiskCacheWithImageUrlArray:(NSArray<NSURL *> *)imageUrlArray;
+
+/**
+ 清除指定Url的视频本地缓存
+ 
+ @param videoUrlArray 视频url数组
+ */
++(void)clearDiskCacheWithVideoUrlArray:(NSArray<NSURL *> *)videoUrlArray;
+
 /**
  *  获取XHLaunch本地缓存大小(M)
  */

XHLaunchAd/XHLaunchAd/XHLaunchAdCache.m

@@ -159,6 +159,39 @@ +(void)clearDiskCache
     });
 
 }
++(void)clearDiskCacheWithImageUrlArray:(NSArray<NSURL *> *)imageUrlArray
+{
+    if(imageUrlArray.count==0) return;
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        [imageUrlArray enumerateObjectsUsingBlock:^(NSURL * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            
+            if([self checkImageInCacheWithURL:obj])
+            {
+                [[NSFileManager defaultManager] removeItemAtPath:[self imagePathWithURL:obj] error:nil];
+            }
+        }];
+    
+    });
+}
+
++(void)clearDiskCacheWithVideoUrlArray:(NSArray<NSURL *> *)videoUrlArray
+{
+    if(videoUrlArray.count==0) return;
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        [videoUrlArray enumerateObjectsUsingBlock:^(NSURL * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            
+            if([self checkVideoInCacheWithURL:obj])
+            {
+                [[NSFileManager defaultManager] removeItemAtPath:[self videoPathWithURL:obj] error:nil];
+            }
+        }];
+        
+    });
+}
 
 +(float)diskCacheSize
 {

XHLaunchAd/XHLaunchAd/XHLaunchAdConst.h

@@ -66,14 +66,17 @@ time = nil;\
 view = nil;\
 }
 
+#define XH_IPHONEX  ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
+
 #define XHVideoName(string) [XHMd5String(string) stringByAppendingString:@".mp4"]
 #define XHISURLString(string)  ([string hasPrefix:@"https://"] || [string hasPrefix:@"http://"]) ? YES:NO
 #define XHStringContainsSubString(string,subString)  ([string rangeOfString:subString].location == NSNotFound) ? NO:YES
 
-
 UIKIT_EXTERN NSString *const XHCacheImageUrlStringKey;
 UIKIT_EXTERN NSString *const XHCacheVideoUrlStringKey;
 
+UIKIT_EXTERN NSString *const XHLaunchAdDetailPageWillShowNotification;
+UIKIT_EXTERN NSString *const XHLaunchAdDetailPageShowFinishNotification;
 
 
 

XHLaunchAd/XHLaunchAd/XHLaunchAdConst.m

@@ -8,6 +8,8 @@
 
 #import "XHLaunchAdConst.h"
 
-
 NSString *const XHCacheImageUrlStringKey = @"XHCacheImageUrlStringKey";
 NSString *const XHCacheVideoUrlStringKey = @"XHCacheVideoUrlStringKey";
+
+NSString *const XHLaunchAdDetailPageWillShowNotification = @"XHLaunchAdDetailPageWillShowNotification";
+NSString *const XHLaunchAdDetailPageShowFinishNotification = @"XHLaunchAdDetailPageShowFinishNotification";

XHLaunchAd/XHLaunchAd/XHLaunchAdView.m

@@ -20,10 +20,9 @@ - (id)init
 
         self.userInteractionEnabled = YES;
         self.frame = [UIScreen mainScreen].bounds;
-        
+        self.layer.masksToBounds = YES;
         UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap:)];
         [self addGestureRecognizer:tapGesture];
-
     }
     return self;
 }