diff --git a/.DS_Store b/.DS_Store index a6f9199..39ef797 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m index a47df46..3e756d8 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m @@ -52,8 +52,8 @@ Copy NSString *wifiName;//当前wifi名称 - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"热点连接"; - + [self addTitleViewWithTitle:@"热点连接"]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keybordframeChanged:) name:UIKeyboardDidChangeFrameNotification object:nil]; for (UIImageView *view in self.dashView) { view.backgroundColor = [UIColor clearColor]; @@ -64,17 +64,17 @@ Copy NSString *wifiName;//当前wifi名称 fiveTapGesture.numberOfTapsRequired = 5; [self.containerView addGestureRecognizer:fiveTapGesture]; - UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom]; - back.frame = CGRectMake(0,0,48,44); - [back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; - // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; - back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - [back addTarget: self action: @selector(clickBack) forControlEvents: UIControlEventTouchUpInside]; - [back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; - back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; - UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back]; - - self.navigationItem.leftBarButtonItem=backItem; +// UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom]; +// back.frame = CGRectMake(0,0,48,44); +// [back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; +// // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; +// back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; +// [back addTarget: self action: @selector(clickBack) forControlEvents: UIControlEventTouchUpInside]; +// [back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; +// back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; +// UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back]; +// +// self.navigationItem.leftBarButtonItem=backItem; NSDictionary *wifiDic = [self fetchSSIDInfo]; NSString *wifiName = [wifiDic objectForKey:@"SSID"]; diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib index 9dae9b1..9388012 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib @@ -30,7 +30,7 @@ - + @@ -156,7 +156,7 @@ - + diff --git a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m index ce19e6e..a2bc39c 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m +++ b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m @@ -16,7 +16,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.title = @"ifish7热点连接"; + [self addTitleViewWithTitle:@"连接说明"]; }