Commit 24af9b6c cgx

引导页适配(5s~最新)

1 个父辈 60bf271e
......@@ -242,7 +242,6 @@
D0B5ECA327F2D9DE003EDFE3 /* DreamSleep */ = {
isa = PBXGroup;
children = (
D0C50B4327FD3DE800DC68F0 /* PrivacyPolicy */,
D04567AA27F6D067009F0A82 /* Main */,
D04567AB27F6D0A5009F0A82 /* Home */,
D04567AC27F6D0BA009F0A82 /* AISleepCoach */,
......@@ -253,6 +252,7 @@
D027EE2327FB3C99004BBA61 /* Network */,
D027EE2A27FB5285004BBA61 /* Category */,
D04567A827F6D018009F0A82 /* Resource */,
D0C50B4327FD3DE800DC68F0 /* PrivacyPolicy */,
D0B5ECAA27F2D9DE003EDFE3 /* ViewController.h */,
D0B5ECAB27F2D9DE003EDFE3 /* ViewController.m */,
D076C14127F49DC000340B46 /* TmpViewController.h */,
......
......@@ -23,8 +23,19 @@
[self addSubview:self.mainScrollView];
[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) {
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.width.equalTo(@(200));
make.height.equalTo(@(30));
......@@ -67,7 +78,7 @@
[self addSubview:attrLabel];
[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);
}];
}
......@@ -121,8 +132,16 @@
[_startBtn addTarget:self action:@selector(startAction) forControlEvents:UIControlEventTouchUpInside];
[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) {
make.bottom.equalTo(self.mas_bottom).offset(-30);
make.bottomMargin.equalTo(self.pageControl.mas_bottom).offset(offset);
make.centerX.equalTo(self).with.offset(0);
}];
}
......

241.0 KB | 宽: | 高:

241.1 KB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

860.2 KB | 宽: | 高:

860.8 KB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f@2x.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.8 MB | 宽: | 高:

1.8 MB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_f.imageset/bg_guide_f@3x.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

255.8 KB | 宽: | 高:

256.0 KB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

880.2 KB | 宽: | 高:

880.5 KB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s@2x.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.7 MB | 宽: | 高:

1.7 MB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_s.imageset/bg_guide_s@3x.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

263.2 KB | 宽: | 高:

262.7 KB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.0 MB | 宽: | 高:

1.0 MB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t@2x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t@2x.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.2 MB | 宽: | 高:

2.2 MB | 宽: | 高:

DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t@3x.png
DreamSleep/DreamSleep/Resource/Assets.xcassets/Leading/bg_guide_t.imageset/bg_guide_t@3x.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
......@@ -28,6 +28,12 @@
/** 标签栏高度 */
#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
#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]
......@@ -60,5 +66,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface AdaptationUtil : NSObject
// 获取keyWindow(在iOS 13.5真机存在bug?)
+ (UIWindow *)getKeyWindow;
#pragma mark - iPhone X系列判断
BOOL is_iPhoneX_series(void);
@end
NS_ASSUME_NONNULL_END
......@@ -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
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!