Merge branch 'master' of 61.40.220.21:/cable/git-repo/mobile/ios

OneCable/Classes/CommonUI/MoreButtonDelegate.h

@@ -0,0 +1,18 @@
+//
+//  MoreButtonDelegate.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 8..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@protocol MoreButtonDelegate <NSObject>
+
+@optional
+
+//-(void)returnMoreButton:(UIButton*)moreBtn;
+//-(void)retrunMoreString:(NSString*)moreString;
+-(void)returnMoreId:(id)moreButtonId;
+@end

OneCable/Classes/CommonUI/MorePopOverViewController.h

@@ -0,0 +1,29 @@
+//
+//  MorePopOverViewController.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 6..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "JDViewController.h"
+#import "MoreButtonDelegate.h"
+
+@class WYPopoverController;
+@interface MorePopOverViewController : JDViewController<MoreButtonDelegate>
+@property (assign,nonatomic) id<MoreButtonDelegate> moreDelegate;
+
+
+@property (weak, nonatomic) IBOutlet UIStackView *viewPopup;
+@property (weak, nonatomic) WYPopoverController *poc;
+
+
+
+
+- (void)popButtonSet:(NSMutableArray *)btnArray;
+//-(void)popButtonSet:(NaviMenu)morePopMode;
+//- (void)popButtonSet:(MorePopupBtnType)firstType secondType:(MorePopupBtnType)secondType thirdType:(MorePopupBtnType)thirdType fourthType:(MorePopupBtnType)fourthType;
+
+
+@end

OneCable/Classes/CommonUI/MorePopOverViewController.m

