引导页适配（5s~最新）

DreamSleep/DreamSleep.xcodeproj/project.pbxproj

@@ -242,7 +242,6 @@
 		D0B5ECA327F2D9DE003EDFE3 /* DreamSleep */ = {
 		D0B5ECA327F2D9DE003EDFE3 /* DreamSleep */ = {
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
-				D0C50B4327FD3DE800DC68F0 /* PrivacyPolicy */,
 				D04567AA27F6D067009F0A82 /* Main */,
 				D04567AA27F6D067009F0A82 /* Main */,
 				D04567AB27F6D0A5009F0A82 /* Home */,
 				D04567AB27F6D0A5009F0A82 /* Home */,
 				D04567AC27F6D0BA009F0A82 /* AISleepCoach */,
 				D04567AC27F6D0BA009F0A82 /* AISleepCoach */,
@@ -253,6 +252,7 @@
 				D027EE2327FB3C99004BBA61 /* Network */,
 				D027EE2327FB3C99004BBA61 /* Network */,
 				D027EE2A27FB5285004BBA61 /* Category */,
 				D027EE2A27FB5285004BBA61 /* Category */,
 				D04567A827F6D018009F0A82 /* Resource */,
 				D04567A827F6D018009F0A82 /* Resource */,
+				D0C50B4327FD3DE800DC68F0 /* PrivacyPolicy */,
 				D0B5ECAA27F2D9DE003EDFE3 /* ViewController.h */,
 				D0B5ECAA27F2D9DE003EDFE3 /* ViewController.h */,
 				D0B5ECAB27F2D9DE003EDFE3 /* ViewController.m */,
 				D0B5ECAB27F2D9DE003EDFE3 /* ViewController.m */,
 				D076C14127F49DC000340B46 /* TmpViewController.h */,
 				D076C14127F49DC000340B46 /* TmpViewController.h */,

DreamSleep/DreamSleep/Launcher/LeadView.m

@@ -23,8 +23,19 @@
         [self addSubview:self.mainScrollView];
         [self addSubview:self.mainScrollView];
         [self addSubview:self.pageControl];
         [self addSubview:self.pageControl];
         
         
+        CGFloat bottom_margin = 0;
+        if (is_iPhoneX_series()) {
+            bottom_margin = -90.0;
+        } else if (iPhone6P) {
+            bottom_margin = -40;
+        } else if (iPhone6) {
+            bottom_margin = -30;
+        } else if (iPhone5) {
+            bottom_margin = -20;
+        }
+        
         [self.pageControl mas_makeConstraints:^(MASConstraintMaker *make) {
         [self.pageControl mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.bottom.equalTo(self.mas_bottom).offset(-50);
+            make.bottom.equalTo(self.mas_bottom).offset(bottom_margin);
             make.centerX.equalTo(self).with.offset(0);
             make.centerX.equalTo(self).with.offset(0);
             make.width.equalTo(@(200));
             make.width.equalTo(@(200));
             make.height.equalTo(@(30));
             make.height.equalTo(@(30));
@@ -67,7 +78,7 @@
     [self addSubview:attrLabel];
     [self addSubview:attrLabel];
     
     
     [attrLabel mas_makeConstraints:^(MASConstraintMaker *make) {
     [attrLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.bottomMargin.equalTo(self.pageControl.mas_top).offset(-40);
+        make.topMargin.equalTo(bgIV.mas_bottom).offset(36);
         make.centerX.equalTo(bgIV).with.offset(0);
         make.centerX.equalTo(bgIV).with.offset(0);
     }];
     }];
 }
 }
@@ -121,8 +132,16 @@
         [_startBtn addTarget:self action:@selector(startAction) forControlEvents:UIControlEventTouchUpInside];
         [_startBtn addTarget:self action:@selector(startAction) forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:self.startBtn];
         [self addSubview:self.startBtn];
         
         
+        CGFloat offset = 0;
+        if (iPhone6P) {
+            offset = 10;
+        } else if (iPhone6) {
+            offset = 20;
+        } else if (iPhone5) {
+            offset = 15;
+        }
         [_startBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         [_startBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.bottom.equalTo(self.mas_bottom).offset(-30);
+            make.bottomMargin.equalTo(self.pageControl.mas_bottom).offset(offset);
             make.centerX.equalTo(self).with.offset(0);
             make.centerX.equalTo(self).with.offset(0);
         }];
         }];
     }
     }

DreamSleep/DreamSleep/Utils/AdaptationUtil.h

@@ -28,6 +28,12 @@
 /** 标签栏高度 */
 /** 标签栏高度 */
 #define kTabBarHeight ([[UIApplication sharedApplication] statusBarFrame].size.height > 20 ? 83 : 49)
 #define kTabBarHeight ([[UIApplication sharedApplication] statusBarFrame].size.height > 20 ? 83 : 49)
 
 
+/** 机型 */
+#define iPhoneX (kScreenHeight == 812)
+#define iPhone6P (kScreenHeight == 736)
+#define iPhone6 (kScreenHeight == 667)
+#define iPhone5 (kScreenHeight == 568)
+
 // UIColor
 // UIColor
 #define ColorFromRGB(R, G, B) [UIColor colorWithRed:((R) / 255.0f) green:((G) / 255.0f) blue:((B) / 255.0f) alpha:1.0f]
 #define ColorFromRGB(R, G, B) [UIColor colorWithRed:((R) / 255.0f) green:((G) / 255.0f) blue:((B) / 255.0f) alpha:1.0f]
 #define ColorFromRGBA(R, G, B, A) [UIColor colorWithRed:((R) / 255.0f) green:((G) / 255.0f) blue:((B) / 255.0f) alpha:A]
 #define ColorFromRGBA(R, G, B, A) [UIColor colorWithRed:((R) / 255.0f) green:((G) / 255.0f) blue:((B) / 255.0f) alpha:A]
@@ -60,5 +66,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface AdaptationUtil : NSObject
 @interface AdaptationUtil : NSObject
 // 获取keyWindow（在iOS 13.5真机存在bug？）
 // 获取keyWindow（在iOS 13.5真机存在bug？）
 + (UIWindow *)getKeyWindow;
 + (UIWindow *)getKeyWindow;
+
+#pragma mark - iPhone X系列判断
+BOOL is_iPhoneX_series(void);
 @end
 @end
 NS_ASSUME_NONNULL_END
 NS_ASSUME_NONNULL_END

DreamSleep/DreamSleep/Utils/AdaptationUtil.m

@@ -29,4 +29,20 @@
     }
     }
 }
 }
 
 
+#pragma mark - iPhone X系列判断
+BOOL is_iPhoneX_series(void) {
+    BOOL isX_series = NO;
+    if (UIDevice.currentDevice.userInterfaceIdiom != UIUserInterfaceIdiomPhone) {
+        return isX_series;
+    }
+    
+    if (@available(iOS 11.0, *)) {
+        UIWindow *mainWindow = [[[UIApplication sharedApplication] delegate] window];
+        if (mainWindow.safeAreaInsets.bottom > 0.0) {
+            isX_series = YES;
+        }
+    }
+    return isX_series;
+}
+
 @end
 @end