bug修复及优化，发布2.4.1版本

1、修复屏幕旋转bug #149
2、新增addNavigationController属性，可在显示图片浏览器后push到新的控制器

Author: QuintGao

GKPhotoBrowser.podspec

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

GKPhotoBrowser/Core/GKPhotoBrowser.h

@@ -152,6 +152,10 @@ typedef void(^layoutBlock)(GKPhotoBrowser *photoBrowser, CGRect superFrame);
 @property (nonatomic, copy) NSString    *failureText;
 @property (nonatomic, strong) UIImage   *failureImage;
 
+/// 是否添加导航控制器，默认NO，添加后会默认隐藏导航栏
+/// showStyle = GKPhotoBrowserShowStylePush时无效
+@property (nonatomic, assign, getter=isAddNavigationController) BOOL addNavigationController;
+
 // 初始化方法
 
 /**

GKPhotoBrowser/Core/GKPhotoBrowser.m

@@ -198,7 +198,7 @@ - (void)viewDidDisappear:(BOOL)animated {
 }
 
 - (void)setupUI {
-    if (!self.navigationController.navigationBarHidden && !self.navigationController.navigationBar.hidden) {
+    if (!self.navigationController.navigationBarHidden) {
         [self.navigationController setNavigationBarHidden:YES];
     }
 
@@ -278,15 +278,6 @@ - (void)addGestureAndObserver {
 }
 
 #pragma mark - Setter
-- (void)setShowStyle:(GKPhotoBrowserShowStyle)showStyle {
-    _showStyle = showStyle;
-    
-    if (showStyle != GKPhotoBrowserShowStylePush) {
-        self.modalPresentationStyle = UIModalPresentationCustom;
-        self.modalTransitionStyle   = UIModalTransitionStyleCoverVertical;
-    }
-}
-
 - (void)setIsStatusBarShow:(BOOL)isStatusBarShow {
     _isStatusBarShow = isStatusBarShow;
 
@@ -492,8 +483,18 @@ - (void)showFromVC:(UIViewController *)vc {
     if (self.showStyle == GKPhotoBrowserShowStylePush) {
         [vc.navigationController pushViewController:self animated:YES];
     }else {
-        self.modalPresentationCapturesStatusBarAppearance = YES;
-        [vc presentViewController:self animated:NO completion:nil];
+        if (self.isAddNavigationController) {
+            UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:self];
+            nav.modalPresentationCapturesStatusBarAppearance = YES;
+            nav.modalPresentationStyle = UIModalPresentationCustom;
+            nav.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
+            [vc presentViewController:nav animated:NO completion:nil];
+        }else {
+            self.modalPresentationCapturesStatusBarAppearance = YES;
+            self.modalPresentationStyle = UIModalPresentationCustom;
+            self.modalTransitionStyle   = UIModalTransitionStyleCoverVertical;
+            [vc presentViewController:self animated:NO completion:nil];
+        }
     }
 }
 
@@ -1349,6 +1350,7 @@ - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL
 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
     if (!self.isFollowSystemRotation) return;
 
+    self.isRotation = YES;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [UIView animateWithDuration:0.3 animations:^{
             CGFloat width = self.view.bounds.size.width;
@@ -1367,6 +1369,8 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIVi
             [self.view setNeedsLayout];
             [self.view layoutIfNeeded];
             [self layoutSubviews];
+        } completion:^(BOOL finished) {
+            self.isRotation = NO;
         }];
     });
 }

GKPhotoBrowserDemo/GKPhotoBrowserDemo/Classes/AppDelegate.m

@@ -93,8 +93,8 @@ - (void)applicationWillTerminate:(UIApplication *)application {
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
 
-- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window {
-    return UIInterfaceOrientationMaskPortrait;
-}
+//- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window {
+//    return UIInterfaceOrientationMaskPortrait;
+//}
 
 @end

GKPhotoBrowserDemo/GKPhotoBrowserDemo/Classes/Main/GKMainViewController.m

@@ -63,8 +63,8 @@ - (void)setupData {
                         @"class" : @"GKSDAutoLayoutViewController"},
                       @{@"text"  : @"GIF图片",
                         @"class" : @"GKGIFViewController"},
-//                      @{@"text"  : @"测试",
-//                        @"class" : @"GKTestViewController"},
+                      @{@"text"  : @"测试",
+                        @"class" : @"GKTestViewController"},
     ];
 
     [self.mainTable reloadData];

GKPhotoBrowserDemo/GKPhotoBrowserDemo/Classes/Main/Test/GKTestViewController.m

@@ -9,7 +9,6 @@
 #import "GKTestViewController.h"
 #import "GKTest02ViewCell.h"
 #import "GKBottomView.h"
-
 #import "GKPhotoBrowser.h"
 
 @interface GKTestViewController ()<UITableViewDataSource, UITableViewDelegate, GKPhotoBrowserDelegate>
@@ -22,6 +21,8 @@ @interface GKTestViewController ()<UITableViewDataSource, UITableViewDelegate, G
 
 @property (nonatomic, strong) UIPanGestureRecognizer *panGesture;
 
+@property (nonatomic, weak) GKPhotoBrowser *browser;
+
 @end
 
 @implementation GKTestViewController
@@ -33,12 +34,12 @@ - (void)viewDidLoad {
     self.view.backgroundColor = [UIColor whiteColor];
 
 
-    GKBottomView *btmView = [GKBottomView new];
-    btmView.frame = CGRectMake(0, 100, self.view.frame.size.width, 100);
-    [self.view addSubview:btmView];
-//    [self setupView];
-//
-//    [self setupData];
+//    GKBottomView *btmView = [GKBottomView new];
+//    btmView.frame = CGRectMake(0, 100, self.view.frame.size.width, 100);
+//    [self.view addSubview:btmView];
+    [self setupView];
+
+    [self setupData];
 }
 
 - (void)setupView {
@@ -54,7 +55,12 @@ - (void)setupView {
 
 - (void)setupData {
 
-    self.dataSource = @[@[@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536686&di=aa91a60dfb4f9f762f58bb4513f9ef64&imgtype=0&src=http%3A%2F%2Fd.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2F50da81cb39dbb6fd493c67e70024ab18962b378f.jpg",@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536685&di=3b472d84a7801f2fd48afaa4f041fadb&imgtype=0&src=http%3A%2F%2Fb.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2F0824ab18972bd40704fe413d72899e510fb30930.jpg",@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536685&di=18fcb83dcc07f87aefbf58e8538ed4d8&imgtype=0&src=http%3A%2F%2Fg.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2Fd1160924ab18972b22abd40aefcd7b899f510a59.jpg",@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536685&di=b40f1593ca5f51f64c8f8670598e79a2&imgtype=0&src=http%3A%2F%2Fg.hiphotos.baidu.com%2Fimage%2Fcrop%253D0%252C0%252C1024%252C654%2Fsign%3Dafc45f018b025aafc77d248bc6dd8754%2F838ba61ea8d3fd1f3fe3bbfb394e251f94ca5f0c.jpg",@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536685&di=a47731fce0273aae3ddeb03d89fc273b&imgtype=0&src=http%3A%2F%2Ff.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2Fb7003af33a87e950f0e956ad19385343faf2b471.jpg",@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536685&di=121d9ff529f2d9807970f965aeca6c0f&imgtype=0&src=http%3A%2F%2Ff.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2F241f95cad1c8a7861cb6a3ce6e09c93d71cf5056.jpg",@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536685&di=a82dd1f57162599367340d0b5a9ece74&imgtype=0&src=http%3A%2F%2Fa.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2Fae51f3deb48f8c546c9162ee33292df5e1fe7fb5.jpg",@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536684&di=22258dd90dec8f57bdeea79f8c17b04f&imgtype=0&src=http%3A%2F%2Fc.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2F0d338744ebf81a4c1393d808de2a6059242da649.jpg",@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1509084536684&di=16dfed673e74c9e5f1c53e02700ab174&imgtype=0&src=http%3A%2F%2Fe.hiphotos.baidu.com%2Fimage%2Fpic%2Fitem%2Fd058ccbf6c81800a6d5592cfb83533fa838b47ba.jpg"]
+    self.dataSource = @[@[@"http://p1.music.126.net/9k3CAPfB9WdcMCFk4CYnKQ==/109951167793871917.jpg?imageView&quality=89",
+         @"http://p1.music.126.net/GK7JvutM88U4ZkohN71TKQ==/109951167794081491.jpg?imageView&quality=89",
+//         @"http://p1.music.126.net/QywPBMy3VK-P-wk_eYjrZw==/109951167793910298.jpg?imageView&quality=89",
+//         @"http://p1.music.126.net/c4vOjlBA5bQsmpuASPi5QQ==/109951167794545716.jpg?imageView&quality=89",
+//         @"http://p1.music.126.net/4ryVvqlvXp0Kh_fcxCWMsA==/109951166903789195.jpg?param=140y140",
+         @"http://p1.music.126.net/gZWQbChzhCbGFXtpin2MXw==/109951167592864239.jpg?param=140y140"]
                         ];
 
     [self.tableView reloadData];
@@ -89,11 +95,25 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         //        browser.currentIndex = index;
         browser.showStyle    = GKPhotoBrowserShowStyleZoom;
         browser.hideStyle    = GKPhotoBrowserHideStyleZoomScale;
-        [browser setupCoverViews:@[self.coverView] layoutBlock:^(GKPhotoBrowser * _Nonnull photoBrowser, CGRect superFrame) {
-            self.coverView.frame = CGRectMake(0, 200, superFrame.size.width, 100);
+        browser.isFollowSystemRotation = YES;
+        browser.addNavigationController = YES;
+        
+        UIButton *btn = [[UIButton alloc] init];
+        [btn setImage:[UIImage imageNamed:@"cm2_list_detail_icn_cmt"] forState:UIControlStateNormal];
+        [btn sizeToFit];
+        
+        [btn addTarget:self action:@selector(btnClick) forControlEvents:UIControlEventTouchUpInside];
+        
+        [browser setupCoverViews:@[btn] layoutBlock:^(GKPhotoBrowser * _Nonnull photoBrowser, CGRect superFrame) {
+            CGRect frame = btn.frame;
+            frame.origin.x = superFrame.size.width - frame.size.width - 30;
+            frame.origin.y = superFrame.size.height - frame.size.height - 30;
+            btn.frame = frame;
         }];
 
+        browser.delegate = self;
         [browser showFromVC:self];
+        self.browser = browser;
     };
 
     return cell;
@@ -110,6 +130,18 @@ - (void)pangesture:(UIPanGestureRecognizer *)pan {
 
 }
 
+- (void)btnClick {
+    UIViewController *vc = [[UIViewController alloc] init];
+    vc.view.backgroundColor = UIColor.grayColor;
+    [self.browser.navigationController setNavigationBarHidden:NO];
+    [self.browser.navigationController pushViewController:vc animated:YES];
+}
+
+#pragma mark - GKPhotoBrowserDelegate
+- (void)photoBrowser:(GKPhotoBrowser *)browser didDisappearAtIndex:(NSInteger)index {
+    
+}
+
 #pragma mark - 懒加载
 - (UIView *)coverView {
     if (!_coverView) {

GKPhotoBrowserDemo/GKPhotoBrowserDemo/Classes/Main/WeChat/GKTimeLineViewController.m

@@ -135,11 +135,13 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 //        browser.bgColor = UIColor.whiteColor;
 //        browser.statusBarStyle = UIStatusBarStyleDefault;
 
-        // 当你的APP支持屏幕旋转时此属性必须设置为YES
-        if (kIsiPad) { // ipad 默认支持屏幕旋转，这里设置为YES
-            browser.isFollowSystemRotation = YES;
-        }
+//        // 当你的APP支持屏幕旋转时此属性必须设置为YES
+//        if (kIsiPad) { // ipad 默认支持屏幕旋转，这里设置为YES
+//            browser.isFollowSystemRotation = YES;
+//        }
 //        [browser setupWebImageProtocol:[[GKYYWebImageManager alloc] init]];
+        
+        browser.isFollowSystemRotation = YES;
         browser.delegate = weakSelf;
         [browser showFromVC:weakSelf];
         weakSelf.browser = browser;

README.md

@@ -100,6 +100,8 @@ GKPhotoBrowser一个可高度自定义的图片浏览器，demo里面实现的
  ## 更新
 
 ```
+2022.08.19  2.4.1版本，1、修复屏幕旋转bug #149
+                      2、新增addNavigationController，可在显示图片浏览器后push到新的控制器
 2022.07.27  2.4.0版本，修复横屏后屏幕朝上自动变为竖屏的问题 #147
 2022.04.07  2.3.8版本，优化代码，修复bug #138
 2022.03.25  2.3.7版本，新增animDuration属性，可自定义动画时间