From fe53210bd85f32e05787ebde42ffbfaf46ff0433 Mon Sep 17 00:00:00 2001 From: Allen Wu Date: Mon, 27 Nov 2017 18:19:25 -0800 Subject: [PATCH] More robust isZoomed check --- SDVersion/SDiOSVersion/SDiOSVersion.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SDVersion/SDiOSVersion/SDiOSVersion.m b/SDVersion/SDiOSVersion/SDiOSVersion.m index fcf181c..faa54e2 100755 --- a/SDVersion/SDiOSVersion/SDiOSVersion.m +++ b/SDVersion/SDiOSVersion/SDiOSVersion.m @@ -134,8 +134,9 @@ + (DeviceSize)resolutionSize return Screen5Dot5inch; } else if (screenHeight == 812) { return Screen5Dot8inch; - } else + } else { return UnknownSize; + } } + (DeviceSize)deviceSize @@ -219,7 +220,7 @@ + (BOOL)isZoomed { if ([self resolutionSize] == Screen4inch && [UIScreen mainScreen].nativeScale > 2) { return YES; - }else if ([self resolutionSize] == Screen4Dot7inch && [UIScreen mainScreen].scale == 3){ + } else if ([self resolutionSize] == Screen4Dot7inch && [UIScreen mainScreen].scale != [UIScreen mainScreen].nativeScale) { return YES; }