diff --git a/DDMenuController/.DS_Store b/DDMenuController/.DS_Store index 5a98c6e..19823cd 100644 Binary files a/DDMenuController/.DS_Store and b/DDMenuController/.DS_Store differ diff --git a/DDMenuController/DDMenuController.xcodeproj/project.xcworkspace/xcuserdata/xinruan.xcuserdatad/UserInterfaceState.xcuserstate b/DDMenuController/DDMenuController.xcodeproj/project.xcworkspace/xcuserdata/xinruan.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..1a9c48a Binary files /dev/null and b/DDMenuController/DDMenuController.xcodeproj/project.xcworkspace/xcuserdata/xinruan.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..fe2b454 --- /dev/null +++ b/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,5 @@ + + + diff --git a/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcschemes/DDMenuController.xcscheme b/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcschemes/DDMenuController.xcscheme new file mode 100644 index 0000000..2d8d642 --- /dev/null +++ b/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcschemes/DDMenuController.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcschemes/xcschememanagement.plist b/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..5275671 --- /dev/null +++ b/DDMenuController/DDMenuController.xcodeproj/xcuserdata/xinruan.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + DDMenuController.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 033A4620148691F6002014C7 + + primary + + + + + diff --git a/DDMenuController/DDMenuController/AppDelegate.m b/DDMenuController/DDMenuController/AppDelegate.m index 166affe..7122a91 100644 --- a/DDMenuController/DDMenuController/AppDelegate.m +++ b/DDMenuController/DDMenuController/AppDelegate.m @@ -24,6 +24,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( FeedController *mainController = [[FeedController alloc] init]; + DDMenuController *rootController = [[DDMenuController alloc] initWithRootViewController:mainController]; _menuController = rootController; diff --git a/DDMenuController/DDMenuController/Classes/Controllers/LeftController/LeftController.m b/DDMenuController/DDMenuController/Classes/Controllers/LeftController/LeftController.m index 4129c1c..895d1fa 100644 --- a/DDMenuController/DDMenuController/Classes/Controllers/LeftController/LeftController.m +++ b/DDMenuController/DDMenuController/Classes/Controllers/LeftController/LeftController.m @@ -78,12 +78,15 @@ - (NSString*)tableView:(UITableView*)tableView titleForHeaderInSection:(NSIntege - (void)tableView:(UITableView*)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // lets just push another feed view + // lets just push another feed view + UINavigationController *menuController = (UINavigationController*)((AppDelegate*)[[UIApplication sharedApplication] delegate]).menuController; + FeedController *controller = [[FeedController alloc] init]; [menuController pushViewController:controller animated:YES]; - [tableView deselectRowAtIndexPath:indexPath animated:YES]; + + //[tableView deselectRowAtIndexPath:indexPath animated:YES]; } diff --git a/DDMenuController/DDMenuController/DDMenuController.m b/DDMenuController/DDMenuController/DDMenuController.m index f778afd..81125de 100644 --- a/DDMenuController/DDMenuController/DDMenuController.m +++ b/DDMenuController/DDMenuController/DDMenuController.m @@ -411,6 +411,7 @@ - (void)showRootController:(BOOL)animated { } - (void)showLeftController:(BOOL)animated { + if (!_menuFlags.canShowLeft) return; if (_menuFlags.respondsToWillShowViewController) { @@ -534,8 +535,19 @@ - (void)setLeftController:(UIViewController *)leftController { - (void)showLeft:(id)sender { - [self showLeftController:YES]; + NSLog(@" dian ji an niu canShowLeft - %d ", _menuFlags.canShowLeft ); + NSLog(@" dian ji an niu showingLeftView- %d ", _menuFlags.showingLeftView );// + NSLog(@" dian ji an niu respondsToWillShowViewController- %d ", _menuFlags.respondsToWillShowViewController ); + + NSLog(@" 打开left ==1 没打开left == 0 showingLeftView- %d ", _menuFlags.showingLeftView );// + if (_menuFlags.showingLeftView == 1) { + [self showRootController:YES]; + } + else + { + [self showLeftController:YES]; + } } - (void)showRight:(id)sender {