Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 357efc5

Browse files
适配 iPhone X Max / XR
1 parent 2aa7235 commit 357efc5

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7412,8 +7412,8 @@
74127412
4EBED55A1D93C9F700E3684E /* Coding_iOS.entitlements */,
74137413
B16E6CA220C0FFFF0076026D /* Coding_Enterprise_iOS.entitlements */,
74147414
8EA6CFC619E240C40076D59C /* main.m */,
7415-
8EA6CF1519E240C40076D59C /* AppDelegate.h */,
74167415
8EA6CF1619E240C40076D59C /* AppDelegate.m */,
7416+
8EA6CF1519E240C40076D59C /* AppDelegate.h */,
74177417
4EFE8DB81B3A5727004B7559 /* Launch Screen.xib */,
74187418
B1C60CAA20C0FC750073D3CA /* Launch Screen_E.xib */,
74197419
8EA6CF1719E240C40076D59C /* Coding_iOS-Info.plist */,

‎Coding_iOS/Coding_iOS-Prefix.pch.example

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,14 @@
112112
#define kDevice_Is_iPhone6 ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(750, 1334), [[UIScreen mainScreen] currentMode].size) : NO)
113113
#define kDevice_Is_iPhone6Plus ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1242, 2208), [[UIScreen mainScreen] currentMode].size) : NO)
114114
#define kDevice_Is_iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
115+
#define kDevice_Is_iPhoneXR ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(828, 1792), [[UIScreen mainScreen] currentMode].size) : NO)
116+
#define kDevice_Is_iPhoneXMax ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1242, 2688), [[UIScreen mainScreen] currentMode].size) : NO)
117+
#define kDevice_Is_FullScreen (kDevice_Is_iPhoneX || kDevice_Is_iPhoneXR || kDevice_Is_iPhoneXMax)
115118
#define kDevice_Is_iPad [[UIDevice currentDevice].model isEqualToString:@"iPad"]
116119
#define kDevice_Use_iPhone4_Layout (kDevice_Is_iPhone4 || kDevice_Is_iPad)
117120

118-
#define kSafeArea_Top (kDevice_Is_iPhoneX? 44: 20)
119-
#define kSafeArea_Bottom (kDevice_Is_iPhoneX? 34: 0)
121+
#define kSafeArea_Top (kDevice_Is_FullScreen? 44: 20)
122+
#define kSafeArea_Bottom (kDevice_Is_FullScreen? 34: 0)
120123
#define kLine_MinHeight (1.0/ [UIScreen mainScreen].scale)
121124

122125
#define kScreen_Bounds [UIScreen mainScreen].bounds

‎Coding_iOS/Controllers/Login/IntroductionViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ - (void)configureViews{
587587

588588
CGFloat scaleFactor = 1.0;
589589
CGFloat desginHeight = 667.0;//iPhone6 的设计尺寸
590-
if (!kDevice_Is_iPhone6 && !kDevice_Is_iPhone6Plus && !kDevice_Is_iPhoneX) {
590+
if (!kDevice_Is_iPhone6 && !kDevice_Is_iPhone6Plus && !kDevice_Is_FullScreen) {
591591
scaleFactor = kScreen_Height/desginHeight;
592592
}
593593

‎Coding_iOS/Util/Manager/FunctionIntroManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ + (NSString *)p_imageNameForIndex:(NSInteger)index{
4848
imageName = [imageName stringByAppendingString:(kDevice_Is_iPhone6Plus? @"_ip6+":
4949
kDevice_Is_iPhone6? @"_ip6":
5050
kDevice_Is_iPhone5? @"_ip5":
51-
kDevice_Is_iPhoneX? @"_ipX":
51+
kDevice_Is_FullScreen? @"_ipX":
5252
@"_ip4")];
5353
return imageName;
5454
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /