From 9444a289d660b6303a222cfb35498f688ba8328e Mon Sep 17 00:00:00 2001 From: xuemh Date: Sun, 22 Jul 2018 11:47:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=83=AD=E7=82=B9=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E8=AF=B4=E6=98=8E=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 10 +++ .../ConnectHotpotViewController.h | 4 +- .../ConnectHotpotViewController.m | 5 ++ .../ConnectHotpotViewController.xib | 3 + .../ConnectHotspotTipViewController.h | 13 ++++ .../ConnectHotspotTipViewController.m | 38 ++++++++++ .../ConnectHotspotTipViewController.xib | 72 +++++++++++++++++++ 7 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.h create mode 100644 Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m create mode 100644 Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.xib diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 57c9c14..092bc6b 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2459,6 +2459,8 @@ E51D7D55208CE08D001FF053 /* CustomModeSetCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D7D53208CE08D001FF053 /* CustomModeSetCell.m */; }; E51D7D58208CE121001FF053 /* CustomModeSetCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E51D7D57208CE120001FF053 /* CustomModeSetCell.xib */; }; E51D7D5B208CF4E7001FF053 /* RuiMeiInputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E51D7D5A208CF4E7001FF053 /* RuiMeiInputViewController.m */; }; + E52B400521042ED2003BBA3E /* ConnectHotspotTipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */; }; + E52B400621042ED2003BBA3E /* ConnectHotspotTipViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E52B400421042ED2003BBA3E /* ConnectHotspotTipViewController.xib */; }; E547870B20728F390060C2C2 /* back_btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E547870A20728F380060C2C2 /* back_btn@2x.png */; }; E547870F2073192E0060C2C2 /* introlImage_iphonex_1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870C2073192D0060C2C2 /* introlImage_iphonex_1.jpg */; }; E54787102073192E0060C2C2 /* introlImage_iphonex_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870D2073192D0060C2C2 /* introlImage_iphonex_2.jpg */; }; @@ -6240,6 +6242,9 @@ E51D7D57208CE120001FF053 /* CustomModeSetCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomModeSetCell.xib; sourceTree = ""; }; E51D7D59208CF4E7001FF053 /* RuiMeiInputViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuiMeiInputViewController.h; sourceTree = ""; }; E51D7D5A208CF4E7001FF053 /* RuiMeiInputViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RuiMeiInputViewController.m; sourceTree = ""; }; + E52B400221042ED2003BBA3E /* ConnectHotspotTipViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ConnectHotspotTipViewController.h; sourceTree = ""; }; + E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConnectHotspotTipViewController.m; sourceTree = ""; }; + E52B400421042ED2003BBA3E /* ConnectHotspotTipViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConnectHotspotTipViewController.xib; sourceTree = ""; }; E547870A20728F380060C2C2 /* back_btn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back_btn@2x.png"; sourceTree = ""; }; E547870C2073192D0060C2C2 /* introlImage_iphonex_1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_1.jpg; sourceTree = ""; }; E547870D2073192D0060C2C2 /* introlImage_iphonex_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_2.jpg; sourceTree = ""; }; @@ -9600,6 +9605,9 @@ E56A745F20FCDBFC000129C9 /* ConnectHotpotViewController.h */, E56A746020FCDBFC000129C9 /* ConnectHotpotViewController.m */, E56A746120FCDBFC000129C9 /* ConnectHotpotViewController.xib */, + E52B400221042ED2003BBA3E /* ConnectHotspotTipViewController.h */, + E52B400321042ED2003BBA3E /* ConnectHotspotTipViewController.m */, + E52B400421042ED2003BBA3E /* ConnectHotspotTipViewController.xib */, ); path = leftcontrollers; sourceTree = ""; @@ -14078,6 +14086,7 @@ 8829560B1DBDA3A100E9DDD7 /* neves0014.png in Resources */, 887492431E7A90D000CDA284 /* fishdoctor_iocn_optimization@3x.png in Resources */, 889133221ECE99B900F52EBC /* recording_backdrop.png in Resources */, + E52B400621042ED2003BBA3E /* ConnectHotspotTipViewController.xib in Resources */, 88F23F2A1EA9D18700E4D298 /* live_botton_uncheck_like.png in Resources */, 88696FC61E9C81F2005D4AFB /* ShopMemberDetailViewInfoCell.xib in Resources */, 8829573B1DBDA3A300E9DDD7 /* swimmingfish0042.png in Resources */, @@ -16035,6 +16044,7 @@ 881671F01EA5DE2B00BEBF23 /* UMComProgressView.m in Sources */, 886028751E10BB1100F3DB5D /* UICollectionView+CTAssetsPickerController.m in Sources */, 88602F4D1E12002600F3DB5D /* NTESGroupedUsrInfo.m in Sources */, + E52B400521042ED2003BBA3E /* ConnectHotspotTipViewController.m in Sources */, 88F5EFAB1D48D08100CC7CAF /* AFHTTPSessionManager.m in Sources */, 886EAC581E2DC5BE00A4DF27 /* IFishShopsViewCell.m in Sources */, 88F5EFD21D48D08100CC7CAF /* MMProgressHUD+Class.m in Sources */, diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.h b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.h index f168e12..10b4367 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.h +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.h @@ -6,8 +6,8 @@ // Copyright © 2018年 lianlian. All rights reserved. // -#import +#import "BaseVIewContorller.h" -@interface ConnectHotpotViewController : UIViewController +@interface ConnectHotpotViewController : BaseVIewContorller @end diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m index ea15206..fd03a37 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m @@ -7,6 +7,7 @@ // #import "ConnectHotpotViewController.h" +#import "ConnectHotspotTipViewController.h" @interface ConnectHotpotViewController () @property (weak, nonatomic) IBOutlet UIScrollView *scrollView; @@ -69,6 +70,10 @@ }]; } +- (IBAction)clickHereBtnClicked:(id)sender { + ConnectHotspotTipViewController *vc = [[ConnectHotspotTipViewController alloc] initWithNibName:@"ConnectHotspotTipViewController" bundle:nil]; + [self.navigationController pushViewController:vc animated:YES]; +} #pragma mark - UITextFieldDelegate - (BOOL)textFieldShouldReturn:(UITextField *)textField { diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib index 221cb98..6b66456 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.xib @@ -72,6 +72,9 @@ + + + diff --git a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.h b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.h new file mode 100644 index 0000000..639412d --- /dev/null +++ b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.h @@ -0,0 +1,13 @@ +// +// ConnectHotspotTipViewController.h +// Ifish +// +// Created by Minghao Xue on 2018/7/22. +// Copyright © 2018年 lianlian. All rights reserved. +// + +#import "BaseVIewContorller.h" + +@interface ConnectHotspotTipViewController : BaseVIewContorller + +@end diff --git a/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m new file mode 100644 index 0000000..99998ae --- /dev/null +++ b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.m @@ -0,0 +1,38 @@ +// +// ConnectHotspotTipViewController.m +// Ifish +// +// Created by Minghao Xue on 2018/7/22. +// Copyright © 2018年 lianlian. All rights reserved. +// + +#import "ConnectHotspotTipViewController.h" + +@interface ConnectHotspotTipViewController () + +@end + +@implementation ConnectHotspotTipViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + self.title = @"ifish7热点连接"; + +} + +- (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/ConnectHotspotTipViewController.xib b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.xib new file mode 100644 index 0000000..aec9dc5 --- /dev/null +++ b/Ifish/controllers/leftcontrollers/ConnectHotspotTipViewController.xib @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +