- 로그인 관련 변경 api 적용 완료

- 멤버 초대시 퀴즈 리스트 변경부분 적용 완료
- 멤버 초대 부분 작업

OneCable/Classes/CommonUI/MorePopOverViewController.m

@@ -42,7 +42,10 @@
     int i = 0;
     for (MoreBtnModel *btnInfo in btnArray)
     {
-        [self setBtn:i btnInfo:btnInfo];
+        if (btnInfo.isShow) {
+            [self setBtn:i btnInfo:btnInfo];
+        }
+
         i++;
     }
 //

OneCable/Classes/Model/LoginModel.h

@@ -35,6 +35,7 @@
 @protocol QuizModel;
 @interface QuizModel : JDJSONModel
 @property (copy, nonatomic) NSString *quiz;
+@property (copy, nonatomic) NSString *quizId;
 @property (copy, nonatomic) NSString *statusCode;
 
 -(BOOL)isUserEditQuiz;
@@ -68,6 +69,7 @@
 
 @property (copy, nonatomic) NSString *limitCnt; //멤버 등록 제한 숫자(Default : 10)
 @property (copy, nonatomic) NSArray<HomeMemberModel> *ctrtGrpMemberList; //홈그룹 멤버 목록
+@property (assign, nonatomic, readonly) BOOL isRemainInvite;
 
 @end
 

OneCable/Classes/Model/LoginModel.m

@@ -45,6 +45,16 @@
 
 @implementation HomeMemberListModel
 
+- (BOOL)isRemainInvite {
+    BOOL result = NO;
+    
+    if ([_limitCnt integerValue]-_ctrtGrpMemberList.count) {
+        result = YES;
+    }
+    
+    return result;
+}
+
 @end
 
 @implementation MemberIconModel
@@ -201,6 +211,10 @@
 }
 
 
