From 7092f09c04c9ea85aa0b07666830ab27df695e27 Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Sun, 27 Dec 2015 22:38:21 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E6=95=B0=E7=BB=84=E5=92=8CNSURL=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0reloadImage=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

支持字符串数组和NSURL数组初始化，增加- (void)reloadImageURLArray:(NSArray*)URLarr方法，重新设置图片链接数组，刷新显示图片（适用于上下拉刷新后，重新设置图片数组，更新图片）
---
 AdView/AdView/AdView/AdView.m | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/AdView/AdView/AdView/AdView.m b/AdView/AdView/AdView/AdView.m
index bd78000..106e043 100755
--- a/AdView/AdView/AdView/AdView.m
+++ b/AdView/AdView/AdView/AdView.m
@@ -143,8 +143,13 @@ + (id)adScrollViewWithFrame:(CGRect)frame imageLinkURL:(NSArray *)imageLinkURL p
     NSMutableArray * imagePaths = [[NSMutableArray alloc]init];
     for (NSString * imageName in imageLinkURL)
     {
-        NSURL * imageURL = [NSURL URLWithString:imageName];
-        [imagePaths addObject:imageURL];
+        //支持字符串数组和NSURL数组
+        if ([imageName isKindOfClass:[NSString class]]) {
+            NSURL * imageURL = [NSURL URLWithString:imageName];
+            [imagePaths addObject:imageURL];
+        }else if ([imageName isKindOfClass:[NSURL class]]){
+            [imagePaths addObject:imageName];
+        }
     }
     AdView * adView = [AdView adScrollViewWithFrame:frame imageLinkURL:imageLinkURL   pageControlShowStyle:PageControlShowStyle];
     adView.placeHoldImage = [UIImage imageNamed:imageName];
@@ -216,7 +221,10 @@ - (void)setImageLinkURL:(NSArray *)imageLinkURL
     [self setPageControlShowStyle:self.PageControlShowStyle];
 }
 
-
+#pragma mark - 重新设置图片链接数组，刷新显示图片（适用于上下拉刷新后，重新设置图片数组，更新图片）
+- (void)reloadImageURLArray:(NSArray*)URLarr{
+    [self setImageLinkURL:URLarr];
+}
 
 #pragma mark - 设置每个对应广告对应的广告语
 - (void)setAdTitleArray:(NSArray *)adTitleArray withShowStyle:(AdTitleShowStyle)adTitleStyle
@@ -405,4 +413,4 @@ -(void)tap
         _callBackForModel(self.models[centerImageIndex]);
     }
 }
-@end
\ No newline at end of file
+@end

From 00ab819aac4fedde5e042004bd58003af594e336 Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Sun, 27 Dec 2015 22:39:50 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0reloadImageURLArray?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加reloadImageURLArray方法声明
---
 AdView/AdView/AdView/AdView.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AdView/AdView/AdView/AdView.h b/AdView/AdView/AdView/AdView.h
index a483613..887e588 100755
--- a/AdView/AdView/AdView/AdView.h
+++ b/AdView/AdView/AdView/AdView.h
@@ -148,4 +148,10 @@ typedef NS_ENUM(NSUInteger, AdTitleShowStyle)
  *  @param imageName            属性名称
  */
 + (id)adScrollViewWithFrame:(CGRect)frame modelArr:(NSArray *)modelArr imagePropertyName:(NSString *)imageName pageControlShowStyle:(UIPageControlShowStyle)PageControlShowStyle;
+/**
+ *  重新设置图片链接数组，刷新显示图片
+ *
+ *  @param URLarr             新的URL数组
+ */
+- (void)reloadImageURLArray:(NSArray*)URLarr;
 @end

From ede82dcb716422b25f6cc3d7fb469c4d2372bab4 Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Mon, 28 Dec 2015 14:06:08 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F=08=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

可以设置图片展示方式，增加枚举属性
---
 AdView/AdView/AdView/AdView.h | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/AdView/AdView/AdView/AdView.h b/AdView/AdView/AdView/AdView.h
index 887e588..1c50c1d 100755
--- a/AdView/AdView/AdView/AdView.h
+++ b/AdView/AdView/AdView/AdView.h
@@ -33,6 +33,19 @@ typedef NS_ENUM(NSUInteger, AdTitleShowStyle)
     AdTitleShowStyleRight,
 };
 
