1.1 Commit

vowed21 · Jan 20, 2016 · 0c72307 · 0c72307
1 parent e51c80e
commit 0c72307
Show file tree

Hide file tree

Showing 31 changed files with 477 additions and 657 deletions.
diff --git a/HWViewPager.podspec b/HWViewPager.podspec
diff --git a/HWViewPager.xcodeproj/project.pbxproj b/HWViewPager.xcodeproj/project.pbxproj
diff --git a/HWViewPager/Base.lproj/LaunchScreen.xib b/HWViewPager/Base.lproj/LaunchScreen.xib
diff --git a/HWViewPager.h → HWViewPager/HWViewPager.h b/HWViewPager.h → HWViewPager/HWViewPager.h
@@ -20,5 +20,7 @@
 
 -(void) setPagerDelegate:(id<HWViewPagerDelegate>)pagerDelegate;
 
+-(void) setPage:(NSInteger)page isAnimation:(BOOL)isAnim;
+
 @end
 
diff --git a/HWViewPager.m → HWViewPager/HWViewPager.m b/HWViewPager.m → HWViewPager/HWViewPager.m
@@ -214,6 +214,20 @@ -(CGFloat) getOffsetFromPage:(NSInteger)pageNum scrollView:(UIScrollView*)scroll
 }
 
 
+-(void) setPage:(NSInteger)page isAnimation:(BOOL)isAnim{
+
+    if(page == self.selectedPageNum || page >= self.itemsTotalNum){
+        return;
+    }
+
+    CGFloat offset = [self getOffsetFromPage:page scrollView:self];
+    [self setContentOffset:CGPointMake(offset, 0) animated:isAnim];
+    self.selectedPageNum = page;
+    if(self.userPagerDelegate != nil){
+        [self.userPagerDelegate pagerDidSelectedPage:page];
+    }
+}
+
 
 
 

diff --git a/HWViewPager/Images.xcassets/first.imageset/Contents.json b/HWViewPager/Images.xcassets/first.imageset/Contents.json
diff --git a/HWViewPager/Images.xcassets/first.imageset/first.pdf b/HWViewPager/Images.xcassets/first.imageset/first.pdf
diff --git a/HWViewPager/Images.xcassets/second.imageset/Contents.json b/HWViewPager/Images.xcassets/second.imageset/Contents.json
diff --git a/HWViewPager/Images.xcassets/second.imageset/second.pdf b/HWViewPager/Images.xcassets/second.imageset/second.pdf
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,5 +20,7 @@

		-(void) setPagerDelegate:(id<HWViewPagerDelegate>)pagerDelegate;

		-(void) setPage:(NSInteger)page isAnimation:(BOOL)isAnim;

		@end