Merge branch 'master' of http://101.200.220.49:8001/liuxueli/KDProject

KuDianProject.xcodeproj/project.pbxproj

 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WV23VEMQV8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = dev;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WV23VEMQV8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = dev;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

KuDianProject/Login/controller/KDPPhoneLoginViewController.m

 @property (nonatomic, strong) UIButton *sendCodeBtn;
 
 @property (nonatomic, strong) NSTimer *timer;
+// 保存的手机验证码
+@property (nonatomic, strong) NSString *saveCode;
 
 @end
 
     phoneField.textColor = [UIColor colorWithHex:0x333333];
     phoneField.font = FONT_SYS(16);
     phoneField.placeholder = @"请输入手机号";
+    phoneField.clearButtonMode = UITextFieldViewModeWhileEditing;
     [phoneField addTarget:self action:@selector(valueChanged:) forControlEvents:UIControlEventValueChanged];
     self.phoneTextField = phoneField;
     [self.view addSubview:self.phoneTextField];
     phoneLine.backgroundColor = [UIColor colorWithHex:0xD1D1D1];
     [self.view addSubview:phoneLine];
     
-    self.codeField = [[UITextField alloc] initWithFrame:CGRectMake(32, phoneLine.bottom + 27, self.phoneTextField.width, self.phoneTextField.height)];
+    self.codeField = [[UITextField alloc] initWithFrame:CGRectMake(32, phoneLine.bottom + 27, phoneLine.width, self.phoneTextField.height)];
     self.codeField.keyboardType = UIKeyboardTypePhonePad;
     self.codeField.textColor = [UIColor colorWithHex:0x333333];
     self.codeField.font = FONT_SYS(16);
     self.codeField.placeholder = @"请输入验证码";
+    self.codeField.clearButtonMode = UITextFieldViewModeWhileEditing;
     [self.view addSubview:self.codeField];
     
     UIView *lineView = [[UIView alloc] initWithFrame:CGRectMake(32, self.codeField.bottom + 12, SCREEN_WIDTH-64, 1)];
                 [vc dismissViewControllerAnimated:YES completion:nil];
             }
         } failure:^(NSError * _Nonnull error) {
+            [MBProgressHUD showError:@"验证码输入错误"];
             [LoadingView dismiss];
         }];
 

KuDianProject/Public/KDPNetworkRequestHTTP.m

 #import "KDPNetworkRequestHTTP.h"
 #import <AdSupport/AdSupport.h>
 #import "KDPPhoneLoginViewController.h"
+#import "KDPTabBarVC.h"
 @implementation KDPNetworkRequestHTTP
 + (void)postURL:(NSString *)url params:(NSDictionary *)params success:(void(^)(id json))success failure:(void(^)(NSError *error))failure
 {
 {
     [[NSNotificationCenter defaultCenter]postNotificationName:@"exitLogin" object:nil];
     [KDPAccountTool deleteAccount];
+
+    [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPPhoneLoginViewController alloc]init]] animated:YES completion:^{
+        UIViewController *currentVC = [[self alloc] getCurrentVC];
+        
+        [currentVC.navigationController popToRootViewControllerAnimated:YES];
+        
+        KDPTabBarVC *tabbar = (KDPTabBarVC *)[UIApplication sharedApplication].keyWindow.rootViewController;
+        tabbar.selectedIndex = 0;
+    }];
     
-    [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPPhoneLoginViewController alloc]init]] animated:YES completion:nil];
+}
+
+- (UIViewController *)getCurrentVC {
+    // Find best view controller
+    UIViewController* viewController = [UIApplication sharedApplication].keyWindow.rootViewController;
+    return [self findBestViewController:viewController];
+}
+
+-(UIViewController*) findBestViewController:(UIViewController*)vc {
     
+    if (vc.presentedViewController) {
+        
+        // Return presented view controller
+        return [self findBestViewController:vc.presentedViewController];
+        
+    } else if ([vc isKindOfClass:[UISplitViewController class]]) {
+        
+        // Return right hand side
+        UISplitViewController* svc = (UISplitViewController*) vc;
+        if (svc.viewControllers.count > 0)
+            return [self findBestViewController:svc.viewControllers.lastObject];
+        else
+            return vc;
+        
+    } else if ([vc isKindOfClass:[UINavigationController class]]) {
+        
+        // Return top view
+        UINavigationController* svc = (UINavigationController*) vc;
+        if (svc.viewControllers.count > 0)
+            return [self findBestViewController:svc.topViewController];
+        else
+            return vc;
+        
+    } else if ([vc isKindOfClass:[UITabBarController class]]) {
+        
+        // Return visible view
+        UITabBarController* svc = (UITabBarController*) vc;
+        if (svc.viewControllers.count > 0)
+            return [self findBestViewController:svc.selectedViewController];
+        else
+            return vc;
+        
+    } else {
+        
+        // Unknown view controller type, return last child view controller
+        return vc;
+        
+    }
 }
 
 /**