[Bugfix]修正欢迎界面关闭员工登录框时也进入点菜界面的问题

joeshang · joeshang · commit 6bfab6758882 · 2014-10-01T21:15:59.000+08:00
diff --git a/DianXiaoEr-Menu-iOS/ViewControllers/DXEOpenViewController.m b/DianXiaoEr-Menu-iOS/ViewControllers/DXEOpenViewController.m
@@ -53,6 +53,8 @@ - (void)viewWillDisappear:(BOOL)animated
 - (void)enterMainPage
 {
     [UIView animateWithDuration:0.3
+                          delay:0.3
+                        options:0
                      animations:^{
                          self.view.alpha = 0.0;
                      }
@@ -85,9 +87,7 @@ - (IBAction)onEnterButtonClicked:(id)sender
                coverOption:CRModalOptionCoverDark
        tapOutsideToDismiss:NO
                   animated:YES
-                completion:^{
-                    [self enterMainPage];
-                }];
+                completion:nil];
 }
 
 - (IBAction)onChoosingTableButtonClicked:(id)sender
@@ -100,6 +100,7 @@ - (IBAction)onChoosingTableButtonClicked:(id)sender
 - (void)onLoginButtonClickedInLoginView:(DXELoginView *)loginView
 {
     [CRModal dismiss];
+    [self enterMainPage];
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ - (void)viewWillDisappear:(BOOL)animated`
`53`	`53`	`- (void)enterMainPage`
`54`	`54`	`{`
`55`	`55`	`[UIView animateWithDuration:0.3`
	`56`	`+ delay:0.3`
	`57`	`+ options:0`
`56`	`58`	`animations:^{`
`57`	`59`	`self.view.alpha = 0.0;`
`58`	`60`	`}`
`@@ -85,9 +87,7 @@ - (IBAction)onEnterButtonClicked:(id)sender`
`85`	`87`	`coverOption:CRModalOptionCoverDark`
`86`	`88`	`tapOutsideToDismiss:NO`
`87`	`89`	`animated:YES`
`88`		`- completion:^{`
`89`		`- [self enterMainPage];`
`90`		`- }];`
	`90`	`+ completion:nil];`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`- (IBAction)onChoosingTableButtonClicked:(id)sender`
`@@ -100,6 +100,7 @@ - (IBAction)onChoosingTableButtonClicked:(id)sender`
`100`	`100`	`- (void)onLoginButtonClickedInLoginView:(DXELoginView *)loginView`
`101`	`101`	`{`
`102`	`102`	`[CRModal dismiss];`
	`103`	`+ [self enterMainPage];`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`@end`