From 48e33aec03631e490a4edbe3f7a3869e49f0d3bb Mon Sep 17 00:00:00 2001 From: wu736139669 Date: Thu, 2 Apr 2015 09:09:16 +0800 Subject: [PATCH] new --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 18 ++++---- Ash_AWord/AppDelegate.h | 4 ++ Ash_AWord/AppDelegate.m | 14 +++++++ Ash_AWord/Utility/Tool/Ash_UIUtil.m | 16 ++++---- .../Login/LoginViewController.h | 9 +++- .../Login/LoginViewController.m | 41 ++++++++++++++++++- .../ViewControllers/Main/MyViewController.m | 3 +- .../ViewControllers/Main/NoteViewController.m | 8 +++- Podfile | 3 +- 9 files changed, 92 insertions(+), 24 deletions(-) diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 42ad4cb..ac62c33 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,11 +10,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/AppDelegate.m" - timestampString = "449487315.158869" + timestampString = "449628804.640986" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "80" - endingLineNumber = "80" + startingLineNumber = "94" + endingLineNumber = "94" landmarkName = "-setUmeng" landmarkType = "5"> @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "449549149.00937" + timestampString = "449628804.640986" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "78" - endingLineNumber = "78" + startingLineNumber = "79" + endingLineNumber = "79" landmarkName = "-weixinLoginBtnClick:" landmarkType = "5"> @@ -74,11 +74,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "449549149.00937" + timestampString = "449628804.640986" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "80" - endingLineNumber = "80" + startingLineNumber = "81" + endingLineNumber = "81" landmarkName = "-weixinLoginBtnClick:" landmarkType = "5"> diff --git a/Ash_AWord/AppDelegate.h b/Ash_AWord/AppDelegate.h index b4828a5..e33e85d 100644 --- a/Ash_AWord/AppDelegate.h +++ b/Ash_AWord/AppDelegate.h @@ -16,6 +16,10 @@ @property (strong, nonatomic) UIWindow *window; @property (strong, nonatomic) MainViewController* mainViewController; +/** + * 当前可视viewController + */ ++ (UIViewController *)visibleViewController; @end diff --git a/Ash_AWord/AppDelegate.m b/Ash_AWord/AppDelegate.m index 11b6576..3700872 100644 --- a/Ash_AWord/AppDelegate.m +++ b/Ash_AWord/AppDelegate.m @@ -71,6 +71,20 @@ return YES; } +/** + * 当前可视viewController + */ ++ (UIViewController *)visibleViewController +{ + AppDelegate *delegate = (AppDelegate *)[UIApplication sharedApplication].delegate; + UITabBarController *tab = (UITabBarController *)delegate.window.rootViewController; + if ([tab isKindOfClass:[UITabBarController class]]) + { + return ([(UINavigationController *)[[tab viewControllers] objectAtIndex:tab.selectedIndex] visibleViewController]); + } + return nil; +} + #pragma mark methods -(void)setUmeng { diff --git a/Ash_AWord/Utility/Tool/Ash_UIUtil.m b/Ash_AWord/Utility/Tool/Ash_UIUtil.m index 1e2d6ab..f781cce 100644 --- a/Ash_AWord/Utility/Tool/Ash_UIUtil.m +++ b/Ash_AWord/Utility/Tool/Ash_UIUtil.m @@ -213,10 +213,10 @@ [btn setImage:highlightedImage forState:UIControlStateHighlighted]; } [btn addTarget:target action:action forControlEvents:UIControlEventTouchUpInside]; - if (iOSVersion >= 7.0) - { - btn.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, -15); - } +// if (iOSVersion >= 7.0) +// { +// btn.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, -15); +// } UIBarButtonItem *barItem = [[UIBarButtonItem alloc] initWithCustomView:btn]; return barItem; @@ -231,10 +231,10 @@ } [btn addTarget:target action:action forControlEvents:UIControlEventTouchUpInside]; - if (iOSVersion >= 7.0) - { - btn.imageEdgeInsets = UIEdgeInsetsMake(0, -15, 0, 0); - } +// if (iOSVersion >= 7.0) +// { +// btn.imageEdgeInsets = UIEdgeInsetsMake(0, -15, 0, 0); +// } UIBarButtonItem *barItem = [[UIBarButtonItem alloc] initWithCustomView:btn]; return barItem; diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.h b/Ash_AWord/ViewControllers/Login/LoginViewController.h index 9889a1c..518dac0 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.h +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.h @@ -8,9 +8,16 @@ #import -@interface LoginViewController : UIViewController +@interface LoginViewController : UIViewController - (IBAction)qqLoginBtnClick:(id)sender; - (IBAction)weixinLoginBtnClick:(id)sender; - (IBAction)closeBtnClick:(id)sender; +@property (strong, nonatomic)void (^loginSuccessBlock)(); + + ++ (LoginViewController *)shareLoginViewController; + + ++ (void)presentLoginViewControllerInView:(UIViewController *)vc success:(void (^)(void))completion; @end diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.m b/Ash_AWord/ViewControllers/Login/LoginViewController.m index 2c6a330..bc2c98c 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.m +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.m @@ -9,6 +9,7 @@ #import "LoginViewController.h" #import "LoginViewModel.h" #import "UMSocial.h" +#import "AppDelegate.h" @interface LoginViewController () @end @@ -117,7 +118,13 @@ [AWordUser sharedInstance].userName = name; [AWordUser sharedInstance].userAvatar = figureUrl; [AWordUser sharedInstance].userGender = gender; - [self closeBtnClick:nil]; + [self dismissViewControllerAnimated:YES completion:^{ + if (self.loginSuccessBlock) + { + self.loginSuccessBlock(); + self.loginSuccessBlock = nil; + } + }]; [[NSNotificationCenter defaultCenter] postNotificationName:kLoginSuccessNotificationName object:nil]; }else{ [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; @@ -126,4 +133,36 @@ }]; } + ++ (LoginViewController *)shareLoginViewController +{ + static LoginViewController *loginVC = nil; + if (loginVC == nil) + { + loginVC = [[LoginViewController alloc] initWithNibName:nil bundle:nil]; + } + return loginVC; +} + ++ (void)presentLoginViewControllerInView:(UIViewController *)vc success:(void (^)(void))completion +{ + //已登录 + if ([AWordUser sharedInstance].isLogin) + { + if (completion) completion(); + return; + } + + if (!vc) + { + vc = [AppDelegate visibleViewController]; + } + + LoginViewController *loginVC = [LoginViewController shareLoginViewController]; + loginVC.loginSuccessBlock = completion; + UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:loginVC]; + nav.delegate = loginVC; + [vc presentViewController:nav animated:YES completion:nil]; +} + @end diff --git a/Ash_AWord/ViewControllers/Main/MyViewController.m b/Ash_AWord/ViewControllers/Main/MyViewController.m index e20e2ee..44cb196 100644 --- a/Ash_AWord/ViewControllers/Main/MyViewController.m +++ b/Ash_AWord/ViewControllers/Main/MyViewController.m @@ -119,8 +119,7 @@ { if (![AWordUser sharedInstance].isLogin) { - LoginViewController* loginViewController = [[LoginViewController alloc] init]; - [self.navigationController presentViewController:[[UINavigationController alloc] initWithRootViewController:loginViewController] animated:YES completion:nil]; + [LoginViewController presentLoginViewControllerInView:self success:nil]; } } diff --git a/Ash_AWord/ViewControllers/Main/NoteViewController.m b/Ash_AWord/ViewControllers/Main/NoteViewController.m index 8f76be0..3798f0e 100644 --- a/Ash_AWord/ViewControllers/Main/NoteViewController.m +++ b/Ash_AWord/ViewControllers/Main/NoteViewController.m @@ -38,8 +38,8 @@ self.navigationItem.title = @"文字"; self.navigationItem.leftBarButtonItem = [Ash_UIUtil leftBarButtonItemWithTarget:self action:@selector(publish) image:[UIImage imageNamed:@"navigationButtonPublish"] highlightedImage:[UIImage imageNamed:@"navigationButtonPublishClick"]]; - - [self headerRereshing]; + self.navigationItem.rightBarButtonItem = [Ash_UIUtil leftBarButtonItemWithTarget:self action:@selector(headerBeginRefreshing) image:[UIImage imageNamed:@"navigationButtonRefresh"] highlightedImage:[UIImage imageNamed:@"navigationButtonRefreshClick"]]; + [self headerBeginRefreshing]; } #pragma mark MJRefreshDelegate @@ -137,6 +137,10 @@ if (buttonIndex == 1) { picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; } + if(buttonIndex == 2) + { + return; + } [self presentViewController:picker animated:YES completion:nil]; } diff --git a/Podfile b/Podfile index 71c8dc7..d192b72 100644 --- a/Podfile +++ b/Podfile @@ -10,4 +10,5 @@ pod 'Mantle' pod 'Godzippa' pod 'EGOCache' pod 'SecureUDID' -pod 'MJRefresh' \ No newline at end of file +pod 'MJRefresh' +pod 'MWPhotoBrowser' \ No newline at end of file