diff --git a/ZYShareView/ZYShareSheetView.m b/ZYShareView/ZYShareSheetView.m index a3d4842..851dda6 100755 --- a/ZYShareView/ZYShareSheetView.m +++ b/ZYShareView/ZYShareSheetView.m @@ -52,6 +52,10 @@ - (void)layoutSubviews // 取消按钮 self.cancelButton.frame = CGRectMake(0, self.frame.size.height - ZY_CancelButtonHeight, ZY_ScreenWidth, ZY_CancelButtonHeight); + if (is_iPhoneX) { + [self.cancelButton setTitleEdgeInsets:UIEdgeInsetsMake(0, 0, 30, 0)]; + } + // TableView self.tableView.frame = CGRectMake(0, self.titleHeight, ZY_ScreenWidth, self.dataArray.count * ZY_ItemCellHeight); diff --git a/ZYShareView/ZYShareViewDefine.h b/ZYShareView/ZYShareViewDefine.h index 041a186..b4e53e2 100755 --- a/ZYShareView/ZYShareViewDefine.h +++ b/ZYShareView/ZYShareViewDefine.h @@ -11,11 +11,13 @@ #define ZY_ScreenHeight [UIScreen mainScreen].bounds.size.height #define ZY_ScreenWidth [UIScreen mainScreen].bounds.size.width -#define ZY_CancelButtonHeight 49.f // 取消按钮的高度 +#define is_iPhoneX ((int)((ZY_ScreenHeight / ZY_ScreenWidth) * 100) == 216)?YES:NO + +#define ZY_CancelButtonHeight ((is_iPhoneX)?83.0f:49.0f) // 取消按钮的高度 #define ZY_ItemCellHeight 123.f // 每个item的高度 #define ZY_ItemCellWidth 72.f // 每个item的宽度 #define ZY_ItemCellPadding 14.f // item之间的距离 #define ZY_AnimateDuration 0.3 // 动画时间 -#define ZY_DimBackgroundAlpha 0.3 // 半透明背景的alpha值 \ No newline at end of file +#define ZY_DimBackgroundAlpha 0.3 // 半透明背景的alpha值 diff --git a/ZYShareViewDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ZYShareViewDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ZYShareViewDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +