Commit 98cc572792a17e821ba8afe5da0c870299ded031
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive
Showing
2 changed files
with
14 additions
and
2 deletions
CNLiveScioLive/Pages/Header/SystemMacro.h
| ... | ... | @@ -39,7 +39,19 @@ |
| 39 | 39 | #define iPhone320 ((ScreenWidth==320)?YES:NO) |
| 40 | 40 | #define iPhone4 ((ScreenHeight==480)?YES:NO) |
| 41 | 41 | //适配iphoex |
| 42 | -#define iPhoneX ((MainScreenHeight == 812.0f) ? YES : NO) | |
| 42 | +//#define iPhoneX ((MainScreenHeight == 812.0f) ? YES : NO) | |
| 43 | +// 是否是iPhone X系列 | |
| 44 | +#define iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ?\ | |
| 45 | +(\ | |
| 46 | +CGSizeEqualToSize(CGSizeMake(375, 812),[UIScreen mainScreen].bounds.size)\ | |
| 47 | +||\ | |
| 48 | +CGSizeEqualToSize(CGSizeMake(812, 375),[UIScreen mainScreen].bounds.size)\ | |
| 49 | +||\ | |
| 50 | +CGSizeEqualToSize(CGSizeMake(414, 896),[UIScreen mainScreen].bounds.size)\ | |
| 51 | +||\ | |
| 52 | +CGSizeEqualToSize(CGSizeMake(896, 414),[UIScreen mainScreen].bounds.size))\ | |
| 53 | +:\ | |
| 54 | +NO) | |
| 43 | 55 | |
| 44 | 56 | //区分真机还是模拟器 |
| 45 | 57 | ... | ... |
CNLiveScioLive/Pages/Tools/CNLivePlayer/CNLivePlayerController.m
No preview for this file type