职位点击按钮修改

HappyJob/HappyJob/BClass/BPosition_职位/APIManager/BPositionDataBox.m

@@ -95,49 +95,65 @@
     BPositonModel *model = [BPositonModel yy_modelWithJSON:dict];
    
     //查看简历
-    cell.resumeBlock = ^{
-        
-        if ([self.delegate respondsToSelector:@selector(positionResume:positionModel:)])
+    cell.resumeBlock = ^(BOOL resume) {
+      
+        if (resume)
         {
-            [self.delegate positionResume:self positionModel:model];
+            if ([self.delegate respondsToSelector:@selector(positionResume:positionModel:)])
+            {
+                [self.delegate positionResume:self positionModel:model];
+            }
         }
     };
-
+    
     //刷新
-    cell.refreshButtonBlock = ^{
+    cell.refreshButtonBlock = ^(BOOL refresh) {
         
-        if ([self.delegate respondsToSelector:@selector(positionRefresh:positionModel:cellForRowAtIndexPath:)])
+        if (refresh)
         {
-            [self.delegate positionRefresh:self positionModel:model cellForRowAtIndexPath:indexPath];
+            if ([self.delegate respondsToSelector:@selector(positionRefresh:positionModel:cellForRowAtIndexPath:)])
+            {
+                [self.delegate positionRefresh:self positionModel:model cellForRowAtIndexPath:indexPath];
+            }
         }
     };
-    
+   
     //暂停
-    cell.stopButtonBlock = ^{
-        
-        if ([self.delegate respondsToSelector:@selector(positionStop:positionModel:cellForRowAtIndexPath:)])
+    cell.stopButtonBlock = ^(BOOL stop) {
+      
+        if (stop)
         {
-            [self.delegate positionStop:self positionModel:model cellForRowAtIndexPath:indexPath];
+            if ([self.delegate respondsToSelector:@selector(positionStop:positionModel:cellForRowAtIndexPath:)])
+            {
+                [self.delegate positionStop:self positionModel:model cellForRowAtIndexPath:indexPath];
+            }
         }
     };
-    
+   
     //下架
-    cell.endButtonBlock = ^{
-        
-        if ([self.delegate respondsToSelector:@selector(positionEnd:positionModel:cellForRowAtIndexPath:)])
+    cell.endButtonBlock = ^(BOOL end) {
+      
+        if (end)
         {
-            [self.delegate positionEnd:self positionModel:model cellForRowAtIndexPath:indexPath];
+            if ([self.delegate respondsToSelector:@selector(positionEnd:positionModel:cellForRowAtIndexPath:)])
+            {
+                [self.delegate positionEnd:self positionModel:model cellForRowAtIndexPath:indexPath];
+            }
         }
     };
     
     //编辑
-    cell.editButtonBlock = ^{
+    cell.editButtonBlock = ^(BOOL edit) {
         
-        if ([self.delegate respondsToSelector:@selector(positionEdit:positionModel:)])
+        if (edit)
         {
-            [self.delegate positionEdit:self positionModel:model];
+            if ([self.delegate respondsToSelector:@selector(positionEdit:positionModel:)])
+            {
+                [self.delegate positionEdit:self positionModel:model];
+            }
         }
     };
+    
 
     return cell;
 }

HappyJob/HappyJob/BClass/BPosition_职位/View/BPositionCell.h

@@ -12,11 +12,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface BPositionCell : UITableViewCell
 
-@property (nonatomic, copy) void(^refreshButtonBlock)(void);//刷新
-@property (nonatomic, copy) void(^stopButtonBlock)(void);//暂停
-@property (nonatomic, copy) void(^endButtonBlock)(void);//结束
-@property (nonatomic, copy) void(^editButtonBlock)(void);//编辑
-@property (nonatomic, copy) void(^resumeBlock)(void);//简历
+@property (nonatomic, copy) void(^refreshButtonBlock)(BOOL refresh);//刷新
+@property (nonatomic, copy) void(^stopButtonBlock)(BOOL stop);//暂停
+@property (nonatomic, copy) void(^endButtonBlock)(BOOL end);//结束
+@property (nonatomic, copy) void(^editButtonBlock)(BOOL edit);//编辑
+@property (nonatomic, copy) void(^resumeBlock)(BOOL resume);//简历
 
 - (void)BPositionCellArray:(NSArray *)array andIndexPath:(NSIndexPath *)indexPath;
 

HappyJob/HappyJob/BClass/BPosition_职位/View/BPositionCell.m

@@ -150,18 +150,8 @@
     //是否结束 0下架 1未下架
     if ([model.isOn boolValue])
     {//未下架
-        [self.refreshBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
-        [self.stopBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
-        [self.endBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
-        [self.editBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
-        [self.resumeBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
-        
-        self.endBtn.userInteractionEnabled = YES;
-        self.stopBtn.userInteractionEnabled = YES;
-        self.refreshBtn.userInteractionEnabled = YES;
-        self.editBtn.userInteractionEnabled = YES;
-        self.resumeBtn.userInteractionEnabled = YES;
-        
+
+        self.editBtn.selected = YES;
         //时间是否结束
         if ([self isTimeEnd:model.endDate])
         {//时间结束
@@ -173,15 +163,17 @@
             {
                 [self.stopBtn setTitle:@"暂停" forState:UIControlStateNormal];
             }
-            self.stopBtn.userInteractionEnabled = NO;
-            self.refreshBtn.userInteractionEnabled = NO;
+
+            self.refreshBtn.selected = NO;
+            self.stopBtn.selected = NO;
+            self.resumeBtn.selected = NO;
         }
         else
         {//时间未结束
-            [self.refreshBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
-            [self.stopBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
-            self.stopBtn.userInteractionEnabled = YES;
-            self.refreshBtn.userInteractionEnabled = YES;
+
+            self.refreshBtn.selected = YES;
+            self.stopBtn.selected = YES;
+            self.resumeBtn.selected = YES;
             
             //是否暂停  1:暂停
             if ([model.isPause boolValue])
@@ -196,12 +188,7 @@
     }
     else
     {//下架
-        [self.refreshBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
-        [self.endBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
-        [self.editBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
-        [self.stopBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
-        [self.resumeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        
+
         //是否暂停  1:暂停
         if ([model.isPause boolValue])
         {
@@ -211,12 +198,12 @@
         {
             [self.stopBtn setTitle:@"暂停" forState:UIControlStateNormal];
         }
-        
-        self.endBtn.userInteractionEnabled = NO;
-        self.stopBtn.userInteractionEnabled = NO;
-        self.refreshBtn.userInteractionEnabled = NO;
-        self.editBtn.userInteractionEnabled = NO;
-        self.resumeBtn.userInteractionEnabled = NO;
+    
+        self.stopBtn.selected = NO;
+        self.refreshBtn.selected = NO;
+        self.endBtn.selected = NO;
+        self.editBtn.selected = NO;
+        self.resumeBtn.selected = NO;
         self.stateBtn.hidden = YES;
     }
 }
@@ -337,28 +324,28 @@
 /* 简历 */
 - (void)resumeButtonClick:(UIButton *)btn {
     
-    self.resumeBlock();
+    self.resumeBlock(btn.selected);
 }
 
 /* 刷新 */
 - (void)refreshButtonClick:(UIButton *)btn {
     
-    self.refreshButtonBlock();
+    self.refreshButtonBlock(btn.selected);
 }
 /* 暂停 */
 - (void)stopButtonClick:(UIButton *)btn {
     
-    self.stopButtonBlock();
+    self.stopButtonBlock(btn.selected);
 }
 /* 结束 */
 - (void)endButtonClick:(UIButton *)btn {
     
-    self.endButtonBlock();
+    self.endButtonBlock(btn.selected);
 }
 /* 编辑 */
 - (void)editButtonClick:(UIButton *)btn {
     
-    self.editButtonBlock();
+    self.editButtonBlock(btn.selected);
 }
 
 #pragma mark - getter and setter
@@ -431,7 +418,9 @@
     {
         _refreshBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_refreshBtn setTitle:@"刷新" forState:UIControlStateNormal];
-        [_refreshBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
+        _refreshBtn.selected = YES;
+        [_refreshBtn setTitleColor:COLOR_BACK3 forState:UIControlStateSelected];
+        [_refreshBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
         _refreshBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         _refreshBtn.layer.borderWidth = 1;
         _refreshBtn.layer.borderColor = COLOR_GRAY9.CGColor;
@@ -448,8 +437,10 @@
     {
         _stopBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_stopBtn setTitle:@"暂停" forState:UIControlStateNormal];
-        [_stopBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
         _stopBtn.titleLabel.font = [UIFont systemFontOfSize:12];
+        _stopBtn.selected = YES;
+        [_stopBtn setTitleColor:COLOR_BACK3 forState:UIControlStateSelected];
+        [_stopBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
         _stopBtn.layer.borderWidth = 1;
         _stopBtn.layer.borderColor = COLOR_GRAY9.CGColor;
         _stopBtn.layer.cornerRadius = 5;
@@ -465,7 +456,9 @@
     {
         _endBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_endBtn setTitle:@"下架" forState:UIControlStateNormal];
-        [_endBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
+        _endBtn.selected = YES;
+        [_endBtn setTitleColor:COLOR_BACK3 forState:UIControlStateSelected];
+        [_endBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
         _endBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         _endBtn.layer.borderWidth = 1;
         _endBtn.layer.borderColor = COLOR_GRAY9.CGColor;
@@ -482,7 +475,9 @@
     {
         _editBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_editBtn setTitle:@"编辑" forState:UIControlStateNormal];
-        [_editBtn setTitleColor:COLOR_BACK3 forState:UIControlStateNormal];
+        _endBtn.selected = YES;
+        [_editBtn setTitleColor:COLOR_BACK3 forState:UIControlStateSelected];
+        [_editBtn setTitleColor:COLOR_GRAY9 forState:UIControlStateNormal];
         _editBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         _editBtn.layer.borderWidth = 1;
         _editBtn.layer.borderColor = COLOR_GRAY9.CGColor;
@@ -497,6 +492,9 @@
     if (_resumeBtn == nil)
     {
         _resumeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        _resumeBtn.selected = YES;
+        [_resumeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_resumeBtn setTitleColor:COLOR_BACK3 forState:UIControlStateSelected];
         [_resumeBtn setTitle:@"简历管理" forState:UIControlStateNormal];
         _resumeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         _resumeBtn.layer.borderColor = COLOR_GRAY9.CGColor;