Skip to content

Commit e92f23d

Browse files
committed
QMUINavigationController 不要引用 QMUINavigationButton
1 parent 802e37a commit e92f23d

2 files changed

Lines changed: 25 additions & 4 deletions

File tree

QMUIKit.podspec

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,30 @@ Pod::Spec.new do |s|
4949
end
5050

5151
ss.subspec 'QMUIButton' do |sss|
52-
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/*.{h,m}'
52+
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUIButton.{h,m}'
5353
sss.dependency 'QMUIKit/QMUIComponents/QMUILog'
54+
end
55+
56+
ss.subspec 'QMUIFillButton' do |sss|
57+
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUIFillButton.{h,m}'
58+
end
59+
60+
ss.subspec 'QMUIGhostButton' do |sss|
61+
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUIGhostButton.{h,m}'
62+
end
63+
64+
ss.subspec 'QMUILinkButton' do |sss|
65+
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUILinkButton.{h,m}'
66+
end
67+
68+
ss.subspec 'QMUINavigationButton' do |sss|
69+
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUINavigationButton.{h,m}'
5470
sss.dependency 'QMUIKit/QMUIMainFrame'
71+
sss.dependency 'QMUIKit/QMUIComponents/QMUILog'
72+
end
73+
74+
ss.subspec 'QMUIToolbarButton' do |sss|
75+
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUIToolbarButton.{h,m}'
5576
end
5677

5778
ss.subspec 'QMUITableView' do |sss|
@@ -266,6 +287,7 @@ Pod::Spec.new do |s|
266287
sss.dependency 'QMUIKit/QMUIComponents/QMUIImagePreviewViewController'
267288
sss.dependency 'QMUIKit/QMUIComponents/QMUITableViewCell'
268289
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
290+
sss.dependency 'QMUIKit/QMUIComponents/QMUINavigationButton'
269291
sss.dependency 'QMUIKit/QMUIComponents/QMUIAssetLibrary'
270292
sss.dependency 'QMUIKit/QMUIComponents/QMUIZoomImageView'
271293
sss.dependency 'QMUIKit/QMUIComponents/QMUIAlertController'

QMUIKit/QMUIMainFrame/QMUINavigationController.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#import "UINavigationController+QMUI.h"
1515
#import "QMUILog.h"
1616
#import "QMUIMultipleDelegates.h"
17-
#import "QMUINavigationButton.h"
1817

1918
@implementation UIViewController (QMUINavigationController)
2019

@@ -342,12 +341,12 @@ - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)ani
342341
if (currentViewController) {
343342
if (!NeedsBackBarButtonItemTitle) {
344343
// 会自动从 UIBarButtonItem.title 取值作为下一个界面的返回按钮的文字
345-
currentViewController.navigationItem.backBarButtonItem = [UIBarButtonItem qmui_itemWithTitle:@"" target:nil action:NULL];
344+
currentViewController.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:NULL];
346345
} else {
347346
UIViewController<QMUINavigationControllerAppearanceDelegate> *vc = (UIViewController<QMUINavigationControllerAppearanceDelegate> *)viewController;
348347
if ([vc respondsToSelector:@selector(backBarButtonItemTitleWithPreviousViewController:)]) {
349348
NSString *title = [vc backBarButtonItemTitleWithPreviousViewController:currentViewController];
350-
currentViewController.navigationItem.backBarButtonItem = [UIBarButtonItem qmui_itemWithTitle:title target:nil action:NULL];
349+
currentViewController.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:title style:UIBarButtonItemStylePlain target:nil action:NULL];
351350
}
352351
}
353352
}

0 commit comments

Comments
 (0)