- 멤버 초대 작업 완료

OneCable/Classes/Model/JDJSONModel.h

@@ -13,6 +13,7 @@
 
 @interface JDJSONModel : JSONModel
 @property (copy, nonatomic) NSString *resultCode;
+@property (copy, nonatomic) NSString *resultMsg;
 @property (copy, nonatomic) NSString *msg;
 
 @end

OneCable/Classes/Model/JDJSONModel.m

@@ -39,13 +39,22 @@
 
 @implementation JDErrorModel
 
-+ (JSONKeyMapper *)keyMapper {
-    return [[JSONKeyMapper alloc] initWithDictionary:@{@"err_code": @"errorCode",
-                                                       @"err_msg" : @"errorMessage",
-                                                       @"description": @"errorDescription",
-                                                       @"nickname": @"nickname",
-                                                       @"device_list": @"deviceList",
-                                                       @"error_count": @"errorCount"}];
+// 에러 관련해서 메세지가 변경되어 주석 처리함
+//+ (JSONKeyMapper *)keyMapper {
+//    return [[JSONKeyMapper alloc] initWithDictionary:@{@"err_code": @"errorCode",
+//                                                       @"err_msg" : @"errorMessage",
+//                                                       @"description": @"errorDescription",
+//                                                       @"nickname": @"nickname",
+//                                                       @"device_list": @"deviceList",
+//                                                       @"error_count": @"errorCount"}];
+//}
+
+- (NSString *)errorCode {
+    return self.resultCode;
+}
+
+- (NSString *)errorMessage {
+    return self.resultMsg;
 }
 
 @end

OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberAddViewController.m

@@ -179,7 +179,7 @@
                                 @"status_code": quizInfo.statusCode,
                                 @"answer": [_btnDate.dateString strReplace:@"/" replace:@""],
                                 @"invitation_list": invitations};
-
+// [JDErrorModel class]
 //    NSString *path = [NSString stringWithFormat:API_POST_HOMEGROUP_MEMBER_INVITE];
     NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_POST_HOMEGROUP_MEMBER_INVITE aditional:nil];
 
@@ -334,7 +334,7 @@
 }
 
 - (void)btnAddTouched:(id)sender {
-    if (![ValidateUtil validateTextfiled:_txtTempEmail type:ValidateTypeMobile title:NSLocalizedString(@"휴대폰 번호", @"휴대폰 번호")]) {
+    if (![ValidateUtil validateTextfiled:_txtTempEmail type:ValidateTypeNull title:NSLocalizedString(@"휴대폰 번호", @"휴대폰 번호")]) {
         return;
     }
     
@@ -353,6 +353,7 @@
 //        [_tableView reloadData];
         [self updateUI];
     } else {
+        NSLog(@"%@", result);
         [[JDFacade facade] alert:result.errorMessage];
     }
 }
@@ -396,25 +397,25 @@
 
 - (BOOL)isValidRequestInfo {
     BOOL result = YES;
-//    QuizModel *quizInfo = (_selectedQuiz != nil) ? (QuizModel *)_selectedQuiz.value : nil;
-//    
-//    if (_inviteList.count <= 0) {
-//        result = NO;
-//    }
-//    if (result && quizInfo == nil)
-//    {
-//        result = NO;
-//    }
-//    if (result && quizInfo.isUserEditQuiz)
-//    {
-//        if ([[_txtDirectQuiz.text trim] isEmptyString]) {
-//            result = NO;
-//        }
-//    }
-//    if (result && ([_btnDate.dateString isEmptyString] || [[_btnDate titleForState:UIControlStateNormal] isEqualToString:_btnDate.placeHolder]))
-//    {
-//        result = NO;
-//    }
+    QuizModel *quizInfo = (_selectedQuiz != nil) ? (QuizModel *)_selectedQuiz.value : nil;
+    
+    if (_inviteList.count <= 0) {
+        result = NO;
+    }
+    if (result && quizInfo == nil)
+    {
+        result = NO;
+    }
+    if (result && quizInfo.isUserEditQuiz)
+    {
+        if ([[_txtDirectQuiz.text trim] isEmptyString]) {
+            result = NO;
+        }
+    }
+    if (result && ([_btnDate.dateString isEmptyString] || [[_btnDate titleForState:UIControlStateNormal] isEqualToString:_btnDate.placeHolder]))
+    {
+        result = NO;
+    }
     
     return result;
 }

OneCable/Classes/ViewControllers/MainScreens/NoticeViewController.m

@@ -99,7 +99,7 @@
 
 - (void)requestNoticeList {
     //parameters
-    NSDictionary *parameter = @{@"member_id":[JDFacade facade].loginUser.emailId,
+    NSDictionary *parameter = @{@"member_id":[JDFacade facade].loginUser.memberId,
                                 @"notice_id" : _pagingId ? _pagingId : ksEmptyString,
                                 @"paging_type" : _pagingType ? _pagingType : ksEmptyString,
                                 @"read_datetime": [JDFacade facade].loginUser.noticeReadTime ? [JDFacade facade].loginUser.noticeReadTime : ksEmptyString };