Browse Source

- 멤버 리스트 , 체크박스 > 버튼으로 수정

TaeHyun 8 năm trước cách đây
mục cha
commit
fb20c43619

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 14 - 13
OneCable/Base.lproj/HomeMember.storyboard


+ 1 - 2
OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberViewController.h

@@ -50,7 +50,6 @@
 @class CustomButton;
 @class CustomLabel;
 @class CustomImageView;
-@class CustomCheckBox;
 
 @interface HomeMemberCollectionCell : UICollectionViewCell
 
@@ -59,7 +58,7 @@
 @property (weak, nonatomic) IBOutlet CustomLabel *lblNickname;
 @property (weak, nonatomic) IBOutlet CustomLabel *lblMemID;
 @property (weak, nonatomic) IBOutlet CustomLabel *lblStatus;
-@property (weak, nonatomic) IBOutlet CustomCheckBox *chkSelect;
+@property (weak, nonatomic) IBOutlet CustomButton *btnCheck;
 @property (weak, nonatomic) IBOutlet CustomButton *btnDelete;
 
 @end

+ 10 - 11
OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberViewController.m

@@ -58,7 +58,7 @@
 @implementation HomeMemberCollectionCell
 
 - (void)awakeFromNib {
-    _chkSelect.hidden = YES;
+//    _chkSelect.hidden = YES;
 }
 
 @end
@@ -563,8 +563,6 @@
     if (indexPath.row < _memberList.count) {
         HomeMemberCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CollectionCellIdentifier" forIndexPath:indexPath];
         
-        [cell.chkSelect setBgImage];
-        
         HomeMemberModel *member = _memberList[indexPath.row];
         cell.indexPath = indexPath;
         
@@ -603,17 +601,17 @@
             [cell.lblStatus setColor:kUITextColor01 text:cell.lblStatus.text];
         }
 
-        cell.chkSelect.value = member;
+        cell.btnCheck.value = member;
         cell.btnDelete.value = member;
         
-        cell.chkSelect.hidden = !(_isMasterTransferMode && [member.gradeCode isEqualToString:KNEET_MEMBER_SIMPLE] && _memberList.count > 1);
-        cell.chkSelect.value = member;
+        cell.btnCheck.hidden = !(_isMasterTransferMode && [member.gradeCode isEqualToString:KNEET_MEMBER_SIMPLE] && _memberList.count > 1);
+        cell.btnCheck.value = member;
 //        cell.chkSelect.checked = [cell.chkSelect getCheckStatusFromValue];
         
         cell.btnDelete.hidden = !(_isDeleteMode && ![member.gradeCode isEqualToString:KNEET_MEMBER_MASTER] && _memberList.count > 1);
         cell.btnDelete.value = member;
         
-        [cell.chkSelect addTarget:self action:@selector(btnTransferMaster:) forControlEvents:UIControlEventTouchUpInside];
+        [cell.btnCheck addTarget:self action:@selector(btnTransferMaster:) forControlEvents:UIControlEventTouchUpInside];
         [cell.btnDelete addTarget:self action:@selector(btnTransferMaster:) forControlEvents:UIControlEventTouchUpInside];
         
         rcell = cell;
@@ -659,8 +657,7 @@
 
         HomeMemberModel *member = _memberList[indexPath.row];
         
-        cell.chkSelect.value = member;
-        [cell.chkSelect checkBoxClicked];
+        cell.btnCheck.value = member;
     }
     
 }
@@ -718,9 +715,9 @@
 //}
 
 - (void)btnTransferMaster:(id)sender {
-    HomeMemberModel *memberInfo = (HomeMemberModel *) ((CustomCheckBox *)sender).value;
+    HomeMemberModel *memberInfo = (HomeMemberModel *) ((CustomButton *)sender).value;
     NSLog(@"Member Info : %@", memberInfo);
-    
+    [sender setSelected:YES];
     NSString *name = memberInfo.nickname;
     if ([memberInfo.nickname isEmptyString]) {
         name = memberInfo.memberId;
@@ -731,6 +728,8 @@
     [[JDFacade facade] confirmTitle:NSLocalizedString(@"마스터 권한 양도", @"마스터 권한 양도") message:msg completion:^(CustomAlertView *alertView, NSInteger buttonIndex) {
         if (buttonIndex == 0) {
             [self requestMasterTransfer:memberInfo.memberId isRequest:YES];
+        } else {
+            [sender setSelected:NO];
         }
     }];
 }