Skip to content

Commit c4cb76b

Browse files
author
yuzheng
committed
XS XR的deviceModel还未知,改为用尺寸来判断是否是iPhoneX
1 parent ca025a2 commit c4cb76b

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#import "TZAssetCell.h"
1515
#import "UIView+Layout.h"
1616
#import "TZImageManager.h"
17-
#import <sys/utsname.h>
1817

1918
@interface TZImagePickerController () {
2019
NSTimer *_timer;
@@ -833,17 +832,10 @@ + (UIImage *)imageNamedFromMyBundle:(NSString *)name {
833832
@implementation TZCommonTools
834833

835834
+ (BOOL)tz_isIPhoneX {
836-
struct utsname systemInfo;
837-
uname(&systemInfo);
838-
NSString *platform = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding];
839-
if ([platform isEqualToString:@"i386"] || [platform isEqualToString:@"x86_64"]) {
840-
// 模拟器下采用屏幕的高度来判断
841-
return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) ||
842-
CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)));
843-
}
844-
// iPhone10,6是美版iPhoneX 感谢hegelsu指出:https://github.com/banchichen/TZImagePickerController/issues/635
845-
BOOL isIPhoneX = [platform isEqualToString:@"iPhone10,3"] || [platform isEqualToString:@"iPhone10,6"];
846-
return isIPhoneX;
835+
return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) ||
836+
CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) ||
837+
CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) ||
838+
CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)));
847839
}
848840

849841
+ (CGFloat)tz_statusBarHeight {

0 commit comments

Comments
 (0)