Ver código fonte

- 로그인 페이지 navigation 으로 수정
- 회원가입 > 약관 동의 페이지, 위치서비스 약관 제거

TaeHyun 8 anos atrás
pai
commit
1b88d78c7f

Diferenças do arquivo suprimidas por serem muito extensas
+ 14 - 14
OneCable/Base.lproj/SignUp.storyboard


+ 6 - 1
OneCable/Classes/ViewControllers/MainScreens/LoginViewController.m

@@ -364,7 +364,12 @@
 - (void)lblSignUpTouched {
 
     UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"AgreementViewController" storyboardName:@"SignUp"];
-    [self presentViewController:vc animated:YES completion:nil];
+
+
+    UINavigationController *m_navi =[[UINavigationController alloc]initWithRootViewController:vc];
+    
+[self presentViewController:m_navi animated:YES completion:nil];
+    
 }
 
 - (void)lblFindIdTouched {

+ 34 - 26
OneCable/Classes/ViewControllers/SignUpScreens/AgreementViewController.m

@@ -75,12 +75,14 @@
 
 
 - (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    
     [self.btnCancle setBackgroundImage:[UIImage imageNamed:@"Common_button_left_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
     [self.btnNext setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
-    _tableZombieValues = @[@"t0", @"t1", @"t2", @"t3",@"t4"];
-    
+//    _tableZombieValues = @[@"t0", @"t1", @"t2", @"t3",@"t4"];
+    _tableZombieValues = @[@"t0", @"t1", @"t3",@"t4"];
     [self initTableViewAsDefaultStyle:_tableView];
 }
 
@@ -102,7 +104,9 @@
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 5;
+    
+    return 4;
+//    return 5;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -149,21 +153,21 @@
         
         cell = tcell;
         
-    }else if (indexPath.row == 2) {
-        AgreementLocationTableViewCell *tcell = (AgreementLocationTableViewCell * )[tableView dequeueReusableCellWithIdentifier:@"locationCellIdentifier"];
-        
-        if (!_chkLocation) {
-            _chkLocation = tcell.chkAgree;
-        }
-        
-        tcell.chkAgree.delegate = self;
-        tcell.chkAgree.value = tzombie;
-        tcell.chkAgree.checked = [tcell.chkAgree getCheckStatusFromValue];
-
-        cell = tcell;
-        
-        
-    }else if (indexPath.row == 3){
+    }
+//    else if (indexPath.row == 2) {
+//        AgreementLocationTableViewCell *tcell = (AgreementLocationTableViewCell * )[tableView dequeueReusableCellWithIdentifier:@"locationCellIdentifier"];
+//        
+//        if (!_chkLocation) {
+//            _chkLocation = tcell.chkAgree;
+//        }
+//        
+//        tcell.chkAgree.delegate = self;
+//        tcell.chkAgree.value = tzombie;
+//        tcell.chkAgree.checked = [tcell.chkAgree getCheckStatusFromValue];
+//
+//        cell = tcell;
+//    }
+    else if (indexPath.row == 2){
         AgreementAllTableViewCell *tcell = (AgreementAllTableViewCell * )[tableView dequeueReusableCellWithIdentifier:@"AllCellIdentifier"];
         
         if (!_chkAll) {
@@ -176,7 +180,7 @@
         
         cell = tcell;
         
-    }else if (indexPath.row == 4) {//Guide
+    }else if (indexPath.row == 3) {//Guide
         AgreementGuideTableViewCell *tcell = (AgreementGuideTableViewCell *)[tableView dequeueReusableCellWithIdentifier:@"GuideCellIdentifier"];
         cell = tcell;
     }
@@ -206,9 +210,11 @@
 - (void)didCheckBoxClicked:(id)sender {
     
     if ([sender isEqual:_chkAll]) {
-        _chkTerm.checked = _chkService.checked = _chkLocation.checked =_chkAll.checked;
+//        _chkTerm.checked = _chkService.checked = _chkLocation.checked =_chkAll.checked;
+        _chkTerm.checked = _chkService.checked =_chkAll.checked;
     } else {
-        if (_chkTerm.checked && _chkService.checked && _chkLocation.checked) {
+//        if (_chkTerm.checked && _chkService.checked && _chkLocation.checked) {
+        if (_chkTerm.checked && _chkService.checked) {
             _chkAll.checked = YES;
         } else {
             _chkAll.checked = NO;
@@ -226,12 +232,14 @@
     
     UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"CertificationViewController" storyboardName:@"SignUp"];
     
-    vc.providesPresentationContextTransitionStyle = YES;
-    vc.definesPresentationContext = YES;
-    
-    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+//    vc.providesPresentationContextTransitionStyle = YES;
+//    vc.definesPresentationContext = YES;
+//    
+//    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+//    
+//    [self presentViewController:vc animated:YES completion:nil];
     
-    [self presentViewController:vc animated:YES completion:nil];
+    [self.navigationController pushViewController:vc animated:YES];
 }
 
 - (IBAction)btnCancelTouched:(id)sender {

+ 9 - 6
OneCable/Classes/ViewControllers/SignUpScreens/CertificationViewController.m

@@ -28,6 +28,8 @@
 }
 
 - (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    
     [self.btnSend setBackgroundImage:[UIImage imageNamed:@"img_btn_common_active"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
     [self.btnSend setBackgroundImage:[UIImage imageNamed:@"img_btn_common_press"] forState:UIControlStateHighlighted capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
@@ -49,12 +51,13 @@
 - (IBAction)btnNextTouched:(id)sender {
     UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"IDSetViewController" storyboardName:@"SignUp"];
     
-    vc.providesPresentationContextTransitionStyle = YES;
-    vc.definesPresentationContext = YES;
-    
-    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
-    
-    [self presentViewController:vc animated:YES completion:nil];
+//    vc.providesPresentationContextTransitionStyle = YES;
+//    vc.definesPresentationContext = YES;
+//    
+//    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+//    
+//    [self presentViewController:vc animated:YES completion:nil];
+    [self.navigationController pushViewController:vc animated:YES];
 }
 
 - (IBAction)btnCancelTouched:(id)sender {

+ 9 - 6
OneCable/Classes/ViewControllers/SignUpScreens/IDSetViewController.m

@@ -28,6 +28,8 @@
 }
 
 - (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    
     [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_active"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
     [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_press"] forState:UIControlStateHighlighted capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
@@ -46,12 +48,13 @@
 - (IBAction)btnNextTouched:(id)sender {
     UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"QuizViewController" storyboardName:@"SignUp"];
     
-    vc.providesPresentationContextTransitionStyle = YES;
-    vc.definesPresentationContext = YES;
-    
-    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
-    
-    [self presentViewController:vc animated:YES completion:nil];
+//    vc.providesPresentationContextTransitionStyle = YES;
+//    vc.definesPresentationContext = YES;
+//    
+//    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+//    
+//    [self presentViewController:vc animated:YES completion:nil];
+        [self.navigationController pushViewController:vc animated:YES];
 }
 
 - (IBAction)btnCancelTouched:(id)sender {

+ 1 - 0
OneCable/Classes/ViewControllers/SignUpScreens/JoinFinishViewController.m

@@ -28,6 +28,7 @@
 }
 
 - (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
     
     [self.btnConfirm setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
 }

+ 9 - 6
OneCable/Classes/ViewControllers/SignUpScreens/QuizViewController.m

@@ -27,6 +27,8 @@
     
 }
 - (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    
     [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_active"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
     [self.btnOverlap setBackgroundImage:[UIImage imageNamed:@"img_btn_common_press"] forState:UIControlStateHighlighted capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
@@ -51,12 +53,13 @@
 - (IBAction)btnNextTouched:(id)sender {
     UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"UserNameSetViewController" storyboardName:@"SignUp"];
     
-    vc.providesPresentationContextTransitionStyle = YES;
-    vc.definesPresentationContext = YES;
-    
-    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
-    
-    [self presentViewController:vc animated:YES completion:nil];
+//    vc.providesPresentationContextTransitionStyle = YES;
+//    vc.definesPresentationContext = YES;
+//    
+//    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+//    
+//    [self presentViewController:vc animated:YES completion:nil];
+        [self.navigationController pushViewController:vc animated:YES];
 }
 
 - (IBAction)btnCancelTouched:(id)sender {

+ 9 - 7
OneCable/Classes/ViewControllers/SignUpScreens/UserNameSetViewController.m

@@ -28,7 +28,8 @@
 }
 
 - (void)initUI {
-
+    [self.navigationController.navigationBar setHidden:YES];
+    
     [self.btnCancel setBackgroundImage:[UIImage imageNamed:@"Common_button_left_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
     
     [self.btnNext setBackgroundImage:[UIImage imageNamed:@"Common_button_right_bg"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
@@ -41,12 +42,13 @@
 - (IBAction)btnNextTouched:(id)sender {
     UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"JoinFinishViewController" storyboardName:@"SignUp"];
     
-    vc.providesPresentationContextTransitionStyle = YES;
-    vc.definesPresentationContext = YES;
-    
-    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
-    
-    [self presentViewController:vc animated:YES completion:nil];
+//    vc.providesPresentationContextTransitionStyle = YES;
+//    vc.definesPresentationContext = YES;
+//    
+//    [vc setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+//    
+//    [self presentViewController:vc animated:YES completion:nil];
+        [self.navigationController pushViewController:vc animated:YES];
 }
 
 - (IBAction)btnCancelTouched:(id)sender {