diff --git a/EasyNavigation.podspec b/EasyNavigation.podspec index 3b0d569..ffc868c 100644 --- a/EasyNavigation.podspec +++ b/EasyNavigation.podspec @@ -3,13 +3,13 @@ Pod::Spec.new do |s| s.name = "EasyNavigation" - s.version = "1.0.3" + s.version = "1.0.4" s.summary = "一款超级简单的导航条管理工具,没有UINavigationBar和UINavigationItem这两个类。完全是对UIView的操作。 所有操作都能一行代码,操作之间完全独立,互不影响。" s.description = "一款超级简单的导航条管理工具。完全自定义导航条。没有UINavigationBar和UINavigationItem这两个类。完全是对UIView的操作。 所有操作都能一行代码,操作之间完全独立,互不影响。集成简单,使用简单。" s.homepage = "https://github.com/chenliangloveyou/EasyNavigation" s.license = "MIT" s.author = { "chenliangloveyou" => "ios_elite@163.com" } - s.source = { :git => "https://github.com/chenliangloveyou/EasyNavigation.git", :commit => "d8faf2106c34aa5fe3daba0a76549dc05486196c" } + s.source = { :git => "https://github.com/chenliangloveyou/EasyNavigation.git", :commit => "7b9344824994477d3ffae056aa20dbeba801a9ca" } s.source_files = "EasyNavigation/*.{h,m}" s.resource = 'EasyNavigation/EasyNavButton.bundle' # s.public_header_files = "Classes/**/*.h" diff --git a/EasyNavigation/UIViewController+EasyNavigationExt.h b/EasyNavigation/UIViewController+EasyNavigationExt.h index 8b429ac..176e9f7 100644 --- a/EasyNavigation/UIViewController+EasyNavigationExt.h +++ b/EasyNavigation/UIViewController+EasyNavigationExt.h @@ -19,7 +19,7 @@ /** * 当前的导航控制器 */ -@property (nonatomic, weak) EasyNavigationController *vcEasyNavController ; +//@property (nonatomic, weak) EasyNavigationController *vcEasyNavController ; /** * 当前的导航条 diff --git a/EasyNavigation/UIViewController+EasyNavigationExt.m b/EasyNavigation/UIViewController+EasyNavigationExt.m index 3b0a16a..6d46693 100644 --- a/EasyNavigation/UIViewController+EasyNavigationExt.m +++ b/EasyNavigation/UIViewController+EasyNavigationExt.m @@ -52,15 +52,15 @@ - (void)setCustomBackGestureEdge:(CGFloat)customBackGestureEdge } -- (EasyNavigationController *)vcEasyNavController -{ - EasyNavigationController *vcNav= objc_getAssociatedObject(self, _cmd); - if (nil == vcNav) { - vcNav = (EasyNavigationController *)self.navigationController ; - objc_setAssociatedObject(self, @selector(vcEasyNavController), vcNav, OBJC_ASSOCIATION_ASSIGN); - } - return vcNav ; -} +//- (EasyNavigationController *)vcEasyNavController +//{ +// EasyNavigationController *vcNav= objc_getAssociatedObject(self, _cmd); +// if (nil == vcNav) { +// vcNav = (EasyNavigationController *)self.navigationController ; +// objc_setAssociatedObject(self, @selector(vcEasyNavController), vcNav, OBJC_ASSOCIATION_ASSIGN); +// } +// return vcNav ; +//} - (EasyNavigationView *)navigationView { diff --git a/EasyNavigationDemo.xcodeproj/project.xcworkspace/xcuserdata/nf.xcuserdatad/UserInterfaceState.xcuserstate b/EasyNavigationDemo.xcodeproj/project.xcworkspace/xcuserdata/nf.xcuserdatad/UserInterfaceState.xcuserstate index ccb8a5c..fe11918 100644 Binary files a/EasyNavigationDemo.xcodeproj/project.xcworkspace/xcuserdata/nf.xcuserdatad/UserInterfaceState.xcuserstate and b/EasyNavigationDemo.xcodeproj/project.xcworkspace/xcuserdata/nf.xcuserdatad/UserInterfaceState.xcuserstate differ