v3.5.8-增加几种显示完成动画...

Author: CoderZhuXH

README.md

@@ -28,6 +28,7 @@
 
 ### 更新记录:  
 
+*   2017.09.13 -- v3.5.8 -->增加几种显示完成的动画...
 *   2017.08.20 -- v3.5.6 -->已知问题修复及内存优化...
 *   2017.05.26 -- v3.5.4 -->修复横屏启动造成的界面问题...
 *   2017.05.02 -- v3.5.0 -->Gif动图占用内存优化...

XHLaunchAd.podspec

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

XHLaunchAd/XHLaunchAd.h

@@ -6,8 +6,8 @@
 //  Copyright © 2016年 it7090.com. All rights reserved.
 //  代码地址:https://github.com/CoderZhuXH/XHLaunchAd
 
-//  版本:3.5.7
-//  发布:2017.09.02
+//  版本:3.5.8
+//  发布:2017.09.13
 
 //  如果你在使用过程中出现bug,请及时以下面任意一种方式联系我，我会及时修复bug并帮您解决问题。
 //  QQ交流群:537476189

XHLaunchAd/XHLaunchAd.m

@@ -158,14 +158,14 @@ - (instancetype)init
 -(void)setupLaunchAdEnterForeground
 {
     switch (_launchAdType) {
-            case XHLaunchAdTypeImage:
+        case XHLaunchAdTypeImage:
         {
             if(!_imageAdConfiguration.showEnterForeground) return;
             [self setupLaunchAd];
             [self setupImageAdForConfiguration:_imageAdConfiguration];
         }
             break;
-            case XHLaunchAdTypeVideo:
+        case XHLaunchAdTypeVideo:
         {
             if(!_videoAdConfiguration.showEnterForeground) return;
             [self setupLaunchAd];
@@ -426,10 +426,10 @@ -(XHLaunchAdConfiguration *)commonConfiguration
 {
     XHLaunchAdConfiguration *configuration = nil;
     switch (_launchAdType) {
-            case XHLaunchAdTypeVideo:
+        case XHLaunchAdTypeVideo:
             configuration = _videoAdConfiguration;
             break;
-            case XHLaunchAdTypeImage:
+        case XHLaunchAdTypeImage:
             configuration = _imageAdConfiguration;
             break;
         default:
@@ -499,37 +499,80 @@ -(void)removeAndAnimate{
 
     XHLaunchAdConfiguration * configuration = [self commonConfiguration];
 
-    if(!configuration.showFinishAnimate) configuration.showFinishAnimate = ShowFinishAnimateFadein;
+    CGFloat duration = showFinishAnimateTimeDefault;
+    if(configuration.showFinishAnimateTime>0) duration = configuration.showFinishAnimateTime;
 
-    if(configuration.showFinishAnimate == ShowFinishAnimateLite)
-    {
-        CGFloat duration = showFinishAnimateTimeDefault;
-        if(configuration.showFinishAnimateTime>0) duration = configuration.showFinishAnimateTime;
-        [UIView animateWithDuration:duration animations:^{
+    switch (configuration.showFinishAnimate) {
+            
+        case ShowFinishAnimateNone:{
 
-            [UIView setAnimationCurve:UIViewAnimationCurveEaseOut];
-            _window.transform=CGAffineTransformMakeScale(2.f, 2.f);
-            _window.alpha = 0;
-        } completion:^(BOOL finished) {
-            [self remove];
-        }];
-    }
-    else if(configuration.showFinishAnimate == ShowFinishAnimateFadein)
-    {
-        CGFloat duration = showFinishAnimateTimeDefault;
-        if(configuration.showFinishAnimateTime>0) duration = configuration.showFinishAnimateTime;
-        [UIView animateWithDuration:duration animations:^{
-            _window.alpha = 0;
-        } completion:^(BOOL finished) {
             [self remove];
-        }];
+        }
+            break;
+        case ShowFinishAnimateFadein:{
+            
+            [self removeAndAnimateDefault];
+        }
+            break;
+        case ShowFinishAnimateLite:{
+            
+            [UIView transitionWithView:_window duration:duration options:UIViewAnimationOptionCurveEaseOut animations:^{
+                _window.transform = CGAffineTransformMakeScale(1.5, 1.5);
+                _window.alpha = 0;
+            } completion:^(BOOL finished) {
+                [self remove];
+            }];
+            
+        }
+            break;
+        case ShowFinishAnimateFlipFromLeft:{
+            
+            [UIView transitionWithView:_window duration:duration options:UIViewAnimationOptionTransitionFlipFromLeft animations:^{
+                _window.alpha = 0;
+            } completion:^(BOOL finished) {
+                [self remove];
+            }];
+            
+        }
+            break;
+        case ShowFinishAnimateFlipFromBottom:{
+            
+            [UIView transitionWithView:_window duration:duration options:UIViewAnimationOptionTransitionFlipFromBottom animations:^{
+                _window.alpha = 0;
+            } completion:^(BOOL finished) {
+                [self remove];
+            }];
+            
+        }
+            break;
+        case ShowFinishAnimateCurlUp:{
+            
+            [UIView transitionWithView:_window duration:duration options:UIViewAnimationOptionTransitionCurlUp animations:^{
+                _window.alpha = 0;
+            } completion:^(BOOL finished) {
+                [self remove];
+            }];
+            
+        }
+            break;
+        default:{
+            
+            [self removeAndAnimateDefault];
+        }
+            break;
     }
-    else
-    {
+}
+-(void)removeAndAnimateDefault
+{
+    XHLaunchAdConfiguration * configuration = [self commonConfiguration];
+    CGFloat duration = showFinishAnimateTimeDefault;
+    if(configuration.showFinishAnimateTime>0) duration = configuration.showFinishAnimateTime;
+    [UIView transitionWithView:_window duration:duration options:UIViewAnimationOptionTransitionNone animations:^{
+        _window.alpha = 0;
+    } completion:^(BOOL finished) {
         [self remove];
-    }
+    }];
 }
-
 -(void)remove{
 
     DISPATCH_SOURCE_CANCEL_SAFE(_waitDataTimer)
@@ -553,14 +596,7 @@ -(void)remove{
         [self.delegate xhLaunchShowFinish:self];
     }
 }
--(void)removeAndAnimateDefault
-{
-    [UIView animateWithDuration:0.3 animations:^{
-        _window.alpha = 0;
-    } completion:^(BOOL finished) {
-        [self remove];
-    }];
-}
+
 -(void)removeSubViewsExceptLaunchAdImageView
 {
     [_window.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {

XHLaunchAd/XHLaunchAdConfiguration.h

@@ -14,27 +14,29 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-//显示完成动画时间默认时间
+/** 显示完成动画时间默认时间 */
 static CGFloat const showFinishAnimateTimeDefault = 0.8;
 
-/**
- *  显示完成动画
- */
+/** 显示完成动画类型 */
 typedef NS_ENUM(NSInteger , ShowFinishAnimate) {
 
-    /**
-     *  无
-     */
+    /** 无动画 */
     ShowFinishAnimateNone = 1,
-    /**
-     *  普通淡入(default)
-     */
+    
+    /** 普通淡入(default) */
     ShowFinishAnimateFadein = 2,
-    /**
-     *  放大淡入
-     */
-    ShowFinishAnimateLite = 3
 
+    /** 放大淡入 */
+    ShowFinishAnimateLite = 3,
+    
+    /** 左右翻转(类似网易云音乐) */
+    ShowFinishAnimateFlipFromLeft = 4,
+    
+    /** 下上翻转 */
+    ShowFinishAnimateFlipFromBottom = 5,
+    
+    /** 向上翻页 */
+    ShowFinishAnimateCurlUp = 6,
 };
 
 #pragma mark - 公共属性
@@ -81,7 +83,7 @@ typedef NS_ENUM(NSInteger , ShowFinishAnimate) {
 @property(nonatomic,strong) UIView *customSkipView;
 
 /**
- *  子视图(若定义此属性,这些视图将会被自动添加在广告视图上)
+ *  子视图(若定义此属性,这些视图将会被自动添加在广告视图上,frame相对于window)
  */
 @property(nonatomic,copy,nullable) NSArray<UIView *> *subViews;
 

XHLaunchAd/XHLaunchAdConfiguration.m

@@ -11,10 +11,8 @@
 #pragma mark - 公共
 @implementation XHLaunchAdConfiguration
 
-
 @end
 
-
 #pragma mark - 图片广告相关
 @implementation XHLaunchImageAdConfiguration
 

XHLaunchAd/XHLaunchAdImage.m

@@ -197,7 +197,7 @@ - (id)initWithCGImageSource:(CGImageSourceRef)imageSource scale:(CGFloat)scale
     //});
 
     _scale = scale;
-    readFrameQueue = dispatch_queue_create("com.it7090.gifreadframe", DISPATCH_QUEUE_SERIAL);
+    readFrameQueue = dispatch_queue_create("com.ronnie.gifreadframe", DISPATCH_QUEUE_SERIAL);
 
     return self;
 }

XHLaunchAd/XHLaunchAdImageManager.h

@@ -29,7 +29,7 @@ typedef NS_OPTIONS(NSUInteger, XHLaunchAdImageOptions) {
     XHLaunchAdImageRefreshCached = 1 << 2 ,
 
     /**
-     *  后台缓存本次不显示,缓存OK后下次再显示
+     *  后台缓存本次不显示,缓存OK后下次再显示(建议使用这种方式)
      */
     XHLaunchAdImageCacheInBackground = 1 << 3
 

XHLaunchAdExample/XHLaunchAdManager.m

@@ -16,18 +16,19 @@
 #import "WebViewController.h"
 
 
-//静态图
+/** 以下连接供测试使用 */
+/** 静态图 */
 #define imageURL1 @"http://c.hiphotos.baidu.com/image/pic/item/4d086e061d950a7b78c4e5d703d162d9f2d3c934.jpg"
 #define imageURL2 @"http://d.hiphotos.baidu.com/image/pic/item/f7246b600c3387444834846f580fd9f9d72aa034.jpg"
 #define imageURL3 @"http://d.hiphotos.baidu.com/image/pic/item/64380cd7912397dd624a32175082b2b7d0a287f6.jpg"
 #define imageURL4 @"http://d.hiphotos.baidu.com/image/pic/item/14ce36d3d539b60071473204e150352ac75cb7f3.jpg"
 
-//动态图
+/** 动态图 */
 #define imageURL5 @"http://c.hiphotos.baidu.com/image/pic/item/d62a6059252dd42a6a943c180b3b5bb5c8eab8e7.jpg"
 #define imageURL6 @"http://p1.bqimg.com/567571/4ce1a4c844b09201.gif"
 #define imageURL7 @"http://p1.bqimg.com/567571/23a4bc7a285c1179.gif"
 
-//视频链接
+/** 视频链接 */
 #define videoURL1 @"http://ohnzw6ag6.bkt.clouddn.com/video0.mp4"
 #define videoURL2  @"http://120.25.226.186:32812/resources/videos/minion_01.mp4"
 #define videoURL3 @"http://ohnzw6ag6.bkt.clouddn.com/video1.mp4"
@@ -131,7 +132,7 @@ -(void)example01
         //广告点击打开链接
         imageAdconfiguration.openURLString = model.openUrl;
         //广告显示完成动画
-        imageAdconfiguration.showFinishAnimate =ShowFinishAnimateFadein;
+        imageAdconfiguration.showFinishAnimate =ShowFinishAnimateLite;
         //广告显示完成动画时间
         imageAdconfiguration.showFinishAnimateTime = 0.8;
         //跳过按钮类型
@@ -170,7 +171,7 @@ -(void)example02
     //广告点击打开链接
     imageAdconfiguration.openURLString = @"http://www.it7090.com";
     //广告显示完成动画
-    imageAdconfiguration.showFinishAnimate =ShowFinishAnimateFadein;
+    imageAdconfiguration.showFinishAnimate =ShowFinishAnimateFlipFromLeft;
     //广告显示完成动画时间
     imageAdconfiguration.showFinishAnimateTime = 0.8;
     //跳过按钮类型
@@ -257,7 +258,7 @@ -(void)example04
     //跳过按钮类型
     videoAdconfiguration.skipButtonType = SkipTypeTimeText;
     //广告显示完成动画
-    videoAdconfiguration.showFinishAnimate =ShowFinishAnimateFadein;
+    videoAdconfiguration.showFinishAnimate =ShowFinishAnimateLite;
     //广告显示完成动画时间
     videoAdconfiguration.showFinishAnimateTime = 0.8;
     //后台返回时,是否显示广告