From c4cb76b1e2a1f4142fa3f2f1167e40b4923ccbe4 Mon Sep 17 00:00:00 2001 From: yuzheng Date: Thu, 13 Sep 2018 14:05:38 +0800 Subject: [PATCH] =?UTF-8?q?XS=20XR=E7=9A=84deviceModel=E8=BF=98=E6=9C=AA?= =?UTF-8?q?=E7=9F=A5=EF=BC=8C=E6=94=B9=E4=B8=BA=E7=94=A8=E5=B0=BA=E5=AF=B8?= =?UTF-8?q?=E6=9D=A5=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AFiPhoneX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TZImagePickerController.m | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m index 08f32970..481aecb0 100644 --- a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m +++ b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m @@ -14,7 +14,6 @@ #import "TZAssetCell.h" #import "UIView+Layout.h" #import "TZImageManager.h" -#import @interface TZImagePickerController () { NSTimer *_timer; @@ -833,17 +832,10 @@ + (UIImage *)imageNamedFromMyBundle:(NSString *)name { @implementation TZCommonTools + (BOOL)tz_isIPhoneX { - struct utsname systemInfo; - uname(&systemInfo); - NSString *platform = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding]; - if ([platform isEqualToString:@"i386"] || [platform isEqualToString:@"x86_64"]) { - // 模拟器下采用屏幕的高度来判断 - return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) || - CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375))); - } - // iPhone10,6是美版iPhoneX 感谢hegelsu指出：https://github.com/banchichen/TZImagePickerController/issues/635 - BOOL isIPhoneX = [platform isEqualToString:@"iPhone10,3"] || [platform isEqualToString:@"iPhone10,6"]; - return isIPhoneX; + return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) || + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) || + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) || + CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414))); } + (CGFloat)tz_statusBarHeight {