1.2.5版本更新

liyang · liyang · commit c61f4be4432b · 2019-07-04T10:39:15.000+08:00
1.新增属性:按钮宽度actionBtnWidth
2.修改属性默认值:按钮的圆角actionBtnCornerRadius默认改为0
diff --git a/LYEmptyView.podspec b/LYEmptyView.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
     s.name         = 'LYEmptyView'
 
-    s.version      = '1.2.3'
+    s.version      = '1.2.5'
 
     s.summary      = 'so esay integrate empty content view'
 
diff --git a/LYEmptyView/LYEmptyBaseView.m b/LYEmptyView/LYEmptyBaseView.m
@@ -19,10 +19,15 @@ - (instancetype)init
 {
     self = [super init];
     if (self) {
+        [self initialize];
         [self prepare];
     }
     return self;
 }
+
+- (void)initialize{
+}
+
 - (void)prepare{
     self.autoresizingMask = UIViewAutoresizingFlexibleWidth |  UIViewAutoresizingFlexibleHeight;
 }
diff --git a/LYEmptyView/LYEmptyView.h b/LYEmptyView/LYEmptyView.h
@@ -85,11 +85,15 @@
  */
 @property (nonatomic, assign) CGFloat  actionBtnHeight;
 /**
- 水平方向内边距, default is 30.f
+ 按钮的宽度, default is 0.f, (此属性和actionBtnHorizontalMargin只有一个有效，都>0时，此属性优先级大)
+ */
+@property (nonatomic, assign) CGFloat  actionBtnWidth;
+/**
+ 按钮的水平方向内边距, default is 30.f, (此属性和actionBtnWidth只有一个有效，都>0时，此属性优先级小)
  */
 @property (nonatomic, assign) CGFloat  actionBtnHorizontalMargin;
 /**
- 按钮的圆角大小, default is 5.f
+ 按钮的圆角大小, default is 0
  */
 @property (nonatomic, assign) CGFloat  actionBtnCornerRadius;
 /**
diff --git a/LYEmptyView/LYEmptyView.m b/LYEmptyView/LYEmptyView.m
@@ -19,8 +19,11 @@
 
 //按钮字体大小
 #define kActionBtnFont  [UIFont systemFontOfSize:14.f]
+
 //按钮高度
 #define kActionBtnHeight 40.f
+//按钮宽度
+#define kActionBtnWidth 120.f
 //水平方向内边距
 #define kActionBtnHorizontalMargin 30.f
 
@@ -48,12 +51,20 @@ @implementation LYEmptyView
     CGFloat contentHeight;   //内容物高度
     CGFloat subViweMargin;   //间距
 }
+
+- (void)initialize{
+    self.actionBtnHeight = 40.f;
+    self.actionBtnWidth = 120.f;
+    self.actionBtnHorizontalMargin = 30.f;
+}
+
 - (void)prepare{
     [super prepare];
     
     self.autoShowEmptyView = YES; //默认自动显隐
     self.contentViewY = 1000;     //默认值,用来判断是否设置过content的Y值
 }
+
 - (void)setupSubviews{
     [super setupSubviews];
     
@@ -243,20 +254,28 @@ - (void)setupActionBtn:(NSString *)btnTitle target:(id)target action:(SEL)action
     
     UIFont *font = self.actionBtnFont.pointSize ? self.actionBtnFont : kActionBtnFont;
     CGFloat fontSize = font.pointSize;
-    UIColor *titleColor = self.actionBtnTitleColor ? self.actionBtnTitleColor : kBlackColor;
-    UIColor *backGColor = self.actionBtnBackGroundColor ? self.actionBtnBackGroundColor : [UIColor whiteColor];
-    UIColor *borderColor = self.actionBtnBorderColor ? self.actionBtnBorderColor : [UIColor colorWithRed:0.8f green:0.8f blue:0.8f alpha:1];
-    CGFloat borderWidth = self.actionBtnBorderWidth ? self.actionBtnBorderWidth : 0.0f;
-    CGFloat cornerRadius = self.actionBtnCornerRadius ? self.actionBtnCornerRadius : 5.f;
-    CGFloat horiMargin = self.actionBtnHorizontalMargin ? self.actionBtnHorizontalMargin : kActionBtnHorizontalMargin;
-    CGFloat height = self.actionBtnHeight ? self.actionBtnHeight : kActionBtnHeight;
+    UIColor *titleColor = self.actionBtnTitleColor ?: kBlackColor;
+    UIColor *backGColor = self.actionBtnBackGroundColor ?: [UIColor whiteColor];
+    UIColor *borderColor = self.actionBtnBorderColor ?: [UIColor colorWithRed:0.8f green:0.8f blue:0.8f alpha:1.f];
+    CGFloat borderWidth = self.actionBtnBorderWidth ?: 0;
+    CGFloat cornerRadius = self.actionBtnCornerRadius ?: 0;
+    CGFloat width = self.actionBtnWidth;
+    CGFloat horiMargin = self.actionBtnHorizontalMargin;
+    CGFloat height = self.actionBtnHeight;
     CGSize textSize = [self returnTextWidth:btnTitle size:CGSizeMake(contentMaxWidth, fontSize) font:font];//计算得出title文字内容大小
     if (height < textSize.height) {
-        height = textSize.height + 4;
+        height = textSize.height + 4.f;
+    }
+    
+    //按钮的宽
+    CGFloat btnWidth = textSize.width;
+    if (width) {
+        btnWidth = width;
+    } else if (horiMargin) {
+        btnWidth = textSize.width + horiMargin * 2.f;
     }
     
-    //按钮的宽高
-    CGFloat btnWidth = textSize.width + horiMargin * 2;
+    //按钮的高
     CGFloat btnHeight = height;
     btnWidth = btnWidth > contentMaxWidth ? contentMaxWidth : btnWidth;
     
@@ -404,6 +423,15 @@ - (void)setActionBtnHeight:(CGFloat)actionBtnHeight{
         }
     }
 }
+- (void)setActionBtnWidth:(CGFloat)actionBtnWidth{
+    if (_actionBtnWidth != actionBtnWidth) {
+        _actionBtnWidth = actionBtnWidth;
+        
+        if (_actionButton) {
+            [self setupSubviews];
+        }
+    }
+}
 - (void)setActionBtnHorizontalMargin:(CGFloat)actionBtnHorizontalMargin{
     if (_actionBtnHorizontalMargin != actionBtnHorizontalMargin) {
         _actionBtnHorizontalMargin = actionBtnHorizontalMargin;

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,15 @@ - (instancetype)init`
`19`	`19`	`{`
`20`	`20`	`self = [super init];`
`21`	`21`	`if (self) {`
	`22`	`+ [self initialize];`
`22`	`23`	`[self prepare];`
`23`	`24`	`}`
`24`	`25`	`return self;`
`25`	`26`	`}`
	`27`	`+`
	`28`	`+- (void)initialize{`
	`29`	`+}`
	`30`	`+`
`26`	`31`	`- (void)prepare{`
`27`	`32`	`self.autoresizingMask = UIViewAutoresizingFlexibleWidth \| UIViewAutoresizingFlexibleHeight;`
`28`	`33`	`}`