Commit c4cb76b1 authored by yuzheng's avatar yuzheng

XS XR的deviceModel还未知,改为用尺寸来判断是否是iPhoneX

parent ca025a2d
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#import "TZAssetCell.h" #import "TZAssetCell.h"
#import "UIView+Layout.h" #import "UIView+Layout.h"
#import "TZImageManager.h" #import "TZImageManager.h"
#import <sys/utsname.h>
@interface TZImagePickerController () { @interface TZImagePickerController () {
NSTimer *_timer; NSTimer *_timer;
...@@ -833,17 +832,10 @@ ...@@ -833,17 +832,10 @@
@implementation TZCommonTools @implementation TZCommonTools
+ (BOOL)tz_isIPhoneX { + (BOOL)tz_isIPhoneX {
struct utsname systemInfo; return (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) ||
uname(&systemInfo); CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) ||
NSString *platform = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding]; CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) ||
if ([platform isEqualToString:@"i386"] || [platform isEqualToString:@"x86_64"]) { CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)));
// 模拟器下采用屏幕的高度来判断
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;
} }
+ (CGFloat)tz_statusBarHeight { + (CGFloat)tz_statusBarHeight {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment