Explorar o código

- SignUp , 아이디찾기 ,비밀번호 찾기 페이지 신규 업로드 및 회원가입페이지 수정

TaeHyun %!s(int64=8) %!d(string=hai) anos
pai
achega
98782ff3d6
Modificáronse 20 ficheiros con 569 adicións e 6 borrados
  1. 48 6
      OneCable.xcodeproj/project.pbxproj
  2. 1 0
      OneCable/Classes/ViewControllers/SignUpScreens/CertificationViewController.m
  3. 1 0
      OneCable/Classes/ViewControllers/SignUpScreens/IDSetViewController.m
  4. 21 0
      OneCable/Classes/ViewControllers/SignUpScreens/IdFindCompleteViewController.h
  5. 54 0
      OneCable/Classes/ViewControllers/SignUpScreens/IdFindCompleteViewController.m
  6. 24 0
      OneCable/Classes/ViewControllers/SignUpScreens/IdFindViewController.h
  7. 49 0
      OneCable/Classes/ViewControllers/SignUpScreens/IdFindViewController.m
  8. 1 0
      OneCable/Classes/ViewControllers/SignUpScreens/JoinFinishViewController.m
  9. 27 0
      OneCable/Classes/ViewControllers/SignUpScreens/PwAnswerViewController.h
  10. 66 0
      OneCable/Classes/ViewControllers/SignUpScreens/PwAnswerViewController.m
  11. 20 0
      OneCable/Classes/ViewControllers/SignUpScreens/PwFindCompleteViewController.h
  12. 49 0
      OneCable/Classes/ViewControllers/SignUpScreens/PwFindCompleteViewController.m
  13. 24 0
      OneCable/Classes/ViewControllers/SignUpScreens/PwFindViewController.h
  14. 50 0
      OneCable/Classes/ViewControllers/SignUpScreens/PwFindViewController.m
  15. 24 0
      OneCable/Classes/ViewControllers/SignUpScreens/QuizSelectViewController.h
  16. 32 0
      OneCable/Classes/ViewControllers/SignUpScreens/QuizSelectViewController.m
  17. 1 0
      OneCable/Classes/ViewControllers/SignUpScreens/QuizViewController.m
  18. 22 0
      OneCable/Classes/ViewControllers/SignUpScreens/TempPwViewController.h
  19. 54 0
      OneCable/Classes/ViewControllers/SignUpScreens/TempPwViewController.m
  20. 1 0
      OneCable/Classes/ViewControllers/SignUpScreens/UserNameSetViewController.m

+ 48 - 6
OneCable.xcodeproj/project.pbxproj

@@ -185,6 +185,13 @@
 		E2A252161E7F540700B3D007 /* UserNameSetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2A252111E7F540700B3D007 /* UserNameSetViewController.m */; };
 		E2AA822D1E6FD652009B8077 /* MorePopOverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2AA822C1E6FD652009B8077 /* MorePopOverViewController.m */; };
 		E2BDF0431E838F970036468B /* ThingsDelValveCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2BDF0421E838F970036468B /* ThingsDelValveCompleteViewController.m */; };
+		E2E08CF91E8DDA5E0034D6F7 /* TempPwViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08CF81E8DDA5E0034D6F7 /* TempPwViewController.m */; };
+		E2E08CFC1E8DDA790034D6F7 /* IdFindViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08CFB1E8DDA790034D6F7 /* IdFindViewController.m */; };
+		E2E08CFF1E8DDA9B0034D6F7 /* IdFindCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08CFE1E8DDA9B0034D6F7 /* IdFindCompleteViewController.m */; };
+		E2E08D021E8DDAB70034D6F7 /* PwFindViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08D011E8DDAB70034D6F7 /* PwFindViewController.m */; };
+		E2E08D051E8DDAD10034D6F7 /* PwAnswerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08D041E8DDAD10034D6F7 /* PwAnswerViewController.m */; };
+		E2E08D081E8DDAE60034D6F7 /* PwFindCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08D071E8DDAE60034D6F7 /* PwFindCompleteViewController.m */; };
+		E2E08D0B1E8DDB000034D6F7 /* QuizSelectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E08D0A1E8DDB000034D6F7 /* QuizSelectViewController.m */; };
 		E2E34E181E827B4D00BB8C96 /* ThingsAddInitCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E0D1E827B4D00BB8C96 /* ThingsAddInitCompleteViewController.m */; };
 		E2E34E191E827B4D00BB8C96 /* ThingsAddInitFailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E0F1E827B4D00BB8C96 /* ThingsAddInitFailViewController.m */; };
 		E2E34E1A1E827B4D00BB8C96 /* ThingsAddInitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2E34E111E827B4D00BB8C96 /* ThingsAddInitViewController.m */; };
@@ -511,6 +518,7 @@
 		A5F267D81E544A530096276E /* NSNetService+Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNetService+Util.h"; sourceTree = "<group>"; };
 		A5F267D91E544A530096276E /* NSNetService+Util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSNetService+Util.m"; sourceTree = "<group>"; };
 		ADE7CA33EFEB615D1B6CB053 /* Pods-OneCable.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneCable.adhoc.xcconfig"; path = "Pods/Target Support Files/Pods-OneCable/Pods-OneCable.adhoc.xcconfig"; sourceTree = "<group>"; };
+		E21000791E91C98A00D5C4AE /* IdFindViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdFindViewController.h; sourceTree = "<group>"; };
 		E2295F091E83857A008C5915 /* ThingsDelValveStartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsDelValveStartViewController.h; sourceTree = "<group>"; };
 		E2295F0A1E83857A008C5915 /* ThingsDelValveStartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelValveStartViewController.m; sourceTree = "<group>"; };
 		E2A252081E7F540700B3D007 /* CertificationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CertificationViewController.h; sourceTree = "<group>"; };
@@ -527,6 +535,18 @@
 		E2AA822C1E6FD652009B8077 /* MorePopOverViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MorePopOverViewController.m; sourceTree = "<group>"; };
 		E2BDF0411E838F970036468B /* ThingsDelValveCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsDelValveCompleteViewController.h; sourceTree = "<group>"; };
 		E2BDF0421E838F970036468B /* ThingsDelValveCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelValveCompleteViewController.m; sourceTree = "<group>"; };
+		E2E08CF71E8DDA5E0034D6F7 /* TempPwViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TempPwViewController.h; sourceTree = "<group>"; };
+		E2E08CF81E8DDA5E0034D6F7 /* TempPwViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TempPwViewController.m; sourceTree = "<group>"; };
+		E2E08CFB1E8DDA790034D6F7 /* IdFindViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdFindViewController.m; sourceTree = "<group>"; };
+		E2E08CFE1E8DDA9B0034D6F7 /* IdFindCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdFindCompleteViewController.m; sourceTree = "<group>"; };
+		E2E08D001E8DDAB70034D6F7 /* PwFindViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PwFindViewController.h; sourceTree = "<group>"; };
+		E2E08D011E8DDAB70034D6F7 /* PwFindViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PwFindViewController.m; sourceTree = "<group>"; };
+		E2E08D031E8DDAD10034D6F7 /* PwAnswerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PwAnswerViewController.h; sourceTree = "<group>"; };
+		E2E08D041E8DDAD10034D6F7 /* PwAnswerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PwAnswerViewController.m; sourceTree = "<group>"; };
+		E2E08D061E8DDAE60034D6F7 /* PwFindCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PwFindCompleteViewController.h; sourceTree = "<group>"; };
+		E2E08D071E8DDAE60034D6F7 /* PwFindCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PwFindCompleteViewController.m; sourceTree = "<group>"; };
+		E2E08D091E8DDB000034D6F7 /* QuizSelectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuizSelectViewController.h; sourceTree = "<group>"; };
+		E2E08D0A1E8DDB000034D6F7 /* QuizSelectViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuizSelectViewController.m; sourceTree = "<group>"; };
 		E2E34E0C1E827B4D00BB8C96 /* ThingsAddInitCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsAddInitCompleteViewController.h; sourceTree = "<group>"; };
 		E2E34E0D1E827B4D00BB8C96 /* ThingsAddInitCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsAddInitCompleteViewController.m; sourceTree = "<group>"; };
 		E2E34E0E1E827B4D00BB8C96 /* ThingsAddInitFailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsAddInitFailViewController.h; sourceTree = "<group>"; };
@@ -539,6 +559,7 @@
 		E2E34E151E827B4D00BB8C96 /* ThingsDelPlugViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelPlugViewController.m; sourceTree = "<group>"; };
 		E2E34E161E827B4D00BB8C96 /* ThingsDelValveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsDelValveViewController.h; sourceTree = "<group>"; };
 		E2E34E171E827B4D00BB8C96 /* ThingsDelValveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsDelValveViewController.m; sourceTree = "<group>"; };
+		E2EC0FD71E91CB7F00BA166D /* IdFindCompleteViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IdFindCompleteViewController.h; sourceTree = "<group>"; };
 		FE2DCDFBF6442768EBBE8107 /* Pods-OneCable.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneCable.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OneCable/Pods-OneCable.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1015,6 +1036,20 @@
 				A13BCFA91C3B491400C76527 /* SignUpViewController.m */,
 				A13BCFA61C3B491400C76527 /* NewMobileViewController.h */,
 				A13BCFA71C3B491400C76527 /* NewMobileViewController.m */,
+				E2E08CF71E8DDA5E0034D6F7 /* TempPwViewController.h */,
+				E2E08CF81E8DDA5E0034D6F7 /* TempPwViewController.m */,
+				E21000791E91C98A00D5C4AE /* IdFindViewController.h */,
+				E2E08CFB1E8DDA790034D6F7 /* IdFindViewController.m */,
+				E2EC0FD71E91CB7F00BA166D /* IdFindCompleteViewController.h */,
+				E2E08CFE1E8DDA9B0034D6F7 /* IdFindCompleteViewController.m */,
+				E2E08D001E8DDAB70034D6F7 /* PwFindViewController.h */,
+				E2E08D011E8DDAB70034D6F7 /* PwFindViewController.m */,
+				E2E08D031E8DDAD10034D6F7 /* PwAnswerViewController.h */,
+				E2E08D041E8DDAD10034D6F7 /* PwAnswerViewController.m */,
+				E2E08D061E8DDAE60034D6F7 /* PwFindCompleteViewController.h */,
+				E2E08D071E8DDAE60034D6F7 /* PwFindCompleteViewController.m */,
+				E2E08D091E8DDB000034D6F7 /* QuizSelectViewController.h */,
+				E2E08D0A1E8DDB000034D6F7 /* QuizSelectViewController.m */,
 			);
 			path = SignUpScreens;
 			sourceTree = "<group>";
@@ -1259,7 +1294,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		27BC1E0D72C144B1471B5B4D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
@@ -1267,14 +1302,14 @@
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 			);
-			runOnlyForDeploymentPostprocessing = 1;
+			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OneCable/Pods-OneCable-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		93ADEA80A8C04811E0886259 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
@@ -1282,21 +1317,21 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			);
-			runOnlyForDeploymentPostprocessing = 1;
+			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OneCable/Pods-OneCable-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		A57656181E518A1D002D0AE2 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
 			);
 			outputPaths = (
 			);
-			runOnlyForDeploymentPostprocessing = 1;
+			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "${PODS_ROOT}/Fabric/run 880f3dee7e6be7a796fab928aafeee250c7867e2 cd7015c4f4a84ac451c1239e79ac4d79f8789bf567e4a50643d45f604248b1e7";
 		};
@@ -1341,6 +1376,7 @@
 				A13BD0D81C3B563D00C76527 /* TemperaturePopupView.m in Sources */,
 				A13BD03A1C3B491400C76527 /* InvitationAnswerViewController.m in Sources */,
 				A13BD0241C3B491400C76527 /* ValidateUtil.m in Sources */,