+typedef NS_ENUM(NSUInteger, AdPictureShowStyle)
+{
+    /**
+     *  @author ZY, 15-04-26
+     *
+     *  图片显示方式
+     */
+    AdPictureShowModeScaleToFill,
+    AdPictureShowModeScaleAspectFit,      // contents scaled to fit with fixed aspect. remainder is transparent
+    AdPictureShowModeScaleAspectFill,     // contents scaled to fill with fixed aspect. some portion of content may be clipped.
+    AdPictureShowModeCenter,
+};
+
 @interface AdView : UIView<UIScrollViewDelegate>
 {
     UILabel * _centerAdLabel;
@@ -58,7 +71,12 @@ typedef NS_ENUM(NSUInteger, AdTitleShowStyle)
  *  设置标题对应的位置
  */
 @property (assign,nonatomic,readonly) AdTitleShowStyle  adTitleStyle;
-
+/**
+ *  @author ZY, 15-05-17
+ *
+ *  图片显示方式
+ */
+@property (assign,nonatomic) AdPictureShowStyle  pictureShowStyle;
 /**
  *  @author ZY, 15-05-17
  *

From c631e407deabe093c563ae7d44d1c9cba4066660 Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Mon, 28 Dec 2015 14:09:05 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA=E7=BC=A9=E6=94=BE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=B1=9E=E6=80=A7=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加设置图片展示缩放方式属性方法
---
 AdView/AdView/AdView/AdView.m | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/AdView/AdView/AdView/AdView.m b/AdView/AdView/AdView/AdView.m
index 106e043..fd440a7 100755
--- a/AdView/AdView/AdView/AdView.m
+++ b/AdView/AdView/AdView/AdView.m
@@ -310,7 +310,33 @@ - (void)setPageControlShowStyle:(UIPageControlShowStyle)PageControlShowStyle
     _pageControl.enabled = NO;
     [self addSubview:_pageControl];
 }
-
+#pragma mark - 设置图片展示缩放方式
+- (void)setPictureShowStyle:(AdPictureShowStyle)pictureShowStyle{
+    switch (pictureShowStyle) {
+        case AdPictureShowModeScaleToFill:
+            _leftImageView.contentMode = UIViewContentModeScaleToFill;
+            _centerImageView.contentMode = UIViewContentModeScaleToFill;
+            _rightImageView.contentMode = UIViewContentModeScaleToFill;
+            break;
+        case AdPictureShowModeScaleAspectFit:
+            _leftImageView.contentMode = UIViewContentModeScaleAspectFit;
+            _centerImageView.contentMode = UIViewContentModeScaleAspectFit;
+            _rightImageView.contentMode = UIViewContentModeScaleAspectFit;
+            break;
+        case AdPictureShowModeScaleAspectFill:
+            _leftImageView.contentMode = UIViewContentModeScaleAspectFill;
+            _centerImageView.contentMode = UIViewContentModeScaleAspectFill;
+            _rightImageView.contentMode = UIViewContentModeScaleAspectFill;
+            break;
+        case AdPictureShowModeCenter:
+            _leftImageView.contentMode = UIViewContentModeCenter;
+            _centerImageView.contentMode = UIViewContentModeCenter;
+            _rightImageView.contentMode = UIViewContentModeCenter;
+            break;
+        default:
+            break;
+    }
+}
 #pragma mark - 计时器到时,系统滚动图片
 - (void)animalMoveImage:(NSTimer *)time
 {

From 87469936f47b00c706ec7db2c6fb5e94ff669264 Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Mon, 28 Dec 2015 14:28:38 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0pageControl=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=81=8F=E7=A7=BB=E9=87=8F=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

可以在原有显示位置上进行位置的微调，通过UIEdgeInsets调节
---
 AdView/AdView/AdView/AdView.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AdView/AdView/AdView/AdView.h b/AdView/AdView/AdView/AdView.h
index 1c50c1d..cf42082 100755
--- a/AdView/AdView/AdView/AdView.h
+++ b/AdView/AdView/AdView/AdView.h
@@ -65,6 +65,12 @@ typedef NS_ENUM(NSUInteger, AdPictureShowStyle)
  *  设置page显示位置
  */
 @property (assign,nonatomic) UIPageControlShowStyle  PageControlShowStyle;
+/**
+ *  @author ZY, 15-05-17
+ *
+ *  pageControl显示偏移量
+ */
+@property (assign,nonatomic) UIEdgeInsets  pageControlEdgeInsets;
 /**
  *  @author ZY, 15-05-17
  *

From ec18c6d7e2b4c01bb6eefe9a4312304e66faa5d7 Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Mon, 28 Dec 2015 14:30:48 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AEpageC?=
 =?UTF-8?q?ontrol=E5=81=8F=E7=A7=BB=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在原有显示位置，进行pageControl的位置微调
---
 AdView/AdView/AdView/AdView.m | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/AdView/AdView/AdView/AdView.m b/AdView/AdView/AdView/AdView.m
index fd440a7..dbc051c 100755
--- a/AdView/AdView/AdView/AdView.m
+++ b/AdView/AdView/AdView/AdView.m
@@ -310,6 +310,14 @@ - (void)setPageControlShowStyle:(UIPageControlShowStyle)PageControlShowStyle
     _pageControl.enabled = NO;
     [self addSubview:_pageControl];
 }
+#pragma mark - 设置pageControl偏移量
+- (void)setPageControlEdgeInsets:(UIEdgeInsets)pageControlEdgeInsets{
+    CGRect orgiFrame = _pageControl.frame;
+    orgiFrame.origin.x += pageControlEdgeInsets.left;
+    orgiFrame.origin.x -= pageControlEdgeInsets.right;
+    orgiFrame.origin.y += pageControlEdgeInsets.top;
+    orgiFrame.origin.y -= pageControlEdgeInsets.bottom;
+}
 #pragma mark - 设置图片展示缩放方式
 - (void)setPictureShowStyle:(AdPictureShowStyle)pictureShowStyle{
     switch (pictureShowStyle) {

From 634fc7983588c1f02756b87d1ef1c2caac089beb Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Mon, 28 Dec 2015 14:35:08 +0800
Subject: [PATCH 07/12] _pageControl.frame = orgiFrame;
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复
---
 AdView/AdView/AdView/AdView.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AdView/AdView/AdView/AdView.m b/AdView/AdView/AdView/AdView.m
index dbc051c..f068c3f 100755
--- a/AdView/AdView/AdView/AdView.m
+++ b/AdView/AdView/AdView/AdView.m
@@ -317,6 +317,7 @@ - (void)setPageControlEdgeInsets:(UIEdgeInsets)pageControlEdgeInsets{
     orgiFrame.origin.x -= pageControlEdgeInsets.right;
     orgiFrame.origin.y += pageControlEdgeInsets.top;
     orgiFrame.origin.y -= pageControlEdgeInsets.bottom;
+    _pageControl.frame = orgiFrame;
 }
 #pragma mark - 设置图片展示缩放方式
 - (void)setPictureShowStyle:(AdPictureShowStyle)pictureShowStyle{

From b90404ff8db3cbb2f81641d7c2bab4a28fa0d202 Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Wed, 30 Dec 2015 21:19:28 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E5=BC=80=E5=A7=8B=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

外部控制自动滚动开始停止
---
 AdView/AdView/AdView/AdView.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/AdView/AdView/AdView/AdView.h b/AdView/AdView/AdView/AdView.h
index cf42082..ad953b1 100755
--- a/AdView/AdView/AdView/AdView.h
+++ b/AdView/AdView/AdView/AdView.h
@@ -178,4 +178,10 @@ typedef NS_ENUM(NSUInteger, AdPictureShowStyle)
  *  @param URLarr             新的URL数组
  */
 - (void)reloadImageURLArray:(NSArray*)URLarr;
+/**
+ *  停止/开始自动滚屏
+ *
+ *  @param URLarr             新的URL数组
+ */
+- (void)stopAutoScroll:(BOOL)stop;
 @end

From 1cd6dafb6f2c460364ffe450a3384d06a1abf69c Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcool@users.noreply.github.com>
Date: Wed, 30 Dec 2015 21:20:18 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E5=BC=80=E5=A7=8B=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

外部控制自动滚动开始停止
---
 AdView/AdView/AdView/AdView.m | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/AdView/AdView/AdView/AdView.m b/AdView/AdView/AdView/AdView.m
index f068c3f..dc883af 100755
--- a/AdView/AdView/AdView/AdView.m
+++ b/AdView/AdView/AdView/AdView.m
@@ -353,7 +353,16 @@ - (void)animalMoveImage:(NSTimer *)time
     _isTimeUp = YES;
     [NSTimer scheduledTimerWithTimeInterval:0.4f target:self selector:@selector(scrollViewDidEndDecelerating:) userInfo:nil repeats:NO];
 }
