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

KuDianProject/Login/controller/KDPPhoneLoginViewController.m

@@ -69,7 +69,6 @@ static int count = 0;
     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];
@@ -93,7 +92,6 @@ static int count = 0;
     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)];

KuDianProject/TOP/Drawer/Control/KDPSetViewController.m

@@ -8,6 +8,7 @@
 
 #import "KDPSetViewController.h"
 #import "KDPPhoneLoginViewController.h"
+#import "KDPTabBarVC.h"
 @interface KDPSetViewController ()<UITableViewDelegate,UITableViewDataSource>
 {
     
@@ -121,8 +122,60 @@
 -(void)exitClickButton
 {
     [KDPAccountTool deleteAccount];
-     [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPPhoneLoginViewController alloc]init]] animated:YES completion:nil];
+    
     [self.navigationController popToRootViewControllerAnimated:YES];
+    [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPPhoneLoginViewController alloc]init]] animated:YES completion:^{
+        KDPTabBarVC *tabbar = (KDPTabBarVC *)[UIApplication sharedApplication].keyWindow.rootViewController;
+        tabbar.selectedIndex = 0;
+    }];
+}
+
+- (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;
+        
+    }
 }
 
 @end