@@ -0,0 +1,243 @@
+//
+//  MorePopOverViewController.m
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 6..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "MorePopOverViewController.h"
+#import "WYPopoverController.h"
+#import "HomeMemberViewController.h"
+
+
+@interface MorePopOverViewController ()
+
+@property (strong, nonatomic) IBOutletCollection(CustomButton) NSArray *btnCollArray;
+
+@end
+
+@implementation MorePopOverViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    [self initUI];
+}
+
+- (void)initUI {
+
+    self.preferredContentSize = CGSizeMake(self.view.frame.size.width, self.viewPopup.frame.size.height);
+
+    
+}
+- (void)popButtonSet:(NSMutableArray *)btnArray{
+//        _btnFirst.hidden = YES;
+//        _btnSecond.hidden = YES;
+//        _btnThird.hidden = YES;
+//        _btnFourth.hidden = YES;
+    
+    
+//        NSMutableArray *arrBtn = [NSMutableArray array];
+//        arrBtn[0] = _btnFirst;
+//        arrBtn[1] = _btnSecond;
+//        arrBtn[2] = _btnThird;
+//        arrBtn[3] = _btnFourth;
+    
+    for (UIButton *btn in _btnCollArray) {
+        btn.hidden = YES;
+    }
+    
+            for (int i = 0; i < btnArray.count; i++) {
+                [self setImage:_btnCollArray[i] btnType: [[btnArray objectAtIndex:i]intValue]];
+                [_btnCollArray[i] setHidden:NO];
+                [_btnCollArray[i] setTag:[[btnArray objectAtIndex:i]intValue]];
+            }
+
+}
+//-(void)popButtonSet:(NaviMenu)morePopModes{
+//    _btnFirst.hidden = YES;
+//    _btnSecond.hidden = YES;
+//    _btnThird.hidden = YES;
+//    _btnFourth.hidden = YES;
+//    
+//    NSMutableArray *toggleArray =[[NSMutableArray alloc]init];
+//    
+//    switch (morePopMode) {
+//            case (NaviMenu)device:
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)add]];
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)add]];
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)del]];
+//            
+//            break;
+//            case (NaviMenu)rule:
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)masterChange]];
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)add]];
+//            
+//            break;
+//            case (NaviMenu)member:
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)masterChange]];
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)del]];
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)add]];
+//                [toggleArray addObject:[NSNumber numberWithInteger:(MorePopupBtnType)reload]];
+//
+//            break;
+//            
+//        default:
+//            break;
+//    }
+//    NSMutableArray *arrBtn = [NSMutableArray array];
+//    arrBtn[0] = _btnFirst;
+//    arrBtn[1] = _btnSecond;
+//    arrBtn[2] = _btnThird;
+//    arrBtn[3] = _btnFourth;
+//    
+//        for (int i = 0; i < toggleArray.count; i++) {
+//            [self setImage:arrBtn[i] btnType: [[toggleArray objectAtIndex:i]intValue]];
+//            [arrBtn[i] setHidden:NO];
+//
+//        }
+//}
+- (void)popButtonSet:(MorePopupBtnType)firstType secondType:(MorePopupBtnType)secondType thirdType:(MorePopupBtnType)thirdType fourthType:(MorePopupBtnType)fourthType;{
+
+//    //배열 셋팅
+//    NSMutableArray * arr = [[NSMutableArray alloc]init];
+//    
+//    if(firstType != none){
+//        [arr addObject:[NSNumber numberWithInteger:firstType]];
+//    }
+//    if(secondType != none){
+//        [arr addObject:[NSNumber numberWithInteger:firstType]];
+//    }
+//    if(secondType != none){
+//        [arr addObject:[NSNumber numberWithInteger:firstType]];
+//    }
+//    if(secondType != none){
+//        [arr addObject:[NSNumber numberWithInteger:firstType]];
+//    }
+    
+    
+    
+//    if(firstType != none)
+//    {
+//        [self setImage:_btnFirst btnType:firstType];
+//    }else{
+//        _btnFirst.hidden = YES;
+//    }if (secondType != none){
+//        [self setImage:_btnSecond btnType:secondType];
+//    }else{
+//        _btnSecond.hidden = YES;
+//    }if (thirdType != none){
+//        [self setImage:_btnThird btnType:thirdType];
+//    }else{
+//        _btnThird.hidden = YES;
+//    }if (fourthType != none) {
+//        [self setImage:_btnFourth btnType:fourthType];
+//    }else{
+//        _btnFourth.hidden = YES;
+//    }
+
+//    NSMutableArray *arrType = [NSMutableArray array];
+//    arrType = [NSMutableArray arrayWithObjects:
+//               [NSMutableDictionary dictionaryWithCapacity:1, masterChange,nil],[NSMutableDictionary dictionaryWithObjectsAndKeys:@"add", add,nil],[NSMutableDictionary dictionaryWithObjectsAndKeys:@"del", del,nil],[NSMutableDictionary dictionaryWithObjectsAndKeys:@"reload", reload,nil], nil];
+
+//    arrType = [NSMutableArray arrayWithObjects:
+//               [NSNumber numberWithInteger:firstType],
+//               [NSNumber numberWithInteger:secondType],
+//               [NSNumber numberWithInteger:thirdType],
+//               [NSNumber numberWithInteger:fourthType], nil];
+    
+    
+//    NSMutableArray *arrBtn = [NSMutableArray array];
+//    arrBtn[0] = _btnFirst;
+//    arrBtn[1] = _btnSecond;
+//    arrBtn[2] = _btnThird;
+//    arrBtn[3] = _btnFourth;
+    
+//    for (int i = 0; i < arrBtn.count; i++) {
+//        if (arrType[i] != none) {
+//            [self setImage:arrBtn[i] btnType:firstType];
+//        }else{
+//            // hidden
+//        }
+//        
+//    }
+    
+}
+
+-(NSDictionary *)getFileName:(MorePopupBtnType)type
+{
+    NSMutableDictionary *btnInfo = [NSMutableDictionary dictionary];
+
+    
+    switch (type)
+    {
+            case masterChange:
+                btnInfo[@"normal"] = @"img_bg_morepopup_icon_masterchange";
+                btnInfo[@"press"] = @"img_bg_morepopup_icon_masterchange_press";
+            break;
+            case add:
+                btnInfo[@"normal"] = @"img_bg_morepopup_icon_add";
+                btnInfo[@"press"] = @"img_bg_morepopup_icon_add_press";
+            break;
+            case del:
+                btnInfo[@"normal"] = @"img_bg_morepopup_icon_delete";
+                btnInfo[@"press"] = @"img_bg_morepopup_icon_delete_press";
+            break;
+            case reload:
+                btnInfo[@"normal"] = @"img_bg_morepopup_icon_refresh";
+                btnInfo[@"press"] = @"img_bg_morepopup_icon_refresh_press";
+            break;
+            
+        default:
+            break;
+    }
+    
+    return btnInfo;
+}
+
+-(void)setImage:(UIButton *)btn btnType:(MorePopupBtnType)btnType
+{
+    NSDictionary *dict = [self getFileName:btnType];
+    
+    [btn setImage:[UIImage imageNamed:dict[@"normal"]] forState:UIControlStateNormal];
+    [btn setImage:[UIImage imageNamed:dict[@"press"]] forState:UIControlStateHighlighted];
+}
+
+
+- (IBAction)btnAction:(id)sender {
+
+    
+    NSLog(@"btnAction sender : %@",sender);
+    
+    [self.moreDelegate returnMoreId:sender];
+}
+
+
+
+//
+//        NSString *normalImage = [NSString stringWithFormat:@"img_bg_morepopup_icon_%@",defaultImage];
+//        NSString *highlightedImage = [NSString stringWithFormat:@"img_bg_morepopup_icon_%@_press",defaultImage];
+//    
+//    if (buttonNumber == 1) {
+//        [_btnFirst setImage:[UIImage imageNamed:normalImage] forState:UIControlStateNormal];
+//        [_btnFirst setImage:[UIImage imageNamed:highlightedImage] forState:UIControlStateHighlighted];
+//    }else if (buttonNumber == 2)
+//    {
+//        [_btnSecond setImage:[UIImage imageNamed:normalImage] forState:UIControlStateNormal];
+//        [_btnSecond setImage:[UIImage imageNamed:highlightedImage] forState:UIControlStateHighlighted];
+//    }else if (buttonNumber == 3)
+//    {
+//        [_btnThird setImage:[UIImage imageNamed:normalImage] forState:UIControlStateNormal];
+//        [_btnThird setImage:[UIImage imageNamed:highlightedImage] forState:UIControlStateHighlighted];
+//    }else if(buttonNumber == 4){
+//        [_btnFourth setImage:[UIImage imageNamed:normalImage] forState:UIControlStateNormal];
+//        [_btnFourth setImage:[UIImage imageNamed:highlightedImage] forState:UIControlStateHighlighted];
+//    }
+//}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+}
+
+@end