Merge pull request gavinkwoe#94 from ganvinalix/master

增加iPhone6和iPhone Plus 屏幕检测宏定义
schoolVideo · Nov 11, 2014 · 55b8e4c · 55b8e4c
2 parents 063efff + 0d5c928
commit 55b8e4c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/framework/system/foundation/Bee_SystemInfo.h b/framework/system/foundation/Bee_SystemInfo.h
@@ -55,6 +55,8 @@ AS_PACKAGE( BeePackage_System, BeeSystemInfo, info );
 #define IOS4_OR_EARLIER		( !IOS5_OR_LATER )
 #define IOS3_OR_EARLIER		( !IOS4_OR_LATER )
 
+#define IS_SCREEN_55_INCH	([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1080, 1920), [[UIScreen mainScreen] currentMode].size) : NO)
+#define IS_SCREEN_47_INCH	([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(750, 1334), [[UIScreen mainScreen] currentMode].size) : NO)
 #define IS_SCREEN_4_INCH	([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(640, 1136), [[UIScreen mainScreen] currentMode].size) : NO)
 #define IS_SCREEN_35_INCH	([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(640, 960), [[UIScreen mainScreen] currentMode].size) : NO)
 
@@ -68,6 +70,8 @@ AS_PACKAGE( BeePackage_System, BeeSystemInfo, info );
 
 #define IS_SCREEN_4_INCH	(NO)
 #define IS_SCREEN_35_INCH	(NO)
+#define IS_SCREEN_47_INCH	(NO)
+#define IS_SCREEN_55_INCH	(NO)
 
 #endif	// #if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)