From fac61655d3d255468491d0829c8814c0cf0a62dd Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期四, 02 七月 2020 13:50:41 +0800 Subject: [PATCH] 2020-07-02 1.更新最新SDK。 2.参试封装工具类，只初始化一次SDK方案，暂时解决SDK无法释放问题。 --- ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/GDHDLUtlis.h | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/GDHDLUtlis.h b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/GDHDLUtlis.h index 92b46e7..910f2b6 100644 --- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/GDHDLUtlis.h +++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/GDHDLUtlis.h @@ -13,8 +13,12 @@ #define IOS9 (TP_SYSTEM_VERSION >= 9.0) #define IOS10 (TP_SYSTEM_VERSION >= 10.0) -//鏄惁鏄疘PhoneX鐨勮澶� -#define IPhoneX ([[UIScreen mainScreen] bounds].size.height == 812) +//鏄惁鏄� iPhoneX_XS_11Pro璁惧 +#define IPhoneX ([UIScreen mainScreen].bounds.size.width == 375.0f && [UIScreen mainScreen].bounds.size.height == 812.0f) +//鏄惁鏄� iPhoneXSMax_XR_11_11ProMax +#define IPhoneXR ([UIScreen mainScreen].bounds.size.width == 414.0f && [UIScreen mainScreen].bounds.size.height == 896.0f) +// 鏄叏闈㈠睆鎵嬫満 +#define IsFullScreen (IPhoneX || IPhoneXR) // Screen #define APP_SCREEN_BOUNDS [[UIScreen mainScreen] bounds] @@ -22,15 +26,15 @@ #define APP_SCREEN_WIDTH (APP_SCREEN_BOUNDS.size.width) #define APP_STATUS_FRAME [UIApplication sharedApplication].statusBarFrame -#define APP_TOP_BAR_HEIGHT (IPhoneX ? 88 : (IOS7 ? 64 : 44)) -#define APP_STATUS_BAR_HEIGHT (IPhoneX ? 44: (IOS7 ? 20 : 0)) -#define APP_STATUS_BAR_HEIGHT_TURE (IPhoneX ? 44: (IOS7 ? 0 : 0)) +#define APP_TOP_BAR_HEIGHT (IsFullScreen ? 88 : (IOS7 ? 64 : 44)) +#define APP_STATUS_BAR_HEIGHT (IsFullScreen ? 44: (IOS7 ? 20 : 0)) +#define APP_STATUS_BAR_HEIGHT_TURE (IsFullScreen ? 44: (IOS7 ? 0 : 0)) #define APP_TOOL_BAR_HEIGHT 49 -#define APP_TAB_BAR_HEIGHT (IPhoneX ? (49 + 34): 49) +#define APP_TAB_BAR_HEIGHT (IsFullScreen ? (49 + 34): 49) #define APP_CONTENT_WIDTH (APP_SCREEN_BOUNDS.size.width) -#define APP_BUTTOM_HEIGHT (IPhoneX ? 34: 0) +#define APP_BUTTOM_HEIGHT (IsFullScreen ? 34: 0) #define APP_CONTENT_HEIGHT (APP_SCREEN_HEIGHT - APP_TOP_BAR_HEIGHT - APP_TAB_BAR_HEIGHT) -#define APP_VISIBLE_HEIGHT (APP_SCREEN_HEIGHT - APP_TOP_BAR_HEIGHT - APP_BUTTOM_HEIGHT) +#define APP_VISIBLE_HEIGHT (APP_SCREEN_HEIGHT - APP_TOP_BAR_HEIGHT -APP_BUTTOM_HEIGHT) #define APP_B_HEIGHT (APP_SCREEN_HEIGHT - APP_BUTTOM_HEIGHT) #define APP_UIFont @"PingFangSC-Regular" #define APP_UIFont_BOLD @"PingFangSC-Semibold" -- Gitblit v1.8.0