Skip to content

Commit 57e0d4d

Browse files
ChenYilongChenYilong
committed
1 parent 96da0f0 commit 57e0d4d

File tree

5 files changed

+33
-68
lines changed

5 files changed

+33
-68
lines changed

‎CYLTabBarController.xcodeproj/xcuserdata/chenyilong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+16-64
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
ignoreCount = "0"
2121
continueAfterRunningActions = "No"
2222
filePath = "Example/CYLTabBarControllerConfig.m"
23-
timestampString = "519049145.117056"
23+
timestampString = "534076601.296284"
2424
startingColumnNumber = "9223372036854775807"
2525
endingColumnNumber = "9223372036854775807"
2626
startingLineNumber = "208"
@@ -36,11 +36,11 @@
3636
ignoreCount = "0"
3737
continueAfterRunningActions = "No"
3838
filePath = "CYLTabBarController/CYLTabBarController.m"
39-
timestampString = "519151512.189774"
39+
timestampString = "534076601.296366"
4040
startingColumnNumber = "9223372036854775807"
4141
endingColumnNumber = "9223372036854775807"
42-
startingLineNumber = "212"
43-
endingLineNumber = "212"
42+
startingLineNumber = "211"
43+
endingLineNumber = "211"
4444
landmarkName = "-setViewControllers:"
4545
landmarkType = "7">
4646
</BreakpointContent>
@@ -52,45 +52,13 @@
5252
ignoreCount = "0"
5353
continueAfterRunningActions = "No"
5454
filePath = "CYLTabBarController/CYLTabBarController.m"
55-
timestampString = "519151512.189913"
55+
timestampString = "534076601.296789"
5656
startingColumnNumber = "9223372036854775807"
5757
endingColumnNumber = "9223372036854775807"
58-
startingLineNumber = "210"
59-
endingLineNumber = "210"
58+
startingLineNumber = "209"
59+
endingLineNumber = "209"
6060
landmarkName = "-setViewControllers:"
6161
landmarkType = "7">
62-
<Locations>
63-
<Location
64-
shouldBeEnabled = "Yes"
65-
ignoreCount = "0"
66-
continueAfterRunningActions = "No"
67-
symbolName = "-[CYLTabBarController setViewControllers:]"
68-
moduleName = "CYLTabBarController"
69-
usesParentBreakpointCondition = "Yes"
70-
urlString = "file:///Users/chenyilong/Documents/Git/%E7%AC%AC%E4%B8%89%E6%96%B9/CYLTabBarController/CYLTabBarController/CYLTabBarController.m"
71-
timestampString = "519151624.53257"
72-
startingColumnNumber = "9223372036854775807"
73-
endingColumnNumber = "9223372036854775807"
74-
startingLineNumber = "210"
75-
endingLineNumber = "210"
76-
offsetFromSymbolStart = "1380">
77-
</Location>
78-
<Location
79-
shouldBeEnabled = "Yes"
80-
ignoreCount = "0"
81-
continueAfterRunningActions = "No"
82-
symbolName = "-[CYLTabBarController setViewControllers:]"
83-
moduleName = "CYLTabBarController"
84-
usesParentBreakpointCondition = "Yes"
85-
urlString = "file:///Users/chenyilong/Documents/Git/%E7%AC%AC%E4%B8%89%E6%96%B9/CYLTabBarController/CYLTabBarController/CYLTabBarController.m"
86-
timestampString = "519151624.534434"
87-
startingColumnNumber = "9223372036854775807"
88-
endingColumnNumber = "9223372036854775807"
89-
startingLineNumber = "210"
90-
endingLineNumber = "210"
91-
offsetFromSymbolStart = "1395">
92-
</Location>
93-
</Locations>
9462
</BreakpointContent>
9563
</BreakpointProxy>
9664
<BreakpointProxy
@@ -100,39 +68,23 @@
10068
ignoreCount = "0"
10169
continueAfterRunningActions = "No"
10270
filePath = "CYLTabBarController/CYLTabBarController.m"
103-
timestampString = "519151512.190002"
71+
timestampString = "534076601.297083"
10472
startingColumnNumber = "9223372036854775807"
10573
endingColumnNumber = "9223372036854775807"
106-
startingLineNumber = "271"
107-
endingLineNumber = "271"
74+
startingLineNumber = "270"
75+
endingLineNumber = "270"
10876
landmarkName = "-getImageFromImageInfo:"
10977
landmarkType = "7">
11078
</BreakpointContent>
11179
</BreakpointProxy>
112-
<BreakpointProxy
113-
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
114-
<BreakpointContent
115-
shouldBeEnabled = "Yes"
116-
ignoreCount = "0"
117-
continueAfterRunningActions = "No"
118-
filePath = "CYLTabBarController/UIControl+CYLTabBarControllerExtention.m"
119-
timestampString = "519152834.205129"
120-
startingColumnNumber = "9223372036854775807"
121-
endingColumnNumber = "9223372036854775807"
122-
startingLineNumber = "28"
123-
endingLineNumber = "28"
124-
landmarkName = "-cyl_setShowTabBadgePoint:"
125-
landmarkType = "7">
126-
</BreakpointContent>
127-
</BreakpointProxy>
12880
<BreakpointProxy
12981
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
13082
<BreakpointContent
13183
shouldBeEnabled = "Yes"
13284
ignoreCount = "0"
13385
continueAfterRunningActions = "No"
13486
filePath = "CYLTabBarController/CYLPlusButton.m"
135-
timestampString = "519152834.2052"
87+
timestampString = "534076601.297364"
13688
startingColumnNumber = "9223372036854775807"
13789
endingColumnNumber = "9223372036854775807"
13890
startingLineNumber = "48"
@@ -147,13 +99,13 @@
14799
shouldBeEnabled = "Yes"
148100
ignoreCount = "0"
149101
continueAfterRunningActions = "No"
150-
filePath = "Example/AppDelegate.m"
151-
timestampString = "519152834.205264"
102+
filePath = "CYLTabBarController/CYLTabBarController.m"
103+
timestampString = "534076601.297412"
152104
startingColumnNumber = "9223372036854775807"
153105
endingColumnNumber = "9223372036854775807"
154-
startingLineNumber = "96"
155-
endingLineNumber = "96"
156-
landmarkName = "-tabBarController:shouldSelectViewController:"
106+
startingLineNumber = "54"
107+
endingLineNumber = "54"
108+
landmarkName = "-viewDidLayoutSubviews"
157109
landmarkType = "7">
158110
</BreakpointContent>
159111
</BreakpointProxy>