+				E2E08D051E8DDAD10034D6F7 /* PwAnswerViewController.m in Sources */,
 				A13BD01D1C3B491400C76527 /* RuleModel.m in Sources */,
 				A1A454931C477ACD00BA805C /* ChangeEmailPopupView.m in Sources */,
 				A13BD0331C3B491400C76527 /* JDTableViewController.m in Sources */,
@@ -1366,6 +1402,7 @@
 				A13BCFE21C3B491400C76527 /* UIDevice-Reachability.m in Sources */,
 				A13BD01E1C3B491400C76527 /* SceneModel.m in Sources */,
 				E2E34E1B1E827B4D00BB8C96 /* ThingsDelPlugCompleteViewController.m in Sources */,
+				E2E08CF91E8DDA5E0034D6F7 /* TempPwViewController.m in Sources */,
 				A191B48E1C4639F900DEBA91 /* AdminAuthPopupView.m in Sources */,
 				A13BCFFB1C3B491400C76527 /* OptionPopOverViewController.m in Sources */,
 				A13BCFF31C3B491400C76527 /* DeviceSelectPopupView.m in Sources */,
@@ -1373,9 +1410,11 @@
 				A13BD02D1C3B491400C76527 /* HomeHubViewController.m in Sources */,
 				A13BD0381C3B491400C76527 /* InvitationAnswerPopupView.m in Sources */,
 				A13BCFE71C3B491400C76527 /* UIView+Toast.m in Sources */,
+				E2E08CFF1E8DDA9B0034D6F7 /* IdFindCompleteViewController.m in Sources */,
 				A13BCFF91C3B491400C76527 /* NoContentView.m in Sources */,
 				A13BCFE91C3B491400C76527 /* CommandClassControlDetailView.m in Sources */,
 				A15D2CFC1C58598F0018D555 /* KNLayoutConstraint.m in Sources */,
+				E2E08D021E8DDAB70034D6F7 /* PwFindViewController.m in Sources */,
 				A13BD0361C3B491400C76527 /* HomeModeUpdateViewController.m in Sources */,
 				A13BD0351C3B491400C76527 /* HomeModeSettingsViewController.m in Sources */,
 				A13BD0511C3B491400C76527 /* PwdPopupView.m in Sources */,
@@ -1384,6 +1423,7 @@
 				A13BD0071C3B491400C76527 /* CustomCheckBox.m in Sources */,
 				A13BD0721C3B491400C76527 /* Reachability.m in Sources */,
 				A13BCFDE1C3B491400C76527 /* NSDate+Utilities.m in Sources */,
+				E2E08D0B1E8DDB000034D6F7 /* QuizSelectViewController.m in Sources */,
 				A13BCFF61C3B491400C76527 /* KNTableViewCell.m in Sources */,
 				A13BD0DF1C3B563D00C76527 /* WeatherLocationPopupView.m in Sources */,
 				A13BD0341C3B491400C76527 /* JDViewController.m in Sources */,
@@ -1413,6 +1453,7 @@
 				A16A1CC41C71728400F92BC1 /* NetworkServiceHandler.m in Sources */,
 				A13BD0151C3B491400C76527 /* RequestHandler.m in Sources */,
 				A13BD0041C3B491400C76527 /* CustomAlertView.m in Sources */,
+				E2E08CFC1E8DDA790034D6F7 /* IdFindViewController.m in Sources */,
 				E2A252161E7F540700B3D007 /* UserNameSetViewController.m in Sources */,
 				A13BD0441C3B491400C76527 /* RulesDetailViewController.m in Sources */,
 				A13BD0261C3B491400C76527 /* HomeHubChangeViewController.m in Sources */,
@@ -1426,6 +1467,7 @@
 				A13BD06A1C3B491400C76527 /* ThingsDetailViewController.m in Sources */,
 				A13BCFEB1C3B491400C76527 /* CommandClassControlNodeView.m in Sources */,
 				A13BD0161C3B491400C76527 /* JDFacade.m in Sources */,