+- (NSString *)gradeCode {
+    return [self ctrtGrp].gradeCode;
+}
+
 //모드 변경 저장
 - (NSString *)modeChange {
     if (!_modeChange) {
@@ -253,36 +267,37 @@
 - (NSInteger)level {
     
     _level = 0;
-    if ([_gradeCode isEqualToString:KNEET_MEMBER_MASTER]) {
+    if ([[self gradeCode] isEqualToString:KNEET_MEMBER_MASTER]) {
         _level = 90;
-    } else if ([_gradeCode isEqualToString:KNEET_MEMBER_SIMPLE]) {
+    } else if ([[self gradeCode] isEqualToString:KNEET_MEMBER_SIMPLE]) {
         _level = 10;
     }
+
     return _level;
 }
 
 // TODO: 홈그룹 온라인 / 보유 여부 로직 변경하기
 - (BOOL)isHomehubOnline {
-    BOOL result = NO;
-    for (DeviceModel *deviceInfo in _deviceList) {
-        NSLog(@"Device Info : %@", deviceInfo);
-        if (deviceInfo.isDeviceOnlined && deviceInfo.isDeviceConn) {
-            result = YES;
-            break;
-        }
-    }
+    BOOL result = YES;
+//    for (DeviceModel *deviceInfo in _deviceList) {
+//        NSLog(@"Device Info : %@", deviceInfo);
+//        if (deviceInfo.isDeviceOnlined && deviceInfo.isDeviceConn) {
+//            result = YES;
+//            break;
+//        }
+//    }
     NSLog(@"HomeHub Online : %@", BOOLToString(result));
     return result;
 }
 
 - (BOOL)hasHomeHub {
-    BOOL result = NO;
-    for (DeviceModel *deviceInfo in _deviceList) {
-        if (deviceInfo.deviceId && ![deviceInfo.deviceId isEmptyString]) {
-            result = YES;
-            break;
-        }
-    }
+    BOOL result = YES;
+//    for (DeviceModel *deviceInfo in _deviceList) {
+//        if (deviceInfo.deviceId && ![deviceInfo.deviceId isEmptyString]) {
+//            result = YES;
+//            break;
+//        }
+//    }
     
     return result;
 }

OneCable/Classes/Model/MoreBtnModel.h

@@ -24,6 +24,7 @@ typedef enum {
 @property (copy, nonatomic) UIImage *imgHighlight;
 @property (copy, nonatomic) UIImage *imgDisabled;
 @property (assign, nonatomic) BOOL enable;
+@property (assign, nonatomic) BOOL show;
 @property (assign, nonatomic) MoreBtnType btnType;
 
 -(id)init;
@@ -36,6 +37,7 @@ typedef enum {
 
 - (UIImage *)getBtnImg:(UIControlState)state;
 - (BOOL)isEnable;
+- (BOOL)isShow;
 
 
 

OneCable/Classes/Model/MoreBtnModel.m

@@ -13,7 +13,7 @@
 -(id)init
 {
     if (self = [super init]) {
-        
+        _show = YES;
     }
     return self;
 }
@@ -105,4 +105,9 @@
     return _enable;
 }
 
+- (BOOL)isShow
+{
+    return _show;
+}
+
 @end

OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberAddViewController.m

@@ -436,6 +436,8 @@
     [[JDFacade facade] selectDatas:self listInfo:_quizList completion:^(DataSelectModel *seleced) {
         _selectedQuiz = seleced;
         _txtQuestion.text = _selectedQuiz.title;
+        QuizModel *quizInfo = (QuizModel *)_selectedQuiz.value;
+        NSLog(@"Quiz Info : %@", quizInfo);
 //        [_tableView reloadData];
         [self updateUI];
     }];

OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberViewController.m

@@ -67,6 +67,7 @@
 
 @interface HomeMemberViewController () <UICollectionViewDelegate, UICollectionViewDataSource> {
     NSArray<HomeMemberModel> *_memberList;
+    HomeMemberListModel *_responseInfo;
     
     BOOL _isNotFirstLoading, _isDeleteMode;
     NSInteger _deviceFlag;
@@ -385,7 +386,7 @@
         return;
     }
     
-    NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_HOMEGROUP_MEMBERS aditional:nil];
+    NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_HOMEGROUP_MEMBERS arguments:nil];
 //    NSString *path = [NSString stringWithFormat:API_GET_HOMEGROUP_MEMBERS, [[JDFacade facade].loginUser custId], [[JDFacade facade].loginUser ctrtGrpId]];
 
     [[RequestHandler handler] sendAsyncGetRequestAPIPath:path parameters:nil modelClass:[HomeMemberListModel class] completion:^(id responseObject) {
@@ -393,8 +394,8 @@
             return;
         }
         NSLog(@"Member List : %@", responseObject);
-        HomeMemberListModel *fetchedMemberList = (HomeMemberListModel *)responseObject;
-        NSArray<HomeMemberModel> *homegrpMemberList = fetchedMemberList.ctrtGrpMemberList;
+        _responseInfo = (HomeMemberListModel *)responseObject;
+        NSArray<HomeMemberModel> *homegrpMemberList = _responseInfo.ctrtGrpMemberList;
 
         if (homegrpMemberList && homegrpMemberList.count) {
             _memberList = homegrpMemberList;
@@ -468,7 +469,7 @@
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
     
-    NSInteger auth = [JDFacade facade].loginUser.level == 90 && !_isDeleteMode; //마스터 권한일 경우,
+    NSInteger auth = [JDFacade facade].loginUser.level == 90 && !_isDeleteMode && _responseInfo.isRemainInvite; //마스터 권한이면서, 멤버초대 최대수를 넘지 않으며, 삭제모드가 아닐경우,
     NSInteger count = _memberList.count % _deviceFlag == 0 ? _memberList.count : _memberList.count + auth; //홀수일 경우, 멤버 초대 버튼을 추가해줌.
     return count;
 }

OneCable/Classes/ViewControllers/MainScreens/MainViewController.m

@@ -202,7 +202,7 @@
     
     NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_DASHBOARD arguments:nil];
     
-    [[RequestHandler handler] sendAsyncGetRequestAPIPath:path parameters:parameter modelClass:[DeviceListModel class] completion:^(id responseObject) {
+    [[RequestHandler handler] sendAsyncGetRequestAPIPath:path parameters:parameter modelClass:[DashboardModel class] completion:^(id responseObject) {
         if (!responseObject) {//응답결과가 잘못되었거나 없을 경우,
             return;
         }