适配 iPhone X Max / XR

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -7412,8 +7412,8 @@
 				4EBED55A1D93C9F700E3684E /* Coding_iOS.entitlements */,
 				B16E6CA220C0FFFF0076026D /* Coding_Enterprise_iOS.entitlements */,
 				8EA6CFC619E240C40076D59C /* main.m */,
-				8EA6CF1519E240C40076D59C /* AppDelegate.h */,
 				8EA6CF1619E240C40076D59C /* AppDelegate.m */,
+				8EA6CF1519E240C40076D59C /* AppDelegate.h */,
 				4EFE8DB81B3A5727004B7559 /* Launch Screen.xib */,
 				B1C60CAA20C0FC750073D3CA /* Launch Screen_E.xib */,
 				8EA6CF1719E240C40076D59C /* Coding_iOS-Info.plist */,

Coding_iOS/Coding_iOS-Prefix.pch.example

@@ -112,11 +112,14 @@
 #define kDevice_Is_iPhone6 ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(750, 1334), [[UIScreen mainScreen] currentMode].size) : NO)
 #define kDevice_Is_iPhone6Plus ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1242, 2208), [[UIScreen mainScreen] currentMode].size) : NO)
 #define kDevice_Is_iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
+#define kDevice_Is_iPhoneXR ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(828, 1792), [[UIScreen mainScreen] currentMode].size) : NO)
+#define kDevice_Is_iPhoneXMax ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1242, 2688), [[UIScreen mainScreen] currentMode].size) : NO)
+#define kDevice_Is_FullScreen (kDevice_Is_iPhoneX || kDevice_Is_iPhoneXR || kDevice_Is_iPhoneXMax)
 #define kDevice_Is_iPad [[UIDevice currentDevice].model isEqualToString:@"iPad"]
 #define kDevice_Use_iPhone4_Layout (kDevice_Is_iPhone4 || kDevice_Is_iPad)
 
-#define kSafeArea_Top (kDevice_Is_iPhoneX? 44: 20)
-#define kSafeArea_Bottom (kDevice_Is_iPhoneX? 34: 0)
+#define kSafeArea_Top (kDevice_Is_FullScreen? 44: 20)
+#define kSafeArea_Bottom (kDevice_Is_FullScreen? 34: 0)
 #define kLine_MinHeight (1.0/ [UIScreen mainScreen].scale)
 
 #define kScreen_Bounds [UIScreen mainScreen].bounds

Coding_iOS/Controllers/Login/IntroductionViewController.m

@@ -587,7 +587,7 @@ - (void)configureViews{
 
     CGFloat scaleFactor = 1.0;
     CGFloat desginHeight = 667.0;//iPhone6 的设计尺寸
-    if (!kDevice_Is_iPhone6 && !kDevice_Is_iPhone6Plus && !kDevice_Is_iPhoneX) {
+    if (!kDevice_Is_iPhone6 && !kDevice_Is_iPhone6Plus && !kDevice_Is_FullScreen) {
         scaleFactor = kScreen_Height/desginHeight;
     }
 

Coding_iOS/Util/Manager/FunctionIntroManager.m

@@ -48,7 +48,7 @@ + (NSString *)p_imageNameForIndex:(NSInteger)index{
     imageName = [imageName stringByAppendingString:(kDevice_Is_iPhone6Plus? @"_ip6+":
                                                     kDevice_Is_iPhone6? @"_ip6":
                                                     kDevice_Is_iPhone5? @"_ip5":
-                                                    kDevice_Is_iPhoneX? @"_ipX":
+                                                    kDevice_Is_FullScreen? @"_ipX":
                                                     @"_ip4")];
     return imageName;
 }