-
+#pragma mark 停止/开始自动滚屏
+- (void)stopAutoScroll:(BOOL)stop
+{
+    if (!stop){
+        [self setUpTime];
+    }else{
+        [moveTimer invalidate];
+        moveTimer = nil;
+    }
+}
 #pragma mark - 图片停止时,调用该函数使得滚动视图复用
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 {

From ea6ff31d8e0b5dfc4c1e57a03dffeb9c9a86035e Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcoolxw@qq.com>
Date: Wed, 30 Dec 2015 21:48:14 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=A2=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

测试github桌面版提交修改
---
 .../UserInterfaceState.xcuserstate            | Bin 0 -> 8138 bytes
 .../xcschemes/AdView.xcscheme                 | 101 ++++++++++++++++++
 .../xcschemes/xcschememanagement.plist        |  27 +++++
 AdView/AdView/AdView/AdView.h                 |   2 +-
 AdView/AdView/AdView/AdView.m                 |   5 +-
 5 files changed, 131 insertions(+), 4 deletions(-)
 create mode 100644 AdView/AdView.xcodeproj/project.xcworkspace/xcuserdata/heguoping.xcuserdatad/UserInterfaceState.xcuserstate
 create mode 100644 AdView/AdView.xcodeproj/xcuserdata/heguoping.xcuserdatad/xcschemes/AdView.xcscheme
 create mode 100644 AdView/AdView.xcodeproj/xcuserdata/heguoping.xcuserdatad/xcschemes/xcschememanagement.plist

diff --git a/AdView/AdView.xcodeproj/project.xcworkspace/xcuserdata/heguoping.xcuserdatad/UserInterfaceState.xcuserstate b/AdView/AdView.xcodeproj/project.xcworkspace/xcuserdata/heguoping.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000000000000000000000000000000000000..c312c1c388f1c0f847aff59efd6bd9b7fae583c3
GIT binary patch
literal 8138
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

literal 0
HcmV?d00001

diff --git a/AdView/AdView.xcodeproj/xcuserdata/heguoping.xcuserdatad/xcschemes/AdView.xcscheme b/AdView/AdView.xcodeproj/xcuserdata/heguoping.xcuserdatad/xcschemes/AdView.xcscheme
new file mode 100644
index 0000000..5da0db6
--- /dev/null
+++ b/AdView/AdView.xcodeproj/xcuserdata/heguoping.xcuserdatad/xcschemes/AdView.xcscheme
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0710"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "53E54CF91AED3CF10077D764"
+               BuildableName = "AdView.app"
+               BlueprintName = "AdView"
+               ReferencedContainer = "container:AdView.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "53E54D121AED3CF10077D764"
+               BuildableName = "AdViewTests.xctest"
+               BlueprintName = "AdViewTests"
+               ReferencedContainer = "container:AdView.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "53E54CF91AED3CF10077D764"
+            BuildableName = "AdView.app"
+            BlueprintName = "AdView"
+            ReferencedContainer = "container:AdView.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "53E54CF91AED3CF10077D764"
+            BuildableName = "AdView.app"
+            BlueprintName = "AdView"
+            ReferencedContainer = "container:AdView.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "53E54CF91AED3CF10077D764"
+            BuildableName = "AdView.app"
+            BlueprintName = "AdView"
+            ReferencedContainer = "container:AdView.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/AdView/AdView.xcodeproj/xcuserdata/heguoping.xcuserdatad/xcschemes/xcschememanagement.plist b/AdView/AdView.xcodeproj/xcuserdata/heguoping.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..a86c9c1
--- /dev/null
+++ b/AdView/AdView.xcodeproj/xcuserdata/heguoping.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>AdView.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>53E54CF91AED3CF10077D764</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>53E54D121AED3CF10077D764</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/AdView/AdView/AdView/AdView.h b/AdView/AdView/AdView/AdView.h
index ad953b1..128e7d1 100755
--- a/AdView/AdView/AdView/AdView.h
+++ b/AdView/AdView/AdView/AdView.h
@@ -183,5 +183,5 @@ typedef NS_ENUM(NSUInteger, AdPictureShowStyle)
  *
  *  @param URLarr             新的URL数组
  */
-- (void)stopAutoScroll:(BOOL)stop;
+- (void)stopAutoScroll:(BOOL)stopOrNo;
 @end
diff --git a/AdView/AdView/AdView/AdView.m b/AdView/AdView/AdView/AdView.m
index dc883af..122a39b 100755
--- a/AdView/AdView/AdView/AdView.m
+++ b/AdView/AdView/AdView/AdView.m
@@ -354,9 +354,8 @@ - (void)animalMoveImage:(NSTimer *)time
     [NSTimer scheduledTimerWithTimeInterval:0.4f target:self selector:@selector(scrollViewDidEndDecelerating:) userInfo:nil repeats:NO];
 }
 #pragma mark 停止/开始自动滚屏
