170705 멤버 push

OneCable/Classes/AppDelegate.m

@@ -157,15 +157,20 @@
     [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
     
     NSString *message = nil;
+    NSString *title = nil;
+    
     NSString *pushTypeCode = [pushInfo objectForKey:@"push_noti_type_code"];
     if (pushTypeCode) {
         
         message = [[[pushInfo objectForKey:@"aps"] objectForKey:@"alert"] objectForKey:@"body"];
+        title = [[[pushInfo objectForKey:@"aps"] objectForKey:@"alert"] objectForKey:@"title"];
+        
         NSString *homegrpId = [pushInfo objectForKey:@"homegrp_id"];
         
         [self handleWithPushTypeCode:pushTypeCode
                            dummyCode:homegrpId
                              message:message
+                               title:title
                  fromFinishLaunching:fromFinishLaunching];
         
         return;
@@ -175,14 +180,7 @@
         message = [[pushInfo objectForKey:@"aps"] objectForKey:@"alert"];
     }
     
-    NSLog(@"message : %@", message);
-
-    //test
-    NSString *subtitle = [[[pushInfo objectForKey:@"aps"] objectForKey:@"alert"] objectForKey:@"subtitle"];
-    NSString *msg = [[[pushInfo objectForKey:@"aps"] objectForKey:@"alert"] objectForKey:@"body"];
-    NSLog(@"subtitle : %@", subtitle);
-    NSLog(@"msg : %@", msg);
-
+    
     if (message && [message isKindOfClass:NSString.class] && [message isEmptyString]) {
         [[JDFacade facade] alert:message];
     }
@@ -192,6 +190,7 @@
 - (void)handleWithPushTypeCode:(NSString *)pushTypeCode
                      dummyCode:(NSString *)dummyCode
                        message:(NSString *)message
+                         title:(NSString*)title
            fromFinishLaunching:(BOOL)fromFinishLaunching {
     
     NSLog(@"%s\n %@, %@, %@", __PRETTY_FUNCTION__, pushTypeCode, dummyCode, message);
@@ -299,26 +298,37 @@
             }
         }];
     }
+    //권한양도 받은 경우
     else if ( !fromFinishLaunching && EQUALS(pushTypeCode, @"MAS_GRD") ) {
-        
-        //권한양도 받은 경우
+
         [[NSNotificationCenter defaultCenter] postNotificationName:kMasGradeNoti
                                                             object:message];
     }
+    //보낸 마스터 양도 거절
     else if ( !fromFinishLaunching && EQUALS(pushTypeCode, @"MAS_GRD_REJECT") ) {
-        
-        //보낸 마스터 양도 거절
-        [[JDFacade facade] alertTitle:@"마스터 권한 양도 거절" message:message];
+
+        [[JDFacade facade] alertTitle:title message:message];
     }
-    else if ( !fromFinishLaunching && EQUALS(pushTypeCode, @"MAS_GRD_CONFIRM") ) {
-                         
-        //보낸 마스터 양도 완료
-        [[JDFacade facade] alertTitle:@"마스터 권한 양도" message:message completionHander:^{
+    //보낸 마스터 양도 완료 || 멤버가 계정 삭제함
+    else if ( !fromFinishLaunching &&
+             (EQUALS(pushTypeCode, @"MAS_GRD_ACCEPT")||EQUALS(pushTypeCode, @"HOME_MEM_SEL")) ) {
+
+        [[JDFacade facade] alertTitle:title message:message completionHander:^{
             
             [[NSNotificationCenter defaultCenter] postNotificationName:kMasGradeNoti
                                                                 object:nil];
         }];
     }
+    //계정 삭제 당함
+    else if ( EQUALS(pushTypeCode, @"HOME_MEM_BAN") ) {
+        [[JDFacade facade] alertTitle:title message:message completionHander:^{
+            
+            [[JDFacade facade]logout];
+        }];
+    }
+
+    
+    //
 }
 
 

OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberViewController.m

@@ -733,7 +733,6 @@
     if (notification.object == nil) {
         //보낸 마스터 양도 완료
         [self requestAutoLogin];
-        [self requestHomeMemberList];
     }
     else {
         //마스터 양도 받음
@@ -768,7 +767,7 @@
                                               modelClass:[JDJSONModel class] completion:^(id responseObject) {
                                                   
                                                   [self requestAutoLogin];
-                                                  [self requestHomeMemberList];
+                                                 
                                                   
                                               } failure:^(id errorObject) {
                                                   
@@ -811,14 +810,7 @@
         _responseInfo = (HomeMemberListModel *)responseObject;
         
         NSArray<HomeMemberModel> *homegrpMemberList = _responseInfo.ctrtGrpMemberList;
-
-        if (homegrpMemberList && homegrpMemberList.count) {
-            
-            _memberList = homegrpMemberList;
-
-        } else {//조회 내역이 없을 경우,
-
-        }
+        _memberList = homegrpMemberList;
         
         [self setContents];
         
@@ -925,6 +917,7 @@
                 loginInfo.authToken = [[JDFacade facade] objectForKeyFromKeychain:USDEF_SESSION_AUTOTOKEN];
                 
                 [self actionForLoginSucceed:loginInfo];
+                [self requestHomeMemberList];
             }
             else {
                 

OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.m

@@ -485,17 +485,6 @@
 }
 
 
-
-#pragma mark - noti
--(void)notichageGrade:(NSNotification *)notification {
-    
-    NSLog(@"noti : %@", notification);
-    
-    [self precessMasterTransfer];
-    
-}
-
-
 #pragma mark - api
 //자동로그인 요청
 - (void)requestAutoLogin {;