Skip to content

Commit 5183822

Browse files
authored
Merge ==> pull request #45 from fakedestinyck/master
增加对iPhone X的屏幕适配
2 parents 0310cd3 + 9c083e2 commit 5183822

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

src/TKChatRoomSensitiveViewController.m

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ @implementation TKChatRoomSensitiveViewController
2020

2121
- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
2222
if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
23-
_tableViewInfo = [[objc_getClass("MMTableViewInfo") alloc] initWithFrame:[UIScreen mainScreen].bounds style:UITableViewStyleGrouped];
23+
// 增加对iPhone X的屏幕适配
24+
CGRect winSize = [UIScreen mainScreen].bounds;
25+
if (winSize.size.height == 812) {
26+
winSize.size.height -= 88;
27+
winSize.origin.y = 88;
28+
}
29+
_tableViewInfo = [[objc_getClass("MMTableViewInfo") alloc] initWithFrame:winSize style:UITableViewStyleGrouped];
2430
_tableViewInfo.delegate = self;
2531
}
2632
return self;

src/TKSettingViewController.m

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ @implementation TKSettingViewController
2222

2323
- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
2424
if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
25-
_tableViewInfo = [[objc_getClass("MMTableViewInfo") alloc] initWithFrame:[UIScreen mainScreen].bounds style:UITableViewStyleGrouped];
25+
// 增加对iPhone X的屏幕适配
26+
CGRect winSize = [UIScreen mainScreen].bounds;
27+
if (winSize.size.height == 812) { // iPhone X 高为812
28+
winSize.size.height -= 88;
29+
winSize.origin.y = 88;
30+
}
31+
_tableViewInfo = [[objc_getClass("MMTableViewInfo") alloc] initWithFrame:winSize style:UITableViewStyleGrouped];
2632
}
2733
return self;
2834
}

0 commit comments

Comments
 (0)