From b49a958486c28420b709f512be2f4079fe83b927 Mon Sep 17 00:00:00 2001 From: QuintGao <1094887059@qq.com> Date: Thu, 20 May 2021 15:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7=EF=BC=8Cre?= =?UTF-8?q?lease=203.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GKNavigationBarViewController.podspec | 4 +- .../GKCategory/GKCategory.h | 2 +- .../GKCategory/UIBarButtonItem+GKCategory.h | 2 +- .../GKCategory/UIBarButtonItem+GKCategory.m | 2 +- .../GKCategory/UIImage+GKCategory.h | 2 +- .../GKCategory/UIImage+GKCategory.m | 9 +- .../UINavigationController+GKCategory.h | 2 +- .../UINavigationController+GKCategory.m | 4 +- .../GKCategory/UINavigationItem+GKCategory.h | 2 +- .../GKCategory/UINavigationItem+GKCategory.m | 2 +- .../GKCategory/UIScrollView+GKCategory.h | 2 +- .../GKCategory/UIScrollView+GKCategory.m | 2 +- .../GKCategory/UIViewController+GKCategory.h | 2 +- .../GKCategory/UIViewController+GKCategory.m | 35 ++++++-- .../GKConfigure/GKCommon.h | 6 +- .../GKConfigure/GKNavigationBar.h | 6 +- .../GKConfigure/GKNavigationBar.m | 4 +- .../GKConfigure/GKNavigationBarConfigure.h | 84 ++++++++++--------- .../GKConfigure/GKNavigationBarConfigure.m | 68 ++++++++++++++- .../GKNavigationBarViewController.h | 2 +- .../GKNavigationBarViewController.m | 36 ++++++-- .../GKTransition/GKBaseTransitionAnimation.h | 4 +- .../GKTransition/GKBaseTransitionAnimation.m | 4 +- .../GKNavigationInteractiveTransition.h | 2 +- .../GKNavigationInteractiveTransition.m | 2 +- .../GKTransition/GKPopTransitionAnimation.h | 2 +- .../GKTransition/GKPopTransitionAnimation.m | 2 +- .../GKTransition/GKPushTransitionAnimation.h | 2 +- .../GKTransition/GKPushTransitionAnimation.m | 2 +- .../AppDelegate.h | 4 +- .../AppDelegate.m | 4 +- .../Classes/BaseVC/GKDemoBaseViewController.h | 2 +- .../Classes/BaseVC/GKDemoBaseViewController.m | 2 +- .../Classes/BaseVC/GKTabBaseViewController.h | 2 +- .../Classes/BaseVC/GKTabBaseViewController.m | 2 +- .../Classes/DemoVC/GKDemo000ViewController.m | 8 +- .../Classes/DemoVC/GKDemo001ViewController.h | 2 +- .../Classes/DemoVC/GKDemo001ViewController.m | 2 +- .../Classes/DemoVC/GKDemo002ViewController.h | 2 +- .../Classes/DemoVC/GKDemo002ViewController.m | 2 +- .../Classes/DemoVC/GKDemo003ViewController.h | 4 +- .../Classes/DemoVC/GKDemo003ViewController.m | 4 +- .../Classes/DemoVC/GKDemo004ViewController.h | 4 +- .../Classes/DemoVC/GKDemo004ViewController.m | 4 +- .../Classes/DemoVC/GKDemo005ViewController.h | 4 +- .../Classes/DemoVC/GKDemo005ViewController.m | 4 +- .../DemoVC/GKDemoTransitionViewController.h | 4 +- .../DemoVC/GKDemoTransitionViewController.m | 4 +- .../Classes/GKMainViewController.h | 2 +- .../Classes/GKMainViewController.m | 2 +- .../GKToutiaoViewController.h" | 2 +- .../GKToutiaoViewController.m" | 2 +- .../tab/GKToutiaoDetailViewController.h" | 2 +- .../tab/GKToutiaoDetailViewController.m" | 2 +- .../tab/GKToutiaoHomeViewController.h" | 2 +- .../tab/GKToutiaoHomeViewController.m" | 2 +- .../tab/GKToutiaoMicroViewController.h" | 2 +- .../tab/GKToutiaoMicroViewController.m" | 2 +- .../tab/GKToutiaoMineViewController.h" | 2 +- .../tab/GKToutiaoMineViewController.m" | 2 +- .../tab/GKToutiaoVideoViewController.h" | 2 +- .../tab/GKToutiaoVideoViewController.m" | 2 +- .../GKWXViewController.h" | 2 +- .../GKWXViewController.m" | 2 +- .../tab/GKWXDetailViewController.h" | 2 +- .../tab/GKWXDetailViewController.m" | 2 +- .../tab/GKWXFindViewController.h" | 2 +- .../tab/GKWXFindViewController.m" | 2 +- .../tab/GKWXHomeViewController.h" | 2 +- .../tab/GKWXHomeViewController.m" | 2 +- .../tab/GKWXMineViewController.h" | 2 +- .../tab/GKWXMineViewController.m" | 2 +- .../GKDouyinHomePlayerViewController.h" | 4 +- .../GKDouyinHomePlayerViewController.m" | 4 +- .../GKDouyinHomeSearchViewController.h" | 4 +- .../GKDouyinHomeSearchViewController.m" | 4 +- .../GKDouyinHomeViewController.h" | 4 +- .../GKDouyinHomeViewController.m" | 4 +- .../GKDouyinPersonalViewController.h" | 4 +- .../GKDouyinPersonalViewController.m" | 4 +- .../GKDouyinScrollView.h" | 4 +- .../GKDouyinScrollView.m" | 4 +- .../GKWYMusicViewController.h" | 2 +- .../GKWYMusicViewController.m" | 2 +- .../tab/GKWYMusicAccountViewController.h" | 2 +- .../tab/GKWYMusicAccountViewController.m" | 2 +- .../tab/GKWYMusicDetailViewController.h" | 2 +- .../tab/GKWYMusicDetailViewController.m" | 2 +- .../tab/GKWYMusicFindViewController.h" | 2 +- .../tab/GKWYMusicFindViewController.m" | 2 +- .../tab/GKWYMusicFriendViewController.h" | 2 +- .../tab/GKWYMusicFriendViewController.m" | 2 +- .../tab/GKWYMusicMineViewController.h" | 2 +- .../tab/GKWYMusicMineViewController.m" | 2 +- .../GKWYNewsViewController.h" | 2 +- .../GKWYNewsViewController.m" | 2 +- .../tab/GKWYNewsCommentViewController.h" | 2 +- .../tab/GKWYNewsCommentViewController.m" | 2 +- .../tab/GKWYNewsDetailViewController.h" | 2 +- .../tab/GKWYNewsDetailViewController.m" | 2 +- .../tab/GKWYNewsHomeViewController.h" | 2 +- .../tab/GKWYNewsHomeViewController.m" | 2 +- .../tab/GKWYNewsLiveViewController.h" | 2 +- .../tab/GKWYNewsLiveViewController.m" | 2 +- .../tab/GKWYNewsNewViewController.h" | 2 +- .../tab/GKWYNewsNewViewController.m" | 2 +- .../tab/GKWYNewsProfileViewController.h" | 2 +- .../tab/GKWYNewsProfileViewController.m" | 2 +- .../tab/GKWYNewsVideoViewController.h" | 2 +- .../tab/GKWYNewsVideoViewController.m" | 2 +- .../PrefixHeader.pch | 2 +- .../GKNavigationBarViewControllerDemo/main.m | 4 +- .../GKNavigationBarViewControllerDemoTests.m | 4 +- README.md | 1 + 114 files changed, 326 insertions(+), 191 deletions(-) diff --git a/GKNavigationBarViewController.podspec b/GKNavigationBarViewController.podspec index 7fe0aaf..0f9d878 100644 --- a/GKNavigationBarViewController.podspec +++ b/GKNavigationBarViewController.podspec @@ -1,10 +1,10 @@ Pod::Spec.new do |s| s.name = "GKNavigationBarViewController" - s.version = "3.0.1" + s.version = "3.0.2" s.summary = "自定义导航栏--导航栏联动" s.homepage = "https://github.com/QuintGao/GKNavigationBarViewController" s.license = "MIT" - s.authors = { "高坤" => "1094887059@qq.com" } + s.authors = { "QuintGao" => "1094887059@qq.com" } s.social_media_url = "https://github.com/QuintGao" s.platform = :ios, "9.0" s.ios.deployment_target = "9.0" diff --git a/GKNavigationBarViewController/GKCategory/GKCategory.h b/GKNavigationBarViewController/GKCategory/GKCategory.h index cea760c..932216e 100644 --- a/GKNavigationBarViewController/GKCategory/GKCategory.h +++ b/GKNavigationBarViewController/GKCategory/GKCategory.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/8/31. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #ifndef GKCategory_h diff --git a/GKNavigationBarViewController/GKCategory/UIBarButtonItem+GKCategory.h b/GKNavigationBarViewController/GKCategory/UIBarButtonItem+GKCategory.h index c901588..311370a 100644 --- a/GKNavigationBarViewController/GKCategory/UIBarButtonItem+GKCategory.h +++ b/GKNavigationBarViewController/GKCategory/UIBarButtonItem+GKCategory.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/7. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewController/GKCategory/UIBarButtonItem+GKCategory.m b/GKNavigationBarViewController/GKCategory/UIBarButtonItem+GKCategory.m index 3951adc..c255eb1 100644 --- a/GKNavigationBarViewController/GKCategory/UIBarButtonItem+GKCategory.m +++ b/GKNavigationBarViewController/GKCategory/UIBarButtonItem+GKCategory.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/7. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "UIBarButtonItem+GKCategory.h" diff --git a/GKNavigationBarViewController/GKCategory/UIImage+GKCategory.h b/GKNavigationBarViewController/GKCategory/UIImage+GKCategory.h index 18d0f54..d7fda1f 100644 --- a/GKNavigationBarViewController/GKCategory/UIImage+GKCategory.h +++ b/GKNavigationBarViewController/GKCategory/UIImage+GKCategory.h @@ -2,7 +2,7 @@ // UIImage+GKCategory.h // GKNavigationBar // -// Created by gaokun on 2019/11/1. +// Created by QuintGao on 2019/11/1. // Copyright © 2019 QuintGao. All rights reserved. // diff --git a/GKNavigationBarViewController/GKCategory/UIImage+GKCategory.m b/GKNavigationBarViewController/GKCategory/UIImage+GKCategory.m index 4fc5a6c..b14f16f 100644 --- a/GKNavigationBarViewController/GKCategory/UIImage+GKCategory.m +++ b/GKNavigationBarViewController/GKCategory/UIImage+GKCategory.m @@ -2,19 +2,18 @@ // UIImage+GKCategory.m // GKNavigationBar // -// Created by gaokun on 2019/11/1. +// Created by QuintGao on 2019/11/1. // Copyright © 2019 QuintGao. All rights reserved. // #import "UIImage+GKCategory.h" +#import "GKNavigationBarConfigure.h" @implementation UIImage (GKCategory) + (UIImage *)gk_imageNamed:(NSString *)name { - NSString *bundleName = [@"GKNavigationBarViewController.bundle" stringByAppendingPathComponent:name]; - NSString *frameWorkName = [@"Frameworks/GKNavigationBarViewController.framework/GKNavigationBarViewController.bundle" stringByAppendingPathComponent:name]; - - UIImage *image = [UIImage imageNamed:bundleName] ?: [UIImage imageNamed:frameWorkName]; + if (![GKConfigure gk_libraryBundle]) return [UIImage imageNamed:name]; + UIImage *image = [UIImage imageNamed:name inBundle:[GKConfigure gk_libraryBundle] compatibleWithTraitCollection:nil]; if (!image) image = [UIImage imageNamed:name]; return image; } diff --git a/GKNavigationBarViewController/GKCategory/UINavigationController+GKCategory.h b/GKNavigationBarViewController/GKCategory/UINavigationController+GKCategory.h index e17cec2..3085b0e 100644 --- a/GKNavigationBarViewController/GKCategory/UINavigationController+GKCategory.h +++ b/GKNavigationBarViewController/GKCategory/UINavigationController+GKCategory.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/7. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewController/GKCategory/UINavigationController+GKCategory.m b/GKNavigationBarViewController/GKCategory/UINavigationController+GKCategory.m index b432575..ae890a1 100644 --- a/GKNavigationBarViewController/GKCategory/UINavigationController+GKCategory.m +++ b/GKNavigationBarViewController/GKCategory/UINavigationController+GKCategory.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/7. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "UINavigationController+GKCategory.h" @@ -118,6 +118,8 @@ - (void)handleNotification:(NSNotification *)notify { if ([vc isKindOfClass:[UITabBarController class]]) return; if (!vc.navigationController) return; if (vc.navigationController != self) return; + // 修复非导航栏控制器子类时出现的问题 + if (vc.parentViewController != self) return; __block BOOL exist = NO; [GKConfigure.shiledGuestureVCs enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { diff --git a/GKNavigationBarViewController/GKCategory/UINavigationItem+GKCategory.h b/GKNavigationBarViewController/GKCategory/UINavigationItem+GKCategory.h index 2b18977..ae46dd5 100644 --- a/GKNavigationBarViewController/GKCategory/UINavigationItem+GKCategory.h +++ b/GKNavigationBarViewController/GKCategory/UINavigationItem+GKCategory.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/10/13. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewController/GKCategory/UINavigationItem+GKCategory.m b/GKNavigationBarViewController/GKCategory/UINavigationItem+GKCategory.m index 8bc40ef..4a98cf9 100644 --- a/GKNavigationBarViewController/GKCategory/UINavigationItem+GKCategory.m +++ b/GKNavigationBarViewController/GKCategory/UINavigationItem+GKCategory.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/10/13. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "UINavigationItem+GKCategory.h" diff --git a/GKNavigationBarViewController/GKCategory/UIScrollView+GKCategory.h b/GKNavigationBarViewController/GKCategory/UIScrollView+GKCategory.h index bbf1996..781663a 100644 --- a/GKNavigationBarViewController/GKCategory/UIScrollView+GKCategory.h +++ b/GKNavigationBarViewController/GKCategory/UIScrollView+GKCategory.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewController/GKCategory/UIScrollView+GKCategory.m b/GKNavigationBarViewController/GKCategory/UIScrollView+GKCategory.m index 3268602..837bfcd 100644 --- a/GKNavigationBarViewController/GKCategory/UIScrollView+GKCategory.m +++ b/GKNavigationBarViewController/GKCategory/UIScrollView+GKCategory.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "UIScrollView+GKCategory.h" diff --git a/GKNavigationBarViewController/GKCategory/UIViewController+GKCategory.h b/GKNavigationBarViewController/GKCategory/UIViewController+GKCategory.h index 445dca6..0171515 100644 --- a/GKNavigationBarViewController/GKCategory/UIViewController+GKCategory.h +++ b/GKNavigationBarViewController/GKCategory/UIViewController+GKCategory.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/7. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // 使用运行时为UIViewController添加分类 #import diff --git a/GKNavigationBarViewController/GKCategory/UIViewController+GKCategory.m b/GKNavigationBarViewController/GKCategory/UIViewController+GKCategory.m index b618c79..52dd2da 100644 --- a/GKNavigationBarViewController/GKCategory/UIViewController+GKCategory.m +++ b/GKNavigationBarViewController/GKCategory/UIViewController+GKCategory.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/7. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "UIViewController+GKCategory.h" @@ -210,10 +210,18 @@ + (void)load { } - (void)gk_viewDidLoad { - // 初始化导航栏间距 - self.gk_navItemLeftSpace = GKNavigationBarItemSpace; - self.gk_navItemRightSpace = GKNavigationBarItemSpace; - self.gk_disableFixNavItemSpace = [self checkFixNavItemSpace]; + if ([self navItemSpaceChangeIfNeeded]) { + // 设置默认导航栏间距 + self.gk_navItemLeftSpace = GKNavigationBarItemSpace; + self.gk_navItemRightSpace = GKNavigationBarItemSpace; + self.gk_disableFixNavItemSpace = [self checkFixNavItemSpace]; + } + // 如果是根控制器，取消返回按钮 + if (self.navigationController && self.navigationController.childViewControllers.count <= 1) { + if ([self isKindOfClass:[GKNavigationBarViewController class]]) { + ((GKNavigationBarViewController *)self).gk_navLeftBarButtonItem = nil; + } + } [self gk_viewDidLoad]; } @@ -227,14 +235,22 @@ - (void)gk_viewWillAppear:(BOOL)animated { if (!self.navigationController) return; // bug fix：#41 - if (!self.gk_disableFixNavItemSpace) { + if ([self navItemSpaceChangeIfNeeded] && !self.gk_disableFixNavItemSpace) { // 每次控制器出现的时候重置导航栏间距 if (self.gk_navItemLeftSpace == GKNavigationBarItemSpace) { self.gk_navItemLeftSpace = GKConfigure.navItemLeftSpace; + }else { + [GKConfigure updateConfigure:^(GKNavigationBarConfigure *configure) { + configure.gk_navItemLeftSpace = self.gk_navItemLeftSpace; + }]; } if (self.gk_navItemRightSpace == GKNavigationBarItemSpace) { self.gk_navItemRightSpace = GKConfigure.navItemRightSpace; + }else { + [GKConfigure updateConfigure:^(GKNavigationBarConfigure *configure) { + configure.gk_navItemRightSpace = self.gk_navItemRightSpace; + }]; } } @@ -399,6 +415,13 @@ - (BOOL)checkFixNavItemSpace { return exist; } +- (BOOL)navItemSpaceChangeIfNeeded { + if ([self isKindOfClass:[GKNavigationBarViewController class]]) { + return YES; + } + return [self.parentViewController isKindOfClass:[UINavigationController class]]; +} + - (void)setNavBarAlpha:(CGFloat)alpha { UINavigationBar *navBar = nil; if ([self isKindOfClass:[GKNavigationBarViewController class]]) { diff --git a/GKNavigationBarViewController/GKConfigure/GKCommon.h b/GKNavigationBarViewController/GKConfigure/GKCommon.h index 6e46f91..12ccd76 100644 --- a/GKNavigationBarViewController/GKConfigure/GKCommon.h +++ b/GKNavigationBarViewController/GKConfigure/GKCommon.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/10/13. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // 一些公共的方法、宏定义、枚举等 #ifndef GKCommon_h @@ -37,10 +37,12 @@ #define GK_STATUSBAR_HEIGHT [GKNavigationBarConfigure statusBarFrame].size.height // 导航栏高度 #define GK_NAVBAR_HEIGHT [GKNavigationBarConfigure navBarHeight] +// 非全屏导航栏高度 +#define GK_NAVBAR_HEIGHT_NFS [GKNavigationBarConfigure navBarHeight_nonFullScreen] // 状态栏+导航栏高度 #define GK_STATUSBAR_NAVBAR_HEIGHT (GK_STATUSBAR_HEIGHT + GK_NAVBAR_HEIGHT) // tabbar高度 -#define GK_TABBAR_HEIGHT (GK_SAFEAREA_BTM + 49.0f) +#define GK_TABBAR_HEIGHT [GKNavigationBarConfigure tabBarHeight] // 导航栏间距，用于不同控制器之间的间距 static const CGFloat GKNavigationBarItemSpace = -1; diff --git a/GKNavigationBarViewController/GKConfigure/GKNavigationBar.h b/GKNavigationBarViewController/GKConfigure/GKNavigationBar.h index 4c50dc5..08827f9 100644 --- a/GKNavigationBarViewController/GKConfigure/GKNavigationBar.h +++ b/GKNavigationBarViewController/GKConfigure/GKNavigationBar.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/9/20. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // 自定义的导航条 #import @@ -13,8 +13,10 @@ /** 导航栏背景色透明度，默认是1.0 */ @property (nonatomic, assign) CGFloat gk_navBarBackgroundAlpha; +// 导航栏分割线是否隐藏 @property (nonatomic, assign) BOOL gk_navLineHidden; -- (void)gk_navLineHideOrShow; +// 在非全屏模式下显示 +@property (nonatomic, assign) BOOL gk_nonFullScreen; @end diff --git a/GKNavigationBarViewController/GKConfigure/GKNavigationBar.m b/GKNavigationBarViewController/GKConfigure/GKNavigationBar.m index f635729..61b678b 100644 --- a/GKNavigationBarViewController/GKConfigure/GKNavigationBar.m +++ b/GKNavigationBarViewController/GKConfigure/GKNavigationBar.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/9/20. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKNavigationBar.h" @@ -32,7 +32,7 @@ - (void)layoutSubviews { obj.frame = frame; }else { CGRect frame = obj.frame; - frame.origin.y = self.frame.size.height - GK_NAVBAR_HEIGHT; + frame.origin.y = self.frame.size.height - (self.gk_nonFullScreen ? GK_NAVBAR_HEIGHT_NFS : GK_NAVBAR_HEIGHT); obj.frame = frame; } }]; diff --git a/GKNavigationBarViewController/GKConfigure/GKNavigationBarConfigure.h b/GKNavigationBarViewController/GKConfigure/GKNavigationBarConfigure.h index 175a8aa..d11eae7 100644 --- a/GKNavigationBarViewController/GKConfigure/GKNavigationBarConfigure.h +++ b/GKNavigationBarViewController/GKConfigure/GKNavigationBarConfigure.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import @@ -94,6 +94,9 @@ /// 获取当前item修复间距 - (CGFloat)gk_fixedSpace; +/// 获取bundle +- (NSBundle *)gk_libraryBundle; + /// 判断当前速度是是否在敏感度范围 /// @param velocity 速度 - (BOOL)isVelocityInSensitivity:(CGFloat)velocity; @@ -116,61 +119,66 @@ @property (class, nonatomic, readonly) BOOL isRegularScreen; /// iPhone 12 Pro Max -@property(class, nonatomic, readonly) BOOL is67InchScreen; +@property (class, nonatomic, readonly) BOOL is67InchScreen; /// iPhone XS Max / 11 Pro Max -@property(class, nonatomic, readonly) BOOL is65InchScreen; +@property (class, nonatomic, readonly) BOOL is65InchScreen; /// iPhone 12 / 12 Pro -@property(class, nonatomic, readonly) BOOL is61InchScreenAndiPhone12; +@property (class, nonatomic, readonly) BOOL is61InchScreenAndiPhone12; /// iPhone XR / 11 -@property(class, nonatomic, readonly) BOOL is61InchScreen; +@property (class, nonatomic, readonly) BOOL is61InchScreen; /// iPhone X / XS / 11Pro -@property(class, nonatomic, readonly) BOOL is58InchScreen; +@property (class, nonatomic, readonly) BOOL is58InchScreen; /// iPhone 6，6s，7，8 Plus -@property(class, nonatomic, readonly) BOOL is55InchScreen; +@property (class, nonatomic, readonly) BOOL is55InchScreen; /// iPhone 12 mini -@property(class, nonatomic, readonly) BOOL is54InchScreen; +@property (class, nonatomic, readonly) BOOL is54InchScreen; /// iPhone 6，6s，7，8，SE2 -@property(class, nonatomic, readonly) BOOL is47InchScreen; +@property (class, nonatomic, readonly) BOOL is47InchScreen; /// iPhone 5，5s，5c，SE -@property(class, nonatomic, readonly) BOOL is40InchScreen; +@property (class, nonatomic, readonly) BOOL is40InchScreen; /// iPhone 4 -@property(class, nonatomic, readonly) BOOL is35InchScreen; - -@property(class, nonatomic, readonly) CGSize screenSizeFor67Inch; -@property(class, nonatomic, readonly) CGSize screenSizeFor65Inch; -@property(class, nonatomic, readonly) CGSize screenSizeFor61InchAndiPhone12; -@property(class, nonatomic, readonly) CGSize screenSizeFor61Inch; -@property(class, nonatomic, readonly) CGSize screenSizeFor58Inch; -@property(class, nonatomic, readonly) CGSize screenSizeFor55Inch; -@property(class, nonatomic, readonly) CGSize screenSizeFor54Inch; -@property(class, nonatomic, readonly) CGSize screenSizeFor47Inch; -@property(class, nonatomic, readonly) CGSize screenSizeFor40Inch; -@property(class, nonatomic, readonly) CGSize screenSizeFor35Inch; - -// 导航栏高度，包括竖屏，横屏，放大模式 -// 机型\高度 尺寸 竖屏 横屏 放大模式 -// 5,5s,5c,SE 4.0 44 32 不支持 -// 6,6s,7,8,SE2 4.7 44 32 32 -// 6,6s,7,8plus 5.5 44 44 32 -// X,XS,11Pro 5.8 44 32 32 -// XR,11 6.1 44 44 32 -// XS MAX,11Pro Max 6.5 44 44 32 -// 12mini 5.4 44 32 32 -// 12,12Pro 6.1 44 32 32 -// 12Pro Max 6.7 44 44 32 +@property (class, nonatomic, readonly) BOOL is35InchScreen; + +@property (class, nonatomic, readonly) CGSize screenSizeFor67Inch; +@property (class, nonatomic, readonly) CGSize screenSizeFor65Inch; +@property (class, nonatomic, readonly) CGSize screenSizeFor61InchAndiPhone12; +@property (class, nonatomic, readonly) CGSize screenSizeFor61Inch; +@property (class, nonatomic, readonly) CGSize screenSizeFor58Inch; +@property (class, nonatomic, readonly) CGSize screenSizeFor55Inch; +@property (class, nonatomic, readonly) CGSize screenSizeFor54Inch; +@property (class, nonatomic, readonly) CGSize screenSizeFor47Inch; +@property (class, nonatomic, readonly) CGSize screenSizeFor40Inch; +@property (class, nonatomic, readonly) CGSize screenSizeFor35Inch; + +// 导航栏高度，包括竖屏，横屏，放大模式，非全屏模式 +// 机型\高度 尺寸 竖屏 横屏 放大模式 非全屏模式 +// 5,5s,5c,SE 4.0 44 32 不支持 56 +// 6,6s,7,8,SE2 4.7 44 32 32 56 +// 6,6s,7,8plus 5.5 44 44 32 56 +// X,XS,11Pro 5.8 44 32 32 56 +// XR,11 6.1 44 44 32 56 +// XS MAX,11Pro Max 6.5 44 44 32 56 +// 12mini 5.4 44 32 32 56 +// 12,12Pro 6.1 44 32 32 56 +// 12Pro Max 6.7 44 44 32 56 // iPad iOS12之前是44，之后是50 -@property(class, nonatomic, readonly) CGFloat navBarHeight; -@property(class, nonatomic, readonly) UIEdgeInsets safeAreaInsets; -@property(class, nonatomic, readonly) CGRect statusBarFrame; -@property(class, nonatomic, readonly) UIWindow *keyWindow; +@property (class, nonatomic, readonly) CGFloat navBarHeight; +@property (class, nonatomic, readonly) CGFloat navBarHeight_nonFullScreen; +@property (class, nonatomic, readonly) CGFloat tabBarHeight; +@property (class, nonatomic, readonly) UIEdgeInsets safeAreaInsets; +@property (class, nonatomic, readonly) CGRect statusBarFrame; +@property (class, nonatomic, readonly) UIWindow *keyWindow; + +// 用于获取 isNotchedScreen 设备的 insets，注意对于 iPad Pro 11-inch 这种无刘海凹槽但却有使用 Home Indicator 的设备，它的 top 返回0，bottom 返回 safeAreaInsets.bottom 的值 ++ (UIEdgeInsets)safeAreaInsetsForDeviceWithNotch; @end diff --git a/GKNavigationBarViewController/GKConfigure/GKNavigationBarConfigure.m b/GKNavigationBarViewController/GKConfigure/GKNavigationBarConfigure.m index ddff4b2..971923b 100644 --- a/GKNavigationBarViewController/GKConfigure/GKNavigationBarConfigure.m +++ b/GKNavigationBarViewController/GKConfigure/GKNavigationBarConfigure.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // https://github.com/QuintGao/GKNavigationBarViewController.git #import "GKNavigationBarConfigure.h" @@ -98,6 +98,13 @@ - (CGFloat)gk_fixedSpace { return DEVICE_WIDTH > 375.0f ? 20 : 16; } +- (NSBundle *)gk_libraryBundle { + NSBundle *bundle = [NSBundle bundleForClass:self.class]; + NSURL *bundleURL = [bundle URLForResource:@"GKNavigationBarViewController" withExtension:@"bundle"]; + if (!bundleURL) return nil; + return [NSBundle bundleWithURL:bundleURL]; +} + - (BOOL)isVelocityInSensitivity:(CGFloat)velocity { return (fabs(velocity) - (1000.0f * (1 - self.gk_snapMovementSensitivity))) > 0; } @@ -373,6 +380,37 @@ + (CGFloat)navBarHeight { } } ++ (CGFloat)navBarHeight_nonFullScreen { + return 56; +} + +static CGFloat tabBarHeight = -1; ++ (CGFloat)tabBarHeight { + if ([self isIPad]) { + if ([self isNotchedScreen]) { + tabBarHeight = 65; + }else { + if (GK_SYSTEM_VERSION >= 12.0) { + tabBarHeight = 50; + }else { + tabBarHeight = 49; + } + } + }else { + if (GK_IS_LANDSCAPE) { + if ([self isRegularScreen]) { + tabBarHeight = 49; + }else { + tabBarHeight = 32; + } + }else { + tabBarHeight = 49; + } + tabBarHeight += [self safeAreaInsetsForDeviceWithNotch].bottom; + } + return tabBarHeight; +} + + (UIEdgeInsets)safeAreaInsets { UIEdgeInsets safeAreaInsets = UIEdgeInsetsZero; if (@available(iOS 11.0, *)) { @@ -441,4 +479,32 @@ + (UIWindow *)keyWindow { return window; } ++ (UIEdgeInsets)safeAreaInsetsForDeviceWithNotch { + if (![self isNotchedScreen]) { + return UIEdgeInsetsZero; + } + + if ([self isIPad]) { + return UIEdgeInsetsMake(0, 0, 20, 0); + } + + UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation]; + + switch (orientation) { + case UIInterfaceOrientationPortrait: + return UIEdgeInsetsMake(44, 0, 34, 0); + + case UIInterfaceOrientationPortraitUpsideDown: + return UIEdgeInsetsMake(34, 0, 44, 0); + + case UIInterfaceOrientationLandscapeLeft: + case UIInterfaceOrientationLandscapeRight: + return UIEdgeInsetsMake(0, 44, 21, 44); + + case UIInterfaceOrientationUnknown: + default: + return UIEdgeInsetsMake(44, 0, 34, 0); + } +} + @end diff --git a/GKNavigationBarViewController/GKNavigationBarViewController.h b/GKNavigationBarViewController/GKNavigationBarViewController.h index 25e3cb3..0a8cf38 100644 --- a/GKNavigationBarViewController/GKNavigationBarViewController.h +++ b/GKNavigationBarViewController/GKNavigationBarViewController.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/7. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // 所有需要显示导航条的基类，可根据自己的需求设置导航栏 // 基本原理就是为每一个控制器添加自定义导航条，做到导航条与控制器相连的效果 diff --git a/GKNavigationBarViewController/GKNavigationBarViewController.m b/GKNavigationBarViewController/GKNavigationBarViewController.m index b6a76f2..4080dd2 100644 --- a/GKNavigationBarViewController/GKNavigationBarViewController.m +++ b/GKNavigationBarViewController/GKNavigationBarViewController.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/7. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKNavigationBarViewController.h" @@ -114,16 +114,42 @@ - (void)viewWillLayoutSubviews { } - (void)setupNavBarFrame { + BOOL isNonFullScreen = NO; + CGFloat viewW = GK_SCREEN_WIDTH; + CGFloat viewH = GK_SCREEN_HEIGHT; + // 防止在init方法中创建导航栏会提前触发viewDidLoad方法，所以做下判断 + if (self.isViewLoaded) { + UIViewController *parentVC = self; + while (parentVC.parentViewController) { + parentVC = parentVC.parentViewController; + } + viewW = parentVC.view.frame.size.width; + viewH = parentVC.view.frame.size.height; + if (viewW == 0 || viewH == 0) return; + + // 如果是通过present方式弹出且高度小于屏幕高度，则认为是非全屏 + isNonFullScreen = self.presentingViewController && viewH < GK_SCREEN_HEIGHT; + } CGFloat navBarH = 0.0f; if (GK_IS_iPad) { // iPad - navBarH = self.gk_statusBarHidden ? GK_NAVBAR_HEIGHT : GK_STATUSBAR_NAVBAR_HEIGHT; + if (isNonFullScreen) { + navBarH = GK_NAVBAR_HEIGHT_NFS; + self.gk_navigationBar.gk_nonFullScreen = YES; + }else { + navBarH = self.gk_statusBarHidden ? GK_NAVBAR_HEIGHT : GK_STATUSBAR_NAVBAR_HEIGHT; + } }else if (GK_IS_LANDSCAPE) { // 横屏不显示状态栏 navBarH = GK_NAVBAR_HEIGHT; }else { - if (GK_NOTCHED_SCREEN) { // 刘海屏手机 - navBarH = GK_SAFEAREA_TOP + GK_NAVBAR_HEIGHT; + if (isNonFullScreen) { + navBarH = GK_NAVBAR_HEIGHT_NFS; + self.gk_navigationBar.gk_nonFullScreen = YES; }else { - navBarH = self.gk_statusBarHidden ? GK_NAVBAR_HEIGHT : GK_STATUSBAR_NAVBAR_HEIGHT; + if (GK_NOTCHED_SCREEN) { // 刘海屏手机 + navBarH = GK_SAFEAREA_TOP + GK_NAVBAR_HEIGHT; + }else { + navBarH = self.gk_statusBarHidden ? GK_NAVBAR_HEIGHT : GK_STATUSBAR_NAVBAR_HEIGHT; + } } } self.gk_navigationBar.frame = CGRectMake(0, 0, GK_SCREEN_WIDTH, navBarH); diff --git a/GKNavigationBarViewController/GKTransition/GKBaseTransitionAnimation.h b/GKNavigationBarViewController/GKTransition/GKBaseTransitionAnimation.h index 16e0f8a..0892892 100644 --- a/GKNavigationBarViewController/GKTransition/GKBaseTransitionAnimation.h +++ b/GKNavigationBarViewController/GKTransition/GKBaseTransitionAnimation.h @@ -2,8 +2,8 @@ // GKBaseTransitionAnimation.h // GKNavigationBarViewController // -// Created by gaokun on 2019/1/15. -// Copyright © 2019 gaokun. All rights reserved. +// Created by QuintGao on 2019/1/15. +// Copyright © 2019 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewController/GKTransition/GKBaseTransitionAnimation.m b/GKNavigationBarViewController/GKTransition/GKBaseTransitionAnimation.m index b11f753..f1d8bab 100644 --- a/GKNavigationBarViewController/GKTransition/GKBaseTransitionAnimation.m +++ b/GKNavigationBarViewController/GKTransition/GKBaseTransitionAnimation.m @@ -2,8 +2,8 @@ // GKBaseTransitionAnimation.m // GKNavigationBarViewController // -// Created by gaokun on 2019/1/15. -// Copyright © 2019 gaokun. All rights reserved. +// Created by QuintGao on 2019/1/15. +// Copyright © 2019 QuintGao. All rights reserved. // #import "GKBaseTransitionAnimation.h" diff --git a/GKNavigationBarViewController/GKTransition/GKNavigationInteractiveTransition.h b/GKNavigationBarViewController/GKTransition/GKNavigationInteractiveTransition.h index aa4c844..9b1e691 100644 --- a/GKNavigationBarViewController/GKTransition/GKNavigationInteractiveTransition.h +++ b/GKNavigationBarViewController/GKTransition/GKNavigationInteractiveTransition.h @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/11/25. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewController/GKTransition/GKNavigationInteractiveTransition.m b/GKNavigationBarViewController/GKTransition/GKNavigationInteractiveTransition.m index a737b6c..d5a676e 100644 --- a/GKNavigationBarViewController/GKTransition/GKNavigationInteractiveTransition.m +++ b/GKNavigationBarViewController/GKTransition/GKNavigationInteractiveTransition.m @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/11/25. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKNavigationInteractiveTransition.h" diff --git a/GKNavigationBarViewController/GKTransition/GKPopTransitionAnimation.h b/GKNavigationBarViewController/GKTransition/GKPopTransitionAnimation.h index 0bed64f..c05d96a 100644 --- a/GKNavigationBarViewController/GKTransition/GKPopTransitionAnimation.h +++ b/GKNavigationBarViewController/GKTransition/GKPopTransitionAnimation.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKBaseTransitionAnimation.h" diff --git a/GKNavigationBarViewController/GKTransition/GKPopTransitionAnimation.m b/GKNavigationBarViewController/GKTransition/GKPopTransitionAnimation.m index 7d5a574..8200caa 100644 --- a/GKNavigationBarViewController/GKTransition/GKPopTransitionAnimation.m +++ b/GKNavigationBarViewController/GKTransition/GKPopTransitionAnimation.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKPopTransitionAnimation.h" diff --git a/GKNavigationBarViewController/GKTransition/GKPushTransitionAnimation.h b/GKNavigationBarViewController/GKTransition/GKPushTransitionAnimation.h index 8e61a6d..ba75dfc 100644 --- a/GKNavigationBarViewController/GKTransition/GKPushTransitionAnimation.h +++ b/GKNavigationBarViewController/GKTransition/GKPushTransitionAnimation.h @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKBaseTransitionAnimation.h" diff --git a/GKNavigationBarViewController/GKTransition/GKPushTransitionAnimation.m b/GKNavigationBarViewController/GKTransition/GKPushTransitionAnimation.m index ffea28f..0d0d2d0 100644 --- a/GKNavigationBarViewController/GKTransition/GKPushTransitionAnimation.m +++ b/GKNavigationBarViewController/GKTransition/GKPushTransitionAnimation.m @@ -3,7 +3,7 @@ // GKNavigationBarViewController // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKPushTransitionAnimation.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/AppDelegate.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/AppDelegate.h index 88ed4b8..4c2bb73 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/AppDelegate.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/AppDelegate.h @@ -2,8 +2,8 @@ // AppDelegate.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2019/8/16. -// Copyright © 2019 gaokun. All rights reserved. +// Created by QuintGao on 2019/8/16. +// Copyright © 2019 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/AppDelegate.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/AppDelegate.m index e193802..4808530 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/AppDelegate.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/AppDelegate.m @@ -2,8 +2,8 @@ // AppDelegate.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2019/8/16. -// Copyright © 2019 gaokun. All rights reserved. +// Created by QuintGao on 2019/8/16. +// Copyright © 2019 QuintGao. All rights reserved. // #import "AppDelegate.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKDemoBaseViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKDemoBaseViewController.h index ade4499..1e8c6dd 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKDemoBaseViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKDemoBaseViewController.h @@ -3,7 +3,7 @@ // GKNavigationControllerDemo // // Created by QuintGao on 2017/6/23. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKDemoBaseViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKDemoBaseViewController.m index 47ffdd3..ca0654d 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKDemoBaseViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKDemoBaseViewController.m @@ -3,7 +3,7 @@ // GKNavigationControllerDemo // // Created by QuintGao on 2017/6/23. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKDemoBaseViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKTabBaseViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKTabBaseViewController.h index 48307b5..89e4384 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKTabBaseViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKTabBaseViewController.h @@ -3,7 +3,7 @@ // GKNavigationControllerDemo // // Created by QuintGao on 2017/6/25. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKTabBaseViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKTabBaseViewController.m index d360f39..bbd5f85 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKTabBaseViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/BaseVC/GKTabBaseViewController.m @@ -3,7 +3,7 @@ // GKNavigationControllerDemo // // Created by QuintGao on 2017/6/25. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKTabBaseViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo000ViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo000ViewController.m index fc1cf53..c709872 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo000ViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo000ViewController.m @@ -65,6 +65,7 @@ - (void)viewDidLoad { self.gk_navBackgroundColor = [UIColor redColor]; self.gk_navShadowColor = [UIColor blackColor]; self.gk_backStyle = GKNavigationBarBackStyleWhite; + self.gk_navItemRightSpace = 30; self.gk_navRightBarButtonItem = self.moreItem; self.leftPushSwitch.on = NO; @@ -79,8 +80,13 @@ - (void)viewDidLoad { self.navBarAlphaSlider.value = self.gk_navBarAlpha; self.navBarAlphaLabel.text = [NSString stringWithFormat:@"导航栏透明度：%f", self.gk_navBarAlpha]; -// self.gk_systemGestureHandleDisabled = YES; + self.gk_systemGestureHandleDisabled = YES; self.gk_popDelegate = self; + + UIViewController *vc = [UIViewController new]; + [self addChildViewController:vc]; + vc.view.userInteractionEnabled = NO; + [self.view addSubview:vc.view]; } - (IBAction)interactivePopAction:(id)sender { diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo001ViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo001ViewController.h index ff584cc..4ed14e9 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo001ViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo001ViewController.h @@ -3,7 +3,7 @@ // GKNavigationController // // Created by QuintGao on 2017/6/22. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo001ViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo001ViewController.m index 3019d1c..373399d 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo001ViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo001ViewController.m @@ -3,7 +3,7 @@ // GKNavigationController // // Created by QuintGao on 2017/6/22. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKDemo001ViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo002ViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo002ViewController.h index fb38d1a..5396152 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo002ViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo002ViewController.h @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2018/7/31. -// Copyright © 2018年 gaokun. All rights reserved. +// Copyright © 2018年 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo002ViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo002ViewController.m index 602e3e6..e8bd82a 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo002ViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo002ViewController.m @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2018/7/31. -// Copyright © 2018年 gaokun. All rights reserved. +// Copyright © 2018年 QuintGao. All rights reserved. // #import "GKDemo002ViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo003ViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo003ViewController.h index 954dcd9..3e8f987 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo003ViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo003ViewController.h @@ -2,8 +2,8 @@ // GKDemo003ViewController.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2019/6/26. -// Copyright © 2019 gaokun. All rights reserved. +// Created by QuintGao on 2019/6/26. +// Copyright © 2019 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo003ViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo003ViewController.m index 2de733b..c71114c 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo003ViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo003ViewController.m @@ -2,8 +2,8 @@ // GKDemo003ViewController.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2019/6/26. -// Copyright © 2019 gaokun. All rights reserved. +// Created by QuintGao on 2019/6/26. +// Copyright © 2019 QuintGao. All rights reserved. // #import "GKDemo003ViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo004ViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo004ViewController.h index bd81d42..bdcd0d0 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo004ViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo004ViewController.h @@ -2,8 +2,8 @@ // GKDemo004ViewController.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2021/4/6. -// Copyright © 2021 gaokun. All rights reserved. +// Created by QuintGao on 2021/4/6. +// Copyright © 2021 QuintGao. All rights reserved. // #import "GKBaseViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo004ViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo004ViewController.m index d841bbb..3b7b685 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo004ViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo004ViewController.m @@ -2,8 +2,8 @@ // GKDemo004ViewController.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2021/4/6. -// Copyright © 2021 gaokun. All rights reserved. +// Created by QuintGao on 2021/4/6. +// Copyright © 2021 QuintGao. All rights reserved. // #import "GKDemo004ViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo005ViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo005ViewController.h index 5f94d8f..8e0984a 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo005ViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo005ViewController.h @@ -2,8 +2,8 @@ // GKDemo005ViewController.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2021/4/6. -// Copyright © 2021 gaokun. All rights reserved. +// Created by QuintGao on 2021/4/6. +// Copyright © 2021 QuintGao. All rights reserved. // #import "GKBaseViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo005ViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo005ViewController.m index 9a51cc7..a881895 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo005ViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemo005ViewController.m @@ -2,8 +2,8 @@ // GKDemo005ViewController.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2021/4/6. -// Copyright © 2021 gaokun. All rights reserved. +// Created by QuintGao on 2021/4/6. +// Copyright © 2021 QuintGao. All rights reserved. // #import "GKDemo005ViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemoTransitionViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemoTransitionViewController.h index c9e015b..4986783 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemoTransitionViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemoTransitionViewController.h @@ -2,8 +2,8 @@ // GKDemoTransitionViewController.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2020/11/30. -// Copyright © 2020 gaokun. All rights reserved. +// Created by QuintGao on 2020/11/30. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKBaseViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemoTransitionViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemoTransitionViewController.m index 9c2e989..2a869ff 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemoTransitionViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/DemoVC/GKDemoTransitionViewController.m @@ -2,8 +2,8 @@ // GKDemoTransitionViewController.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2020/11/30. -// Copyright © 2020 gaokun. All rights reserved. +// Created by QuintGao on 2020/11/30. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKDemoTransitionViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/GKMainViewController.h b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/GKMainViewController.h index 7ca3280..0dc80ad 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/GKMainViewController.h +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/GKMainViewController.h @@ -2,7 +2,7 @@ // GKMainViewController.h // GKNavigationBar // -// Created by gaokun on 2019/11/1. +// Created by QuintGao on 2019/11/1. // Copyright © 2019 QuintGao. All rights reserved. // diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/GKMainViewController.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/GKMainViewController.m index 921baa6..3140a0a 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/GKMainViewController.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/GKMainViewController.m @@ -2,7 +2,7 @@ // GKMainViewController.m // GKNavigationBar // -// Created by gaokun on 2019/11/1. +// Created by QuintGao on 2019/11/1. // Copyright © 2019 QuintGao. All rights reserved. // diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/GKToutiaoViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/GKToutiaoViewController.h" index 9df6a94..cab9104 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/GKToutiaoViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/GKToutiaoViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/GKToutiaoViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/GKToutiaoViewController.m" index 471b7c1..503a846 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/GKToutiaoViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/GKToutiaoViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKToutiaoViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoDetailViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoDetailViewController.h" index 08878dd..0a42c7d 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoDetailViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoDetailViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoDetailViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoDetailViewController.m" index 4e42f68..ff7a4ac 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoDetailViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoDetailViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKToutiaoDetailViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoHomeViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoHomeViewController.h" index 8bffa44..d07f67a 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoHomeViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoHomeViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoHomeViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoHomeViewController.m" index 01ba606..b1468cd 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoHomeViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoHomeViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKToutiaoHomeViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMicroViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMicroViewController.h" index 8c1851e..3e2e2e6 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMicroViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMicroViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMicroViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMicroViewController.m" index b664a88..7b50dba 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMicroViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMicroViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKToutiaoMicroViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMineViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMineViewController.h" index c259bdc..b5d9ba1 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMineViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMineViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMineViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMineViewController.m" index f04a887..da05374 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMineViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoMineViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKToutiaoMineViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoVideoViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoVideoViewController.h" index 07b8e5e..1bd6548 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoVideoViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoVideoViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoVideoViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoVideoViewController.m" index 1e1009b..4b84664 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoVideoViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\344\273\212\346\227\245\345\244\264\346\235\241/tab/GKToutiaoVideoViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/9. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKToutiaoVideoViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/GKWXViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/GKWXViewController.h" index b2fa55f..696e745 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/GKWXViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/GKWXViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/GKWXViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/GKWXViewController.m" index d6c10ff..930efa7 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/GKWXViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/GKWXViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKWXViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXDetailViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXDetailViewController.h" index b391f5e..d5484b7 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXDetailViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXDetailViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKBaseViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXDetailViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXDetailViewController.m" index 0daf055..86a4171 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXDetailViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXDetailViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKWXDetailViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXFindViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXFindViewController.h" index 79f2ba1..9dcfb15 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXFindViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXFindViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKTabBaseViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXFindViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXFindViewController.m" index 45b1063..a0dd6cb 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXFindViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXFindViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKWXFindViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXHomeViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXHomeViewController.h" index b3fdc4c..59e0d85 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXHomeViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXHomeViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKTabBaseViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXHomeViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXHomeViewController.m" index eae5efd..2fd2f3f 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXHomeViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXHomeViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKWXHomeViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXMineViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXMineViewController.h" index f803540..2f46d06 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXMineViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXMineViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKTabBaseViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXMineViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXMineViewController.m" index 65b1932..fa32d08 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXMineViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\345\276\256\344\277\241/tab/GKWXMineViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2020/10/17. -// Copyright © 2020 gaokun. All rights reserved. +// Copyright © 2020 QuintGao. All rights reserved. // #import "GKWXMineViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomePlayerViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomePlayerViewController.h" index 01d6b4b..ced1418 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomePlayerViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomePlayerViewController.h" @@ -2,8 +2,8 @@ // GKDouyinHomePlayerViewController.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomePlayerViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomePlayerViewController.m" index d6c6204..68cb72c 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomePlayerViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomePlayerViewController.m" @@ -2,8 +2,8 @@ // GKDouyinHomePlayerViewController.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import "GKDouyinHomePlayerViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeSearchViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeSearchViewController.h" index d62fecc..dabfc39 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeSearchViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeSearchViewController.h" @@ -2,8 +2,8 @@ // GKDouyinHomeSearchViewController.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeSearchViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeSearchViewController.m" index e150b04..4013f98 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeSearchViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeSearchViewController.m" @@ -2,8 +2,8 @@ // GKDouyinHomeSearchViewController.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import "GKDouyinHomeSearchViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeViewController.h" index d7641d2..eebb1a7 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeViewController.h" @@ -2,8 +2,8 @@ // GKDouyinHomeViewController.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeViewController.m" index 23ce8c1..fcb0d70 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinHomeViewController.m" @@ -2,8 +2,8 @@ // GKDouyinHomeViewController.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import "GKDouyinHomeViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinPersonalViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinPersonalViewController.h" index 561e2a8..92ddbaa 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinPersonalViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinPersonalViewController.h" @@ -2,8 +2,8 @@ // GKDouyinPersonalViewController.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinPersonalViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinPersonalViewController.m" index ed1fd59..c3bfaaa 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinPersonalViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinPersonalViewController.m" @@ -2,8 +2,8 @@ // GKDouyinPersonalViewController.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import "GKDouyinPersonalViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinScrollView.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinScrollView.h" index a639010..b615bc5 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinScrollView.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinScrollView.h" @@ -2,8 +2,8 @@ // GKDouyinScrollView.h // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinScrollView.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinScrollView.m" index 13c42aa..c14c218 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinScrollView.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\346\212\226\351\237\263/GKDouyinScrollView.m" @@ -2,8 +2,8 @@ // GKDouyinScrollView.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2018/9/11. -// Copyright © 2018年 gaokun. All rights reserved. +// Created by QuintGao on 2018/9/11. +// Copyright © 2018年 QuintGao. All rights reserved. // #import "GKDouyinScrollView.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/GKWYMusicViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/GKWYMusicViewController.h" index dc3b6a7..c21bb57 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/GKWYMusicViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/GKWYMusicViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/GKWYMusicViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/GKWYMusicViewController.m" index 3d1a44f..2b74687 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/GKWYMusicViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/GKWYMusicViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYMusicViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicAccountViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicAccountViewController.h" index 0b79746..9029d38 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicAccountViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicAccountViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicAccountViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicAccountViewController.m" index ecb511c..e7a66f6 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicAccountViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicAccountViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYMusicAccountViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicDetailViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicDetailViewController.h" index fef48d9..46b5b6f 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicDetailViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicDetailViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicDetailViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicDetailViewController.m" index dcea625..9fb90ab 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicDetailViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicDetailViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYMusicDetailViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFindViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFindViewController.h" index 871ccc7..b9a5a03 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFindViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFindViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFindViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFindViewController.m" index d2f6697..f982069 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFindViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFindViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYMusicFindViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFriendViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFriendViewController.h" index 60f7f06..457f430 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFriendViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFriendViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFriendViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFriendViewController.m" index c73beb6..fffec66 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFriendViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicFriendViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYMusicFriendViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicMineViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicMineViewController.h" index b861455..6dd70e4 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicMineViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicMineViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicMineViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicMineViewController.m" index f293a71..a5b02c6 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicMineViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\344\272\221\351\237\263\344\271\220/tab/GKWYMusicMineViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/10. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYMusicMineViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/GKWYNewsViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/GKWYNewsViewController.h" index 7441038..109a030 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/GKWYNewsViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/GKWYNewsViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/GKWYNewsViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/GKWYNewsViewController.m" index 5dd42af..9170e65 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/GKWYNewsViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/GKWYNewsViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYNewsViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsCommentViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsCommentViewController.h" index e75cce8..091ad90 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsCommentViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsCommentViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsCommentViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsCommentViewController.m" index ec1cb20..8409985 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsCommentViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsCommentViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYNewsCommentViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsDetailViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsDetailViewController.h" index 33a13ea..d18822f 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsDetailViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsDetailViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsDetailViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsDetailViewController.m" index 38211af..ea1beb2 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsDetailViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsDetailViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYNewsDetailViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsHomeViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsHomeViewController.h" index 7a4a437..4316581 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsHomeViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsHomeViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsHomeViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsHomeViewController.m" index e2d313f..d4a1398 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsHomeViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsHomeViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYNewsHomeViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsLiveViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsLiveViewController.h" index 5df67e4..822d3ef 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsLiveViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsLiveViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsLiveViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsLiveViewController.m" index ce225ca..dfcdf97 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsLiveViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsLiveViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYNewsLiveViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsNewViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsNewViewController.h" index 9a68a71..8d34a64 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsNewViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsNewViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsNewViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsNewViewController.m" index 83e7261..36f9cba 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsNewViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsNewViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYNewsNewViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsProfileViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsProfileViewController.h" index 76ce0e8..493eb56 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsProfileViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsProfileViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsProfileViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsProfileViewController.m" index c5c830e..07bf1dc 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsProfileViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsProfileViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYNewsProfileViewController.h" diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsVideoViewController.h" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsVideoViewController.h" index 234175c..eb8a391 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsVideoViewController.h" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsVideoViewController.h" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import diff --git "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsVideoViewController.m" "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsVideoViewController.m" index 62f90da..d64e3bc 100644 --- "a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsVideoViewController.m" +++ "b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/Classes/\347\275\221\346\230\223\346\226\260\351\227\273/tab/GKWYNewsVideoViewController.m" @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/7/11. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #import "GKWYNewsVideoViewController.h" diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/PrefixHeader.pch b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/PrefixHeader.pch index 050cdc4..e1fd2f8 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/PrefixHeader.pch +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/PrefixHeader.pch @@ -3,7 +3,7 @@ // GKNavigationBarViewControllerDemo // // Created by QuintGao on 2017/8/18. -// Copyright © 2017年 高坤. All rights reserved. +// Copyright © 2017年 QuintGao. All rights reserved. // #ifndef PrefixHeader_pch diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/main.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/main.m index 77fcce2..4e83cb7 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/main.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemo/main.m @@ -2,8 +2,8 @@ // main.m // GKNavigationBarViewControllerDemo // -// Created by gaokun on 2019/8/16. -// Copyright © 2019 gaokun. All rights reserved. +// Created by QuintGao on 2019/8/16. +// Copyright © 2019 QuintGao. All rights reserved. // #import diff --git a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemoTests/GKNavigationBarViewControllerDemoTests.m b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemoTests/GKNavigationBarViewControllerDemoTests.m index cceb341..b3f48b9 100644 --- a/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemoTests/GKNavigationBarViewControllerDemoTests.m +++ b/GKNavigationBarViewControllerDemo/GKNavigationBarViewControllerDemoTests/GKNavigationBarViewControllerDemoTests.m @@ -2,8 +2,8 @@ // GKNavigationBarViewControllerDemoTests.m // GKNavigationBarViewControllerDemoTests // -// Created by gaokun on 2019/8/16. -// Copyright © 2019 gaokun. All rights reserved. +// Created by QuintGao on 2019/8/16. +// Copyright © 2019 QuintGao. All rights reserved. // #import diff --git a/README.md b/README.md index 1fa8f39..c5387d7 100644 --- a/README.md +++ b/README.md @@ -201,6 +201,7 @@ pod 'GKNavigationBarViewController' 最近更新 ``` +2021.05.20 -- 3.0.2 导航栏间距处理优化，修复添加子控制器后的问题 2021.04.06 -- 3.0.1 增加协议，解决返回手势与其他手势冲突问题 2021.02.25 -- 3.0.0 导航栏高度优化，支持放大模式及iPad ```