‎CYLTabBarController/CYLTabBar.m

+9
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ - (CGSize)sizeThatFits:(CGSize)size {
6363
return sizeThatFits;
6464
}
6565

66+
- (void)setFrame:(CGRect)frame {
67+
if (CYL_IS_IPHONE_X) {
68+
if (self.superview && CGRectGetMaxY(self.superview.bounds) != CGRectGetMaxY(frame)) {
69+
frame.origin.y = CGRectGetHeight(self.superview.bounds) - CGRectGetHeight(frame);
70+
}
71+
}
72+
[super setFrame:frame];
73+
}
74+
6675
/**
6776
* lazy load tabBarButtonArray
6877
*

‎CYLTabBarController/CYLTabBarController.m

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ - (void)viewDidLayoutSubviews {
6363
}
6464
!self.viewDidLayoutSubviewsBlock ?: self.viewDidLayoutSubviewsBlock(self);
6565
});
66-
6766
}
6867

6968
- (void)viewWillLayoutSubviews {

‎CYLTabBarController/UIControl+CYLTabBarControllerExtention.m

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#import "UIControl+CYLTabBarControllerExtention.h"
1010
#import <objc/runtime.h>
1111
#import "UIView+CYLTabBarControllerExtention.h"
12+
#import "CYLConstants.h"
1213

1314
@implementation UIControl (CYLTabBarControllerExtention)
1415

@@ -21,10 +22,16 @@ - (void)cyl_removeTabBadgePoint {
2122
}
2223

2324
- (BOOL)cyl_isShowTabBadgePoint {
25+
if (CYL_IS_IPHONE_X) {
26+
return NO;
27+
}
2428
return !self.cyl_tabBadgePointView.hidden;
2529
}
2630

2731
- (void)cyl_setShowTabBadgePointIfNeeded:(BOOL)showTabBadgePoint {
32+
if (CYL_IS_IPHONE_X) {
33+
return;
34+
}
2835
@try {
2936
[self cyl_setShowTabBadgePoint:showTabBadgePoint];
3037
} @catch (NSException *exception) {

‎Example/CYLTabBarControllerConfig.m

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ @implementation CYLBaseNavigationController
1818

1919
- (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
2020
if (self.viewControllers.count > 0) {
21-
if (!IS_IPHONE_X) {
22-
viewController.hidesBottomBarWhenPushed = YES;
23-
}
21+
viewController.hidesBottomBarWhenPushed = YES;
2422
}
2523
[super pushViewController:viewController animated:animated];
2624
}

0 commit comments

Comments
 (0)