修复放大后滑动超过一张再返回后显示异常的问题#123

Author: QuintGao

GKPhotoBrowser.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "GKPhotoBrowser"
-  s.version      = "2.2.1"
+  s.version      = "2.3.1"
   s.summary      = "iOS自定义图片浏览器，支持CocoaPods"
   s.homepage     = "https://github.com/QuintGao/GKPhotoBrowser"
   s.license      = "MIT"

GKPhotoBrowser/Core/GKPhotoBrowser.h

@@ -109,6 +109,7 @@ typedef void(^layoutBlock)(GKPhotoBrowser *photoBrowser, CGRect superFrame);
 @property (nonatomic, assign) BOOL isHideSourceView;
 
 /// 滑动切换图片时，是否恢复上（下）一张图片的缩放程度，默认是NO
+/// 如果滑动超过一张，则恢复原状
 @property (nonatomic, assign) BOOL isResumePhotoZoom;
 
 /// 横屏时是否充满屏幕宽度，默认YES，为NO时图片自动填充屏幕

GKPhotoBrowser/Core/GKPhotoView.m

@@ -368,9 +368,12 @@ - (void)adjustFrame {
         self.loadingView.bounds = self.scrollView.frame;
         self.loadingView.center = CGPointMake(frame.size.width * 0.5, frame.size.height * 0.5);
     }
+
 
     // frame调整完毕，重新设置缩放
     if (self.photo.isZooming) {
+        self.scrollView.maximumZoomScale = 1.0f;
+        self.scrollView.zoomScale = 1.0f;
         [self zoomToRect:self.photo.zoomRect animated:NO];
     }
 
@@ -386,12 +389,20 @@ - (CGPoint)centerOfScrollViewContent:(UIScrollView *)scrollView {
 }
 
 - (void)zoomToRect:(CGRect)rect animated:(BOOL)animated {
-    [self.scrollView zoomToRect:rect animated:YES];
+    [self.scrollView zoomToRect:rect animated:animated];
 }
 
 #pragma mark - UIScrollViewDelegate
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    self.photo.offset = scrollView.contentOffset;
+    // 恢复位置
+    if (self.photo.isZooming && scrollView.zoomScale == 1.0f) {
+        scrollView.contentOffset = self.photo.offset;
+    }
+    
+    // 只在上下滑动时记录位置
+    if (scrollView.zoomScale == 1.0f) {
+        self.photo.offset = scrollView.contentOffset;
+    }
 }
 
 - (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView {
@@ -404,7 +415,6 @@ - (void)scrollViewDidZoom:(UIScrollView *)scrollView {
 
 - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(CGFloat)scale {
     !self.zoomEnded ? : self.zoomEnded(self, scrollView.zoomScale);
-    
     [self setScrollMaxZoomScale:self.realZoomScale];
 }
 

GKPhotoBrowserDemo/GKPhotoBrowserDemo.xcodeproj/project.pbxproj

@@ -519,7 +519,7 @@
 		795FA5831FF333420057BDB0 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = QuintGao;
 				TargetAttributes = {
 					795FA58A1FF333420057BDB0 = {