+				E2E08D081E8DDAE60034D6F7 /* PwFindCompleteViewController.m in Sources */,
 				A13BCFDF1C3B491400C76527 /* NSDictionary-Additions.m in Sources */,
 				A13BD0411C3B491400C76527 /* RulesAddCompleteViewController.m in Sources */,
 				A13BD0101C3B491400C76527 /* CustomTextField.m in Sources */,

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

@@ -29,6 +29,7 @@
 
 - (void)initUI {
     [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
     
     [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 6"]];
     

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

@@ -29,6 +29,7 @@
 
 - (void)initUI {
     [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
     
     [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 6"]];
     

+ 21 - 0
OneCable/Classes/ViewControllers/SignUpScreens/IdFindCompleteViewController.h

@@ -0,0 +1,21 @@
+//
+//  IdFindCompleteViewController.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "JDViewController.h"
+
+@class CustomLabel;
+@class CustomButton;
+
+@interface IdFindCompleteViewController : JDViewController
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+@property (weak, nonatomic) IBOutlet CustomLabel *lblUserId;
+@property (weak, nonatomic) IBOutlet CustomButton *btnConfirm;
+
+
+@end

+ 54 - 0
OneCable/Classes/ViewControllers/SignUpScreens/IdFindCompleteViewController.m

@@ -0,0 +1,54 @@
+//
+//  IdFindCompleteViewController.m
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "IdFindCompleteViewController.h"
+#import "CustomLabel.h"
+#import "CustomButton.h"
+#import "JDJSONModel.h"
+
+NSString *userName;
+@interface IdFindCompleteViewController ()
+
+@end
+
+/**
+ 
+ 유저아이디 부분은 kUITextColor01 색상으로 출력
+ 
+**/
+
+@implementation IdFindCompleteViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self initUI];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+
+}
+
+- (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    
+    [_lblUserId setColor:kUITextColor01 text:[NSString stringWithFormat:@"%@", @"aaaaaaaaa11"]];
+    
+    [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 2"]];
+}
+
+
+
+- (IBAction)btnConfirmTouched:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+
+@end

+ 24 - 0
OneCable/Classes/ViewControllers/SignUpScreens/IdFindViewController.h

@@ -0,0 +1,24 @@
+//
+//  IdFindViewController.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "JDViewController.h"
+
+@class CustomLabel;
+@class CustomButton;
+@class CustomTextField;
+
+@interface IdFindViewController : JDViewController
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtIdInput;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtNumInput;
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
+
+
+@end

+ 49 - 0
OneCable/Classes/ViewControllers/SignUpScreens/IdFindViewController.m

@@ -0,0 +1,49 @@
+//
+//  IdFindViewController.m
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "IdFindViewController.h"
+#import "CustomButton.h"
+#import "CustomLabel.h"
+#import "CustomTextField.h"
+
+@interface IdFindViewController ()
+
+@end
+
+@implementation IdFindViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    [self initUI];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+
+}
+
+- (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    
+    [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 2"]];
+}
+
+
+
+- (IBAction)btnCancelTouched:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (IBAction)btnNextTouched:(id)sender {
+        UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"IdFindCompleteViewController" storyboardName:@"SignUp"];
+    
+    [self.navigationController pushViewController:vc animated:YES];
+}
+@end

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

@@ -29,6 +29,7 @@
 
 - (void)initUI {
     [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
     
     [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 6"]];
 }

+ 27 - 0
OneCable/Classes/ViewControllers/SignUpScreens/PwAnswerViewController.h

@@ -0,0 +1,27 @@
+//
+//  PwAnswerViewController.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "JDViewController.h"
+
+@class CustomLabel;
+@class CustomButton;
+@class CustomTextField;
+
+@interface PwAnswerViewController : JDViewController
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtQuizInput;
+@property (weak, nonatomic) IBOutlet CustomButton *btnQuizSelect;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtYear;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtMonth;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtDay;
+
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
+
+@end

+ 66 - 0
OneCable/Classes/ViewControllers/SignUpScreens/PwAnswerViewController.m

@@ -0,0 +1,66 @@
+//
+//  PwAnswerViewController.m
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "PwAnswerViewController.h"
+
+#import "CustomLabel.h"
+#import "CustomButton.h"
+#import "CustomTextField.h"
+
+@interface PwAnswerViewController () <CustomTextFieldDelegate>{
+    
+}
+
+@end
+
+@implementation PwAnswerViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    [self initUI];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+
+}
+- (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    
+    _txtYear.customTextFieldSuperview = CustomTextFieldSuperviewIsScrollView;
+    _txtMonth.customTextFieldSuperview = CustomTextFieldSuperviewIsScrollView;
+    _txtDay.customTextFieldSuperview = CustomTextFieldSuperviewIsScrollView;
+    
+    
+    _txtYear.keyboardType = UIKeyboardTypeDefault;
+    _txtMonth.keyboardType = UIKeyboardTypeDefault;
+    _txtDay.keyboardType = UIKeyboardTypeDefault;
+    
+    _txtYear.returnKeyType = UIReturnKeyNext;
+    _txtMonth.returnKeyType = UIReturnKeyNext;
+    _txtDay.returnKeyType = UIReturnKeyDone;
+    
+
+    [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 3"]];
+}
+
+
+
+- (IBAction)btnCancelTouched:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (IBAction)btnNextTouched:(id)sender {
+    UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"PwFindCompleteViewController" storyboardName:@"SignUp"];
+    
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
+@end

+ 20 - 0
OneCable/Classes/ViewControllers/SignUpScreens/PwFindCompleteViewController.h

@@ -0,0 +1,20 @@
+//
+//  PwFindCompleteViewController.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "JDViewController.h"
+
+@class CustomButton;
+@class CustomLabel;
+
+@interface PwFindCompleteViewController : JDViewController
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+@property (weak, nonatomic) IBOutlet CustomButton *btnConfirm;
+@property (weak, nonatomic) IBOutlet CustomButton *btnReReceive;
+
+@end

+ 49 - 0
OneCable/Classes/ViewControllers/SignUpScreens/PwFindCompleteViewController.m

@@ -0,0 +1,49 @@
+//
+//  PwFindCompleteViewController.m
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "PwFindCompleteViewController.h"
+
+@interface PwFindCompleteViewController ()
+
+@end
+
+@implementation PwFindCompleteViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    [self initUI];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+
+}
+
+- (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    
+    [self.btnReReceive setBackgroundImage:[UIImage imageNamed:@"img_btn_common_active"] forState:UIControlStateNormal capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnReReceive setBackgroundImage:[UIImage imageNamed:@"img_btn_common_press"] forState:UIControlStateHighlighted capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [self.btnReReceive setBackgroundImage:[UIImage imageNamed:@"img_btn_common_disable"] forState:UIControlStateDisabled capInsets:UIEdgeInsetsMake(kfTopInset,kfRightInset,kfBottomInset,kfLeftInset)];
+    
+    [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 3"]];
+}
+
+- (IBAction)btnReReceiveTouched:(id)sender {
+    NSLog(@"임시 비밀번호 재발급");
+}
+
+
+- (IBAction)btnConfirmTouched:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+@end

+ 24 - 0
OneCable/Classes/ViewControllers/SignUpScreens/PwFindViewController.h

@@ -0,0 +1,24 @@
+//
+//  PwFindViewController.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "JDViewController.h"
+
+@class CustomTextField;
+@class CustomLabel;
+@class CustomButton;
+
+@interface PwFindViewController : JDViewController
+
+@property (weak, nonatomic) IBOutlet CustomLabel *lblStep;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtFindIdInput;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtNumInput;
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
+
+
+@end

+ 50 - 0
OneCable/Classes/ViewControllers/SignUpScreens/PwFindViewController.m

@@ -0,0 +1,50 @@
+//
+//  PwFindViewController.m
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "PwFindViewController.h"
+#import "CustomButton.h"
+#import "CustomLabel.h"
+#import "CustomTextField.h"
+
+@interface PwFindViewController ()
+
+@end
+
+@implementation PwFindViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    [self initUI];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+
+}
+
+- (void)initUI {
+    [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    
+    [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 3"]];
+}
+
+
+
+- (IBAction)btnCancelTouched:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (IBAction)btnNextTouched:(id)sender {
+    UIViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"PwAnswerViewController" storyboardName:@"SignUp"];
+    
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
+@end

+ 24 - 0
OneCable/Classes/ViewControllers/SignUpScreens/QuizSelectViewController.h

@@ -0,0 +1,24 @@
+//
+//  QuizSelectViewController.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "JDViewController.h"
+
+@class KNTableViewCell;
+@class CustomButton;
+@class CustomLabel;
+
+@interface QuizSelectViewController : JDViewController
+
+@property (weak, nonatomic) IBOutlet UIView *maskView;
+@property (weak, nonatomic) IBOutlet UIView *viewQuizSelect;
+
+
+@property (weak, nonatomic) IBOutlet CustomButton *btnClose;
+
+
+@end

+ 32 - 0
OneCable/Classes/ViewControllers/SignUpScreens/QuizSelectViewController.m

@@ -0,0 +1,32 @@
+//
+//  QuizSelectViewController.m
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "QuizSelectViewController.h"
+
+@interface QuizSelectViewController ()
+
+@end
+
+@implementation QuizSelectViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+
+}
+
+- (IBAction)btnCloseTouched:(id)sender {
+    [self.view removeFromSuperview];
+    [self removeFromParentViewController];
+}
+
+@end

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

@@ -28,6 +28,7 @@
 }
 - (void)initUI {
     [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
     
     [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 6"]];
     

+ 22 - 0
OneCable/Classes/ViewControllers/SignUpScreens/TempPwViewController.h

@@ -0,0 +1,22 @@
+//
+//  TempPwViewController.h
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "JDViewController.h"
+
+@class CustomButton;
+@class CustomLabel;
+@class CustomTextField;
+
+@interface TempPwViewController : JDViewController
+
+@property (weak, nonatomic) IBOutlet CustomTextField *txtPwInput;
+@property (weak, nonatomic) IBOutlet CustomTextField *txtPwReInput;
+@property (weak, nonatomic) IBOutlet CustomButton *btnCancel;
+@property (weak, nonatomic) IBOutlet CustomButton *btnNext;
+
+@end

+ 54 - 0
OneCable/Classes/ViewControllers/SignUpScreens/TempPwViewController.m

@@ -0,0 +1,54 @@
+//
+//  TempPwViewController.m
+//  OneCable
+//
+//  Created by nComz on 2017. 3. 31..
+//  Copyright © 2017년 ntels. All rights reserved.
+//
+
+#import "TempPwViewController.h"
+#import "CustomLabel.h"
+#import "CustomButton.h"
+#import "CustomTextField.h"
+
+@interface TempPwViewController ()<CustomTextFieldDelegate> {
+}
+
+@end
+
+@implementation TempPwViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+
+}
+
+- (void) initUI{
+    _txtPwInput.customTextFieldSuperview = CustomTextFieldSuperviewIsScrollView;
+    _txtPwReInput.customTextFieldSuperview = CustomTextFieldSuperviewIsScrollView;
+    
+    _txtPwInput.secureTextEntry = YES;
+    _txtPwReInput.secureTextEntry = YES;
+    
+    _txtPwInput.keyboardType = UIKeyboardTypeDefault;
+    _txtPwReInput.keyboardType = UIKeyboardTypeDefault;
+    
+    _txtPwInput.returnKeyType = UIReturnKeyNext;
+    _txtPwReInput.returnKeyType = UIReturnKeyDone;
+    
+    _txtPwReInput.delegate = self;
+}
+
+- (IBAction)btnCancelTouched:(id)sender {
+    NSLog(@"로그인 페이지로 이동");
+}
+- (IBAction)btnConfirmTouched:(id)sender {
+    NSLog(@"패스워드 변경 완료");
+}
+
+@end

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

@@ -29,6 +29,7 @@
 
 - (void)initUI {
     [self.navigationController.navigationBar setHidden:YES];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
     
     [_lblStep setColor:kUITextColor03 text:[NSString stringWithFormat:@"%@", @"/ 6"]];