From 25f409185a53e5e7beb17518a684298d92d31b3f Mon Sep 17 00:00:00 2001 From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local> Date: Fri, 04 May 2018 13:34:53 +0800 Subject: [PATCH] iPhone x 屏幕适配修改 --- pregnancy_guard/BaseProject/Define/Defines.h | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/pregnancy_guard/BaseProject/Define/Defines.h b/pregnancy_guard/BaseProject/Define/Defines.h index cd0d6f5..d63d2f0 100644 --- a/pregnancy_guard/BaseProject/Define/Defines.h +++ b/pregnancy_guard/BaseProject/Define/Defines.h @@ -35,6 +35,8 @@ #define IsRetain ([[UIScreen mainScreen] scale] >= 2.0) #define SCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height #define SCREEN_WIDTH [[UIScreen mainScreen] bounds].size.width +#define kScreenBounds [UIScreen mainScreen].bounds + #define ScreenMaxLength (MAX(SCREEN_WIDTH, SCREEN_HEIGHT)) #define ScreenMinLength (MIN(SCREEN_WIDTH, SCREEN_HEIGHT)) @@ -43,6 +45,18 @@ #define IsiPhone5 (IsiPhone && ScreenMaxLength == 568.0) #define IsiPhone6 (IsiPhone && ScreenMaxLength == 667.0) #define IsiPhone6P (IsiPhone && ScreenMaxLength == 736.0) +#define IsiPhoneX (IsiPhone && ScreenMaxLength == 812.0) + +#define KyNavigationBarHeight 44.0f +#define KyTabBarHeight IPhoneX_Normal(83.0f,49.0f) +#define KyStatusBarHeight IPhoneX_Normal(44.0f,20.0f) +#define KcontentViewHeight kMainScreenHeight-KyNavigationBarHeight-KyTabBarHeight +#define KcontentTabViewHeight KcontentViewHeight-KyTabBarHeight +#define KCornerRadiusWidth 5.0f +#define KCornerBorderWidth 0.3f +#define KySafeAeraHeight 34.0 +#define IPhoneX_Normal(a,b) ((CGSizeEqualToSize(CGSizeMake(375, 812),[[UIScreen mainScreen] bounds].size))? a:b) +#define IPhone4_5_6_6P_X(a,b,c,d,e) (CGSizeEqualToSize(CGSizeMake(320, 480), [[UIScreen mainScreen] bounds].size) ?(a) :(CGSizeEqualToSize(CGSizeMake(320, 568), [[UIScreen mainScreen] bounds].size) ? (b): (CGSizeEqualToSize(CGSizeMake(375, 667), [[UIScreen mainScreen] bounds].size) ?(c) : (CGSizeEqualToSize(CGSizeMake(414, 736), [[UIScreen mainScreen] bounds].size) ?(d) : (CGSizeEqualToSize(CGSizeMake(375, 812), [[UIScreen mainScreen] bounds].size) ?(e) :0))))) // iOS������������ #define IOSBaseVersion11 11.0 @@ -52,6 +66,7 @@ #define IOSBaseVersion7 7.0 #define IOSBaseVersion6 6.0 +#define TabbarHeight ([[UIApplication sharedApplication] statusBarFrame].size.height>20?83:49) // ������iPhone x ������������ // ������������APP��������� #define XcodeAppVersion [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] @@ -99,6 +114,7 @@ #define FONT18 [UIFont systemFontOfSize:18.0] // ������������ +#define NavBar_Height ((SCREEN_HEIGHT == 812) ? 88.0 : 64.0) #define NavBarHeight 44 #define NavBarHeight7 64 /*! Status bar height. */ @@ -185,5 +201,18 @@ #define DEVICE_CONTROL_COMMAND_WATERTIME 9 // ��������������������������� #define DEVICE_CONTROL_COMMAND_VENTILATIONTIME 10 // ������������������������ +#define BLE_DEVICE_UUID @"0003CDD0-0000-1000-8000-00805F9B0131" +#define LISTON_DEVICE_UUID @"0003CDD1-0000-1000-8000-00805F9B0131" // ������ +#define WRITE_DEVICE_UUID @"0003CDD2-0000-1000-8000-00805F9B0131" // ��������� +// < 0.25������ +// >= 0.25 && < 0.8������ +// >= 0.8 && < 2������ +// >= 2������ + +#define FUSHE_MIN_VALUE 0 +#define FUSHE_SAFE_VALUE 250 // ������ +#define FUSHE_SLIGHT_VALUE 800 // ������ +#define FUSHE_MODERATE_VALUE 2000 // ������ +#define FUSHE_MAX_VALUE 4000 // ������ -- Gitblit v1.8.0