-- (void)stopAutoScroll:(BOOL)stop
-{
-    if (!stop){
+- (void)stopAutoScroll:(BOOL)stopOrNo{
+    if (!stopOrNo){
         [self setUpTime];
     }else{
         [moveTimer invalidate];

From 0e7ba79d0534efbe7d2980d989aacb654b537acc Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcoolxw@qq.com>
Date: Wed, 30 Dec 2015 22:06:48 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=81=9C=E6=AD=A2=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

改为暂停和继续，避免重置定时器计时，导致时间间隔重置
---
 AdView/AdView/AdView/AdView.m | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/AdView/AdView/AdView/AdView.m b/AdView/AdView/AdView/AdView.m
index 122a39b..59b3224 100755
--- a/AdView/AdView/AdView/AdView.m
+++ b/AdView/AdView/AdView/AdView.m
@@ -356,10 +356,9 @@ - (void)animalMoveImage:(NSTimer *)time
 #pragma mark 停止/开始自动滚屏
 - (void)stopAutoScroll:(BOOL)stopOrNo{
     if (!stopOrNo){
-        [self setUpTime];
+        [moveTimer setFireDate:[NSDate distantPast]];
     }else{
-        [moveTimer invalidate];
-        moveTimer = nil;
+        [moveTimer setFireDate:[NSDate distantFuture]];
     }
 }
 #pragma mark - 图片停止时,调用该函数使得滚动视图复用

From a42a1dc1947589a16345e50de8429a2ed9c871c5 Mon Sep 17 00:00:00 2001
From: zxwcool <zxwcoolxw@qq.com>
Date: Thu, 31 Dec 2015 16:57:14 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=9C=A8=E7=88=B6?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=87=8D=E8=BD=BD=E6=97=B6=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=B0=83=E7=94=A8willMoveToSuperview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

避免在父视图重载时，重复调用willMoveToSuperview，重定义定时器事件，造成定时器不断累加，滚动加快
---
 AdView/AdView/AdView/AdView.m | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/AdView/AdView/AdView/AdView.m b/AdView/AdView/AdView/AdView.m
index 59b3224..8534318 100755
--- a/AdView/AdView/AdView/AdView.m
+++ b/AdView/AdView/AdView/AdView.m
@@ -101,14 +101,18 @@ - (void)willMoveToSuperview:(UIView *)newSuperview
         [self setUpTime];
     }
 }
-
+//避免在父视图重载时，重复调用willMoveToSuperview，重定义定时器事件，造成定时器不断累加，滚动加快
 - (void)setUpTime
 {
-    if (_isNeedCycleRoll&&_imageLinkURL.count>=2)
+    if (_isNeedCycleRoll && _imageLinkURL.count>=2 && !moveTimer)
     {
         moveTimer = [NSTimer scheduledTimerWithTimeInterval:_adMoveTime target:self selector:@selector(animalMoveImage:) userInfo:nil repeats:YES];
         _isTimeUp = NO;
     }
+    else if(_isNeedCycleRoll && _imageLinkURL.count>=2 && moveTimer)
+    {
+        [self stopAutoScroll:NO];
+    }
 }
 
 - (void)setIsNeedCycleRoll:(BOOL)isNeedCycleRoll