diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index da65100..57c9c14 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2464,6 +2464,8 @@ E54787102073192E0060C2C2 /* introlImage_iphonex_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870D2073192D0060C2C2 /* introlImage_iphonex_2.jpg */; }; E54787112073192E0060C2C2 /* introlImage_iphonex_3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870E2073192E0060C2C2 /* introlImage_iphonex_3.jpg */; }; E548F39720A557B7004CF1BC /* JiaReBang.png in Resources */ = {isa = PBXBuildFile; fileRef = E548F39620A557B5004CF1BC /* JiaReBang.png */; }; + E56A746220FCDBFC000129C9 /* ConnectHotpotViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E56A746020FCDBFC000129C9 /* ConnectHotpotViewController.m */; }; + E56A746320FCDBFC000129C9 /* ConnectHotpotViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E56A746120FCDBFC000129C9 /* ConnectHotpotViewController.xib */; }; E58C9980208189780004C42B /* back_btn_1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E58C997F208189780004C42B /* back_btn_1@2x.png */; }; E58C9984208195640004C42B /* RuiMeiViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C9983208195640004C42B /* RuiMeiViewController.m */; }; E58C99872081A3BA0004C42B /* RuiMeiProtocolModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C99862081A3BA0004C42B /* RuiMeiProtocolModel.m */; }; @@ -6243,6 +6245,9 @@ E547870D2073192D0060C2C2 /* introlImage_iphonex_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_2.jpg; sourceTree = ""; }; E547870E2073192E0060C2C2 /* introlImage_iphonex_3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_3.jpg; sourceTree = ""; }; E548F39620A557B5004CF1BC /* JiaReBang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JiaReBang.png; sourceTree = ""; }; + E56A745F20FCDBFC000129C9 /* ConnectHotpotViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ConnectHotpotViewController.h; sourceTree = ""; }; + E56A746020FCDBFC000129C9 /* ConnectHotpotViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConnectHotpotViewController.m; sourceTree = ""; }; + E56A746120FCDBFC000129C9 /* ConnectHotpotViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConnectHotpotViewController.xib; sourceTree = ""; }; E58C997F208189780004C42B /* back_btn_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back_btn_1@2x.png"; sourceTree = ""; }; E58C9982208195640004C42B /* RuiMeiViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuiMeiViewController.h; sourceTree = ""; }; E58C9983208195640004C42B /* RuiMeiViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RuiMeiViewController.m; sourceTree = ""; }; @@ -9592,6 +9597,9 @@ 883E781E1D48A5E50030E075 /* SelectDeviceViewController.m */, 883E781F1D48A5E50030E075 /* SetViewController.h */, 883E78201D48A5E50030E075 /* SetViewController.m */, + E56A745F20FCDBFC000129C9 /* ConnectHotpotViewController.h */, + E56A746020FCDBFC000129C9 /* ConnectHotpotViewController.m */, + E56A746120FCDBFC000129C9 /* ConnectHotpotViewController.xib */, ); path = leftcontrollers; sourceTree = ""; @@ -15017,6 +15025,7 @@ 88613F751E5C1E86008D2C69 /* P2PShareViewFeedMessageCell.xib in Resources */, 8829574E1DBDA3A300E9DDD7 /* swimmingfish0061.png in Resources */, 882957531DBDA3A300E9DDD7 /* swimmingfish0066.png in Resources */, + E56A746320FCDBFC000129C9 /* ConnectHotpotViewController.xib in Resources */, 883283991EAF4BF800A47157 /* explore_iocn_messages@3x.png in Resources */, 88602F2B1E12002500F3DB5D /* NTESTeamListViewController.xib in Resources */, 886FB1901E5A9A0500256332 /* explore_iocn_doctor@2x.png in Resources */, @@ -15416,6 +15425,7 @@ 88883B221EF0FFB600CAC0AE /* SongNuo128Name.m in Sources */, 8815D1321DFAADC300BEA2DA /* IfishCameraRecordThirdCell.m in Sources */, 887001CF1D794D7B00668C8C /* KanHuViewLastCell.m in Sources */, + E56A746220FCDBFC000129C9 /* ConnectHotpotViewController.m in Sources */, 886D15831E605EEF0085F7D6 /* CustomeLabel.m in Sources */, E51D7D55208CE08D001FF053 /* CustomModeSetCell.m in Sources */, 8860286E1E10BB1100F3DB5D /* NSBundle+CTAssetsPickerController.m in Sources */, diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.h b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.h new file mode 100644 index 0000000..f168e12 --- /dev/null +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.h @@ -0,0 +1,13 @@ +// +// ConnectHotpotViewController.h +// Ifish +// +// Created by Minghao Xue on 2018/7/16. +// Copyright © 2018年 lianlian. All rights reserved. +// + +#import + +@interface ConnectHotpotViewController : UIViewController + +@end diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m new file mode 100644 index 0000000..03eb45b --- /dev/null +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m @@ -0,0 +1,37 @@ +// +// ConnectHotpotViewController.m +// Ifish +// +// Created by Minghao Xue on 2018/7/16. +// Copyright © 2018年 lianlian. All rights reserved. +// + +#import "ConnectHotpotViewController.h" + +@interface ConnectHotpotViewController () + +@end + +@implementation ConnectHotpotViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + self.title = @"热点连接"; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib new file mode 100644 index 0000000..840ce83 --- /dev/null +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.h b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.h index 455e5be..e4b23e7 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.h +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.h @@ -16,6 +16,7 @@ - (IBAction)makeSureButton:(id)sender; +- (IBAction)lickHereBtnClicked:(id)sender; @property(nonatomic,strong)NSString*ssid; @property(nonatomic,strong)NSString*bssid; @@ -25,6 +26,8 @@ @property (weak, nonatomic) IBOutlet UIButton *shuoMingShuBtn; @property (weak, nonatomic) IBOutlet UIImageView *nodImg; +@property (weak, nonatomic) IBOutlet UILabel *connectTipLbl; +@property (weak, nonatomic) IBOutlet UIButton *connectBtn; @end diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m index 75531d3..f802e51 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.m @@ -27,6 +27,9 @@ #import "IfishConnectingView.h" #import "PushMasssageWebViewController.h" #import "IfishUserObsever.h" + +#import "ConnectHotpotViewController.h" + @interface EspTouchDelegateImpl : NSObject @end @@ -146,6 +149,8 @@ extern BOOL isfromCameraView; } self.nodImg.frame = CGRectMake(12, yOffset, 10, 10); self.wifiNamelabel.frame = CGRectMake(23, yOffset - 18 + 5, 336, 36); + [self.view bringSubviewToFront:self.connectTipLbl]; + [self.view bringSubviewToFront:self.connectBtn]; } -(void)viewWillAppear:(BOOL)animated{ @@ -198,6 +203,8 @@ extern BOOL isfromCameraView; [self.view addSubview:connectingView]; self.wifiNamelabel.hidden = NO; self.wifiTextFiled.hidden = NO; + self.connectTipLbl.hidden = NO; + self.connectBtn.hidden = NO; self.shareButton.hidden = NO; self.nodImg.hidden = NO; @@ -213,6 +220,8 @@ extern BOOL isfromCameraView; [self.connectingView.textChangeView stopAnimation]; self.wifiNamelabel.hidden = NO; self.wifiTextFiled.hidden = NO; + self.connectTipLbl.hidden = NO; + self.connectBtn.hidden = NO; self.shareButton.hidden = NO; self.nodImg.hidden = NO; @@ -238,6 +247,8 @@ extern BOOL isfromCameraView; self.wifiNamelabel.hidden = YES; self.wifiTextFiled.hidden = YES; + self.connectTipLbl.hidden = YES; + self.connectBtn.hidden = YES; self.shareButton.hidden = YES; self.nodImg.hidden = YES; @@ -406,6 +417,11 @@ extern BOOL isfromCameraView; } +- (IBAction)lickHereBtnClicked:(id)sender { + ConnectHotpotViewController *vc = [[ConnectHotpotViewController alloc] initWithNibName:@"ConnectHotpotViewController" bundle:nil]; + [self.navigationController pushViewController:vc animated:YES]; +} + - (IBAction)commandbackBtn:(id)sender { SaySomethingViewController*say=[[SaySomethingViewController alloc]init]; [self.navigationController pushViewController:say animated:YES]; diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib index 56198d6..8706e73 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib @@ -1,16 +1,18 @@ - - + + - + + + @@ -33,6 +35,22 @@ + + @@ -79,9 +97,4 @@ - - - - -