diff --git a/.DS_Store b/.DS_Store index 2075381..cda5206 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 23e952e..6fab455 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -364,6 +364,10 @@ 3DD7AB9A21E474940064856A /* AsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD7AB9221E474930064856A /* AsyncSocket.m */; }; 3DD7AB9B21E474940064856A /* GCDAsyncUdpSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD7AB9521E474930064856A /* GCDAsyncUdpSocket.m */; }; 3DD7AB9C21E474940064856A /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD7AB9621E474930064856A /* GCDAsyncSocket.m */; }; + 402591952238D91400CE4900 /* UINavigationController+Config.h in Headers */ = {isa = PBXBuildFile; fileRef = 402591932238D91400CE4900 /* UINavigationController+Config.h */; }; + 402591962238D91400CE4900 /* UINavigationController+Config.m in Sources */ = {isa = PBXBuildFile; fileRef = 402591942238D91400CE4900 /* UINavigationController+Config.m */; }; + 404D7CEA2238CF77005655F5 /* UIViewController+Swizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 404D7CE82238CF77005655F5 /* UIViewController+Swizzling.m */; }; + 404D7CEB2238CF77005655F5 /* UIViewController+Swizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = 404D7CE92238CF77005655F5 /* UIViewController+Swizzling.h */; }; 880707451DDD3EF50076F65A /* P2PShareView1Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 880707431DDD3EF50076F65A /* P2PShareView1Cell.m */; }; 880707461DDD3EF50076F65A /* P2PShareView1Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 880707441DDD3EF50076F65A /* P2PShareView1Cell.xib */; }; 8807074A1DDD40B40076F65A /* P2PShareViewsec2Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 880707481DDD40B40076F65A /* P2PShareViewsec2Cell.m */; }; @@ -3174,6 +3178,10 @@ 3DD7AB9621E474930064856A /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = ""; }; 3DD7AB9721E474930064856A /* GCDAsyncUdpSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncUdpSocket.h; sourceTree = ""; }; 3DD7AB9821E474930064856A /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = ""; }; + 402591932238D91400CE4900 /* UINavigationController+Config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+Config.h"; sourceTree = ""; }; + 402591942238D91400CE4900 /* UINavigationController+Config.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+Config.m"; sourceTree = ""; }; + 404D7CE82238CF77005655F5 /* UIViewController+Swizzling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+Swizzling.m"; sourceTree = ""; }; + 404D7CE92238CF77005655F5 /* UIViewController+Swizzling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Swizzling.h"; sourceTree = ""; }; 880707421DDD3EF50076F65A /* P2PShareView1Cell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = P2PShareView1Cell.h; sourceTree = ""; }; 880707431DDD3EF50076F65A /* P2PShareView1Cell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = P2PShareView1Cell.m; sourceTree = ""; }; 880707441DDD3EF50076F65A /* P2PShareView1Cell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = P2PShareView1Cell.xib; sourceTree = ""; }; @@ -14401,6 +14409,10 @@ isa = PBXGroup; children = ( E5C644C0206BBD7100C558D5 /* CommonMacros.h */, + 404D7CE92238CF77005655F5 /* UIViewController+Swizzling.h */, + 404D7CE82238CF77005655F5 /* UIViewController+Swizzling.m */, + 402591932238D91400CE4900 /* UINavigationController+Config.h */, + 402591942238D91400CE4900 /* UINavigationController+Config.m */, ); path = Common; sourceTree = ""; @@ -14486,6 +14498,7 @@ 3D1C5040221A9EDE0096AE43 /* version.h in Headers */, 3D1C50AF221A9EDF0096AE43 /* YFonc.h in Headers */, 3D1C512B221A9EE10096AE43 /* IfishCameraRecordfirstCell.h in Headers */, + 402591952238D91400CE4900 /* UINavigationController+Config.h in Headers */, 3D1C5124221A9EE00096AE43 /* IfishCameraRecordThirdCell.h in Headers */, 3D1C5045221A9EDE0096AE43 /* sha.h in Headers */, 3D1C5057221A9EDF0096AE43 /* opt.h in Headers */, @@ -14575,6 +14588,7 @@ 3D1C50AD221A9EDF0096AE43 /* FXBlurView.h in Headers */, 3D1C5043221A9EDE0096AE43 /* base64.h in Headers */, 3D1C504B221A9EDF0096AE43 /* crc.h in Headers */, + 404D7CEB2238CF77005655F5 /* UIViewController+Swizzling.h in Headers */, 3D1C5065221A9EDF0096AE43 /* avassert.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -14650,6 +14664,9 @@ CreatedOnToolsVersion = 7.0; ProvisioningStyle = Manual; SystemCapabilities = { + com.apple.AccessWiFi = { + enabled = 1; + }; com.apple.BackgroundModes = { enabled = 1; }; @@ -16649,6 +16666,7 @@ 881672051EA5DE2B00BEBF23 /* UMComSegmentedControl.m in Sources */, 88F5EFC91D48D08100CC7CAF /* JHRefreshFooterView.m in Sources */, 88645B161E83B7EC00234DB4 /* IfishInfoDetailContentViewCell.m in Sources */, + 404D7CEA2238CF77005655F5 /* UIViewController+Swizzling.m in Sources */, 881672001EA5DE2B00BEBF23 /* UMImagePickerController.m in Sources */, 88C598951EA0605600BDC812 /* KebordExternAddTextInputView.m in Sources */, 883E788F1D48A5E50030E075 /* InfoXingBieCell.m in Sources */, @@ -17097,6 +17115,7 @@ 886FB1B01E5AA02400256332 /* FIshDocsection1TableView2Cell.m in Sources */, 3D1C5103221A9EE00096AE43 /* YooseeNextConnectViewController.mm in Sources */, 88602A3C1E10BC3500F3DB5D /* NIMCellLayoutConfig.m in Sources */, + 402591962238D91400CE4900 /* UINavigationController+Config.m in Sources */, 882C85A61EB03759001CC414 /* GoldConvertDetailViewCell.m in Sources */, 881477EA1E711B4D00BFB79C /* IfishTaskViewCell.m in Sources */, E5317A1621188F8A0014AFDD /* RestartDeviceModel.m in Sources */, @@ -17410,7 +17429,7 @@ CLANG_CXX_LIBRARY = "compiler-default"; CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: guowu ouyang (Q5YLXZSN4A)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; @@ -17505,9 +17524,9 @@ "-ObjC", "-Istdc++", ); - PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; + PRODUCT_BUNDLE_IDENTIFIER = com.pingan.shanghu; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "fde698f5-2eb6-468d-9f69-0dee117d218e"; + PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; TARGETED_DEVICE_FAMILY = 1; USER_HEADER_SEARCH_PATHS = ""; @@ -17523,7 +17542,7 @@ CLANG_CXX_LIBRARY = "compiler-default"; CODE_SIGN_ENTITLEMENTS = Ifish/Ifish.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Yu Ying Technology Co., Ltd. (WFX8GD5HFX)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; @@ -17618,7 +17637,7 @@ "-ObjC", "-Istdc++", ); - PRODUCT_BUNDLE_IDENTIFIER = com.shyuying.Ifish8; + PRODUCT_BUNDLE_IDENTIFIER = com.pingan.shanghu; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "eeefa590-8286-4301-b6e5-f1eeee0de64f"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Ifish.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Ifish.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 0c67376..949b678 100644 --- a/Ifish.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/Ifish.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -1,5 +1,8 @@ - + + BuildSystemType + Original + diff --git a/Ifish/Common/CommonMacros.h b/Ifish/Common/CommonMacros.h index 7ca0e47..f864e4d 100644 --- a/Ifish/Common/CommonMacros.h +++ b/Ifish/Common/CommonMacros.h @@ -10,5 +10,12 @@ #define CommonMacros_h #define is_iPhone_X ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO) +#define STATUS_BAR_HEIGHT [[UIApplication sharedApplication] statusBarFrame].size.height +#define TOP_HEIGHT (STATUS_BAR_HEIGHT + 44) +// 屏幕宽度 +#define kScreenWidth ((CGRectGetWidth([UIScreen mainScreen].bounds) > CGRectGetHeight([UIScreen mainScreen].bounds))?(CGRectGetHeight([UIScreen mainScreen].bounds)):(CGRectGetWidth([UIScreen mainScreen].bounds))) +// 屏幕高度 +#define kScreenHeight ((CGRectGetWidth([UIScreen mainScreen].bounds) > CGRectGetHeight([UIScreen mainScreen].bounds))?(CGRectGetWidth([UIScreen mainScreen].bounds)):(CGRectGetHeight([UIScreen mainScreen].bounds))) + #endif /* CommonMacros_h */ diff --git a/Ifish/Common/UINavigationController+Config.h b/Ifish/Common/UINavigationController+Config.h new file mode 100644 index 0000000..cea792c --- /dev/null +++ b/Ifish/Common/UINavigationController+Config.h @@ -0,0 +1,17 @@ +// +// UINavigationController+Config.h +// Ifish +// +// Created by JiangXuefei on 2019/3/13. +// Copyright © 2019年 lianlian. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface UINavigationController (Config) + +@end + +NS_ASSUME_NONNULL_END diff --git a/Ifish/Common/UINavigationController+Config.m b/Ifish/Common/UINavigationController+Config.m new file mode 100644 index 0000000..2e68ae9 --- /dev/null +++ b/Ifish/Common/UINavigationController+Config.m @@ -0,0 +1,17 @@ +// +// UINavigationController+Config.m +// Ifish +// +// Created by JiangXuefei on 2019/3/13. +// Copyright © 2019年 lianlian. All rights reserved. +// + +#import "UINavigationController+Config.h" + +@implementation UINavigationController (Config) + ++ (void)initialize { + [[UINavigationBar appearance] setTranslucent:NO]; +} + +@end diff --git a/Ifish/Common/UIViewController+Swizzling.h b/Ifish/Common/UIViewController+Swizzling.h new file mode 100644 index 0000000..ba3fc17 --- /dev/null +++ b/Ifish/Common/UIViewController+Swizzling.h @@ -0,0 +1,17 @@ +// +// UIViewController+Swizzling.h +// IfishTests +// +// Created by JiangXuefei on 2019/3/13. +// Copyright © 2019年 lianlian. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface UIViewController (Swizzling) + +@end + +NS_ASSUME_NONNULL_END diff --git a/Ifish/Common/UIViewController+Swizzling.m b/Ifish/Common/UIViewController+Swizzling.m new file mode 100644 index 0000000..7fc8bc4 --- /dev/null +++ b/Ifish/Common/UIViewController+Swizzling.m @@ -0,0 +1,29 @@ +// +// UIViewController+Swizzling.m +// IfishTests +// +// Created by JiangXuefei on 2019/3/13. +// Copyright © 2019年 lianlian. All rights reserved. +// + +#import "UIViewController+Swizzling.h" +#import + +@implementation UIViewController (Swizzling) + ++ (void)load +{ +#ifdef DEBUG + Method viewWillAppear = class_getInstanceMethod(self, @selector(viewWillAppear:)); + Method logViewWillAppear = class_getInstanceMethod(self, @selector(logViewWillAppear:)); + method_exchangeImplementations(viewWillAppear, logViewWillAppear); +#endif +} + +- (void)logViewWillAppear:(BOOL)animated +{ + NSLog(@"========>%@ will appear",NSStringFromClass([self class])); + [self logViewWillAppear:animated]; +} + +@end diff --git a/Ifish/Ifish.entitlements b/Ifish/Ifish.entitlements index 903def2..75e36a1 100644 --- a/Ifish/Ifish.entitlements +++ b/Ifish/Ifish.entitlements @@ -4,5 +4,7 @@ aps-environment development + com.apple.developer.networking.wifi-info + diff --git a/Ifish/UMCommunity/UMCommunitySDK/UMCommunityUI/simple/Setting/UMComSimpleProfileSettingController.m b/Ifish/UMCommunity/UMCommunitySDK/UMCommunityUI/simple/Setting/UMComSimpleProfileSettingController.m index 7c32867..0a27bcf 100644 --- a/Ifish/UMCommunity/UMCommunitySDK/UMCommunityUI/simple/Setting/UMComSimpleProfileSettingController.m +++ b/Ifish/UMCommunity/UMCommunitySDK/UMCommunityUI/simple/Setting/UMComSimpleProfileSettingController.m @@ -77,6 +77,7 @@ [closeButon addTarget:self action:@selector(onClickClose) forControlEvents:UIControlEventTouchUpInside]; closeButon.frame = CGRectMake(0.f, 0.f, 22.f, 22.f); UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] initWithCustomView:closeButon]; + [closeButon setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; [self.navigationItem setLeftBarButtonItem:closeItem]; } diff --git a/Ifish/Utinitys/IfishHttpRequest/IFISHHttpTool.m b/Ifish/Utinitys/IfishHttpRequest/IFISHHttpTool.m index 376c047..944810e 100644 --- a/Ifish/Utinitys/IfishHttpRequest/IFISHHttpTool.m +++ b/Ifish/Utinitys/IfishHttpRequest/IFISHHttpTool.m @@ -213,7 +213,7 @@ } dispatch_async(dispatch_get_main_queue(), ^{ //设置界面的按钮显示 根据自己需求设置 - NSLog(@"____%@",strTime); +// NSLog(@"____%@",strTime); [timeBtn setTitle:[NSString stringWithFormat:@"%@秒",strTime] forState:UIControlStateNormal]; //timeBtn.backgroundColor=[UIColor lightGrayColor]; diff --git a/Ifish/controllers/BaseVIewContorller/BaseVIewContorller.m b/Ifish/controllers/BaseVIewContorller/BaseVIewContorller.m index 968f977..9a1575e 100644 --- a/Ifish/controllers/BaseVIewContorller/BaseVIewContorller.m +++ b/Ifish/controllers/BaseVIewContorller/BaseVIewContorller.m @@ -20,18 +20,14 @@ // Do any additional setup after loading the view. [self initNav]; self.view.backgroundColor = TABLE_BACKGROUD_COLOR; - - } -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; [self.navigationController.navigationBar resetBackgroundImage]; - } -(void)viewWillDisappear:(BOOL)animated{ - [super viewWillDisappear:animated]; } @@ -57,9 +53,10 @@ _bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; _bakbutton.frame = CGRectMake(0,0,48,44); [_bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; - + _bakbutton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + _bakbutton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; [_bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; - + [_bakbutton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; _back=[[UIBarButtonItem alloc] initWithCustomView:_bakbutton]; self.navigationItem.leftBarButtonItem=_back; @@ -106,11 +103,8 @@ #pragma mark - 竖屏时，显示状态栏 --(BOOL)prefersStatusBarHidden - -{ +-(BOOL)prefersStatusBarHidden{ return NO; - } //白色状态栏 - (UIStatusBarStyle)preferredStatusBarStyle @@ -147,9 +141,6 @@ -(UIInterfaceOrientationMask)supportedInterfaceOrientations{ return UIInterfaceOrientationMaskPortrait|UIInterfaceOrientationMaskLandscapeRight; - - - } #pragma mark 一开始希望的屏幕方向 @@ -157,7 +148,6 @@ return UIInterfaceOrientationPortrait; } - #pragma mark - 屏幕旋转 -(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { diff --git a/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m b/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m index 7a13cf0..3122e7f 100644 --- a/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m +++ b/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m @@ -48,8 +48,8 @@ _bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; _bakbutton.frame = CGRectMake(0,0,48,44); [_bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; - - + _bakbutton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + [_bakbutton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; [_bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; _back=[[UIBarButtonItem alloc] initWithCustomView:_bakbutton]; diff --git a/Ifish/controllers/BaseVIewContorller/FatherController.m b/Ifish/controllers/BaseVIewContorller/FatherController.m index 9ed87e9..1e85ca3 100644 --- a/Ifish/controllers/BaseVIewContorller/FatherController.m +++ b/Ifish/controllers/BaseVIewContorller/FatherController.m @@ -21,8 +21,17 @@ } -(void)setNav{ - UIBarButtonItem*back=[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back_btn"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStyleDone target:self action:@selector(goBackAction)]; - self.navigationItem.leftBarButtonItem=back; + 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 addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; + [back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; + back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back]; + + self.navigationItem.leftBarButtonItem=backItem; } - (void)addTitleViewWithTitle:(NSString *)title{ diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m index 06e0295..000a6ed 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m @@ -133,9 +133,11 @@ [self.openDrawerButton setImage:hamburger forState:UIControlStateNormal]; //[self.openDrawerButton addTarget:self action:@selector(openDrawer:) forControlEvents:UIControlEventTouchUpInside]; [self.openDrawerButton addTarget:self action:@selector(leftBtnGoBackAction) forControlEvents:UIControlEventTouchUpInside]; + self.openDrawerButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + [self.openDrawerButton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; + UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:self.openDrawerButton]; - UIBarButtonItem *leftItem=[[UIBarButtonItem alloc] initWithImage:hamburger style:UIBarButtonItemStylePlain target:self action:@selector(leftBtnGoBackAction)]; - self.navigationItem.leftBarButtonItem = leftItem; + self.navigationItem.leftBarButtonItem=backItem; //标题 diff --git a/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m b/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m index a85e6cb..7c7a988 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m @@ -222,7 +222,8 @@ NS_ENUM(NSInteger,deviceType){ [bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; - + bakbutton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + [bakbutton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; UIBarButtonItem *back=[[UIBarButtonItem alloc] initWithCustomView:bakbutton]; self.navigationItem.leftBarButtonItem=back; self.title = @"切换设备"; diff --git a/Ifish/controllers/HotBar/IfishHotBarModifyNameVc.m b/Ifish/controllers/HotBar/IfishHotBarModifyNameVc.m index 79174cf..9a37bc5 100644 --- a/Ifish/controllers/HotBar/IfishHotBarModifyNameVc.m +++ b/Ifish/controllers/HotBar/IfishHotBarModifyNameVc.m @@ -20,8 +20,17 @@ // Do any additional setup after loading the view from its nib. self.title=@"修改名称"; self.navigationItem.rightBarButtonItem=[[UIBarButtonItem alloc]initWithTitle:@"保存" style:0 target:self action:@selector(clickModifyName)]; - UIImage *hamburger = [[UIImage imageNamed:@"back_btn"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithImage:hamburger style:0 target:self action:@selector(clickBack)]; + 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 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; } -(void)clickBack{ diff --git a/Ifish/controllers/HotBar/IfishHotBarVc.m b/Ifish/controllers/HotBar/IfishHotBarVc.m index 27d9b6f..03a1ec1 100644 --- a/Ifish/controllers/HotBar/IfishHotBarVc.m +++ b/Ifish/controllers/HotBar/IfishHotBarVc.m @@ -261,8 +261,17 @@ [self creatRefreshView]; [self header]; // - UIImage *hamburger = [[UIImage imageNamed:@"back_btn"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithImage:hamburger style:0 target:self action:@selector(clickBack)]; + 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 addTarget: self action: @selector(clickBack) forControlEvents: UIControlEventTouchUpInside]; + back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + [back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; + UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back]; + + self.navigationItem.leftBarButtonItem=backItem; self.navigationItem.rightBarButtonItem=[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ifishnav_dropview_list"] style:0 target:self action:@selector(clickMoreBtn)]; } diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishDiscoverViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishDiscoverViewController.m index a537cfa..54392f0 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishDiscoverViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishDiscoverViewController.m @@ -159,7 +159,7 @@ BOOL cerViewFormRootVC; -(void)creatTab{ - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0, kScreenSize.width,kScreenSize.height - 49 ) style:UITableViewStylePlain]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0, kScreenSize.width,kScreenSize.height - 49 -TOP_HEIGHT ) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; self.tableView.scrollEnabled = YES; diff --git a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopGoods/ViewControlller/IFishVideoPalyViewController.m b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopGoods/ViewControlller/IFishVideoPalyViewController.m index f8a54b3..26c4be6 100644 --- a/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopGoods/ViewControlller/IFishVideoPalyViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/IfishNewShopsFlie/ShopGoods/ViewControlller/IFishVideoPalyViewController.m @@ -44,6 +44,7 @@ self.bakbutton.frame = CGRectMake(0,0,48,44); [self.bakbutton setImage:[UIImage imageNamed:@"arrow_b"] forState:UIControlStateNormal]; [self.bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; + [self.bakbutton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; self.back=[[UIBarButtonItem alloc] initWithCustomView:self.bakbutton]; self.navigationItem.leftBarButtonItem=self.back; diff --git a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/IfishChatVC/IfishSessionViewController.m b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/IfishChatVC/IfishSessionViewController.m index 4a646f9..e28a2f4 100644 --- a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/IfishChatVC/IfishSessionViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/IfishChatVC/IfishSessionViewController.m @@ -146,8 +146,10 @@ NIMContactSelectDelegate [bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; - + [bakbutton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; + bakbutton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; UIBarButtonItem *back=[[UIBarButtonItem alloc] initWithCustomView:bakbutton]; + self.navigationItem.leftBarButtonItem=back; UILabel*labe=[[UILabel alloc]initWithFrame:CGRectMake(0, 0, 60, 44)]; labe.text=[self sessionTitle];; diff --git a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m index 11fbff7..3daad60 100644 --- a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m @@ -94,7 +94,8 @@ [bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [bakbutton addTarget: self action: @selector(backAction) forControlEvents: UIControlEventTouchUpInside]; - + bakbutton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + [bakbutton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; UIBarButtonItem *backTem=[[UIBarButtonItem alloc] initWithCustomView:bakbutton]; self.navigationItem.leftBarButtonItem=backTem; [self addTitleViewWithTitle:@"消息"]; diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib index f87818a..d5b19c2 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/FishSelectDeviceListViewCell.xib @@ -1,11 +1,11 @@ - + - + @@ -18,7 +18,7 @@ - + diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m index 2bd390d..09e25b6 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceSelectList/IfishBindDeviceSelectViewController.m @@ -104,21 +104,17 @@ extern BOOL isfromCameraView; }); - }); - - - - - } -(void)creatTab{ - - self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,self.view.frame.size.width,self.view.frame.size.height) style:UITableViewStyleGrouped]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0,0,kScreenWidth,kScreenHeight-TOP_HEIGHT) style:UITableViewStylePlain]; self.tableView.delegate = self; self.tableView.dataSource = self; + self.tableView.estimatedRowHeight = 0; + self.tableView.estimatedSectionFooterHeight = 0; + self.tableView.estimatedSectionHeaderHeight = 0; self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; self.tableView.showsVerticalScrollIndicator = NO; self.tableView.backgroundColor = [UIColor whiteColor]; @@ -149,21 +145,7 @@ extern BOOL isfromCameraView; } -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{ - if(self.view.frame.size.width<=340.0){ - return self.view.frame.size.width*0.304; - } - return self.view.frame.size.width*0.504; - -} - --(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{ - - return 0.1; -} - --(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{ - - return 0.1; + return 378/2.0; } - (void)didReceiveMemoryWarning { diff --git a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m index 56d248d..26c55af 100644 --- a/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m +++ b/Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m @@ -730,7 +730,7 @@ -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; - + self.navigationController.navigationBar.hidden = YES; //设置透明导航栏 [self.navigationController .navigationBar setClearNav]; @@ -1206,6 +1206,7 @@ -(void)viewWillDisappear:(BOOL)animated{ [super viewWillDisappear:animated]; [self.view hideToastActivity]; + self.navigationController.navigationBar.hidden = NO; [self.navigationController.navigationBar cnReset]; } @@ -1214,8 +1215,8 @@ -(void)pushWiFiConnectVC{ - self.hidesBottomBarWhenPushed = YES; IfishBindDeviceSelectViewController *connectVC=[[IfishBindDeviceSelectViewController alloc]init]; + self.hidesBottomBarWhenPushed = YES; [self.navigationController pushViewController:connectVC animated:YES]; self.hidesBottomBarWhenPushed = NO; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index 9241b79..2eb409b 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -473,6 +473,8 @@ leftBtn.frame = CGRectMake(0, 0, 47,44); [leftBtn setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [leftBtn addTarget: self action: @selector(btnClickToBack:) forControlEvents: UIControlEventTouchUpInside]; + leftBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + [leftBtn setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; UIBarButtonItem * lbbItem=[[UIBarButtonItem alloc]initWithCustomView:leftBtn]; self.navigationItem.leftBarButtonItem=lbbItem; //视频监控连接中的标题 diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/ScreenShotView/ShotScreenImgViewController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/ScreenShotView/ShotScreenImgViewController.m index 3589e46..2d6735f 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/ScreenShotView/ShotScreenImgViewController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/ScreenShotView/ShotScreenImgViewController.m @@ -40,9 +40,9 @@ back.frame = CGRectMake(0,0,48,44); [back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; - [back addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; - + back.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + [back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index 922221c..24402d3 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -113,7 +113,8 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { -(UILabel *)redTipLable{ if (_redTipLable==nil) { - _redTipLable=[[UILabel alloc]initWithFrame:CGRectMake(19, 165, 100, 10)]; + CGFloat y = CGRectGetMaxY(self.wifiSecFiled.frame) + 5; + _redTipLable=[[UILabel alloc]initWithFrame:CGRectMake(19, y, 100, 10)]; _redTipLable.text=@"(暂不支持5G网络，请使用2.4G网络）"; _redTipLable.font=[UIFont systemFontOfSize:13]; _redTipLable.textColor=[UIColor redColor]; @@ -576,12 +577,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { //967/1018/ 0.95 CGFloat percentHbiW = 0.117 ;//5s 35/300 - CGFloat y; - if (is_iPhone_X) { - y = 20 + 88; - } else { - y = 20 + 64; - } + CGFloat y = 20; self.nodImg= [[UIImageView alloc] initWithFrame:CGRectMake(5, y,12, 12)]; self.nodImg.image = [UIImage imageNamed:@"linkingdevice_point"]; [self.view addSubview:self.nodImg]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/KTPhotoBrowser/KTPhotoScrollViewController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/KTPhotoBrowser/KTPhotoScrollViewController.m index 71906f6..884a096 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/KTPhotoBrowser/KTPhotoScrollViewController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/KTPhotoBrowser/KTPhotoScrollViewController.m @@ -512,12 +512,11 @@ const CGFloat ktkDefaultToolbarHeight = 49; 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(goBackAction) forControlEvents: UIControlEventTouchUpInside]; - + [back setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; UIBarButtonItem * backItem=[[UIBarButtonItem alloc] initWithCustomView:back]; - self.navigationItem.leftBarButtonItem=backItem; diff --git a/Ifish/controllers/erweima/QRCodeReaderView.m b/Ifish/controllers/erweima/QRCodeReaderView.m index 181c200..58236dd 100755 --- a/Ifish/controllers/erweima/QRCodeReaderView.m +++ b/Ifish/controllers/erweima/QRCodeReaderView.m @@ -159,7 +159,7 @@ //用于说明的label UILabel * labIntroudction= [[UILabel alloc] init]; labIntroudction.backgroundColor = [UIColor clearColor]; - labIntroudction.frame=CGRectMake(0, 64+(heih-64-50*widthRate)/2, DeviceMaxWidth, 50*widthRate); + labIntroudction.frame=CGRectMake(0, (heih-64-50*widthRate)/2, DeviceMaxWidth, 50*widthRate); labIntroudction.textAlignment = NSTextAlignmentCenter; labIntroudction.textColor=[UIColor whiteColor]; labIntroudction.text=@"将二维码置于矩形方框内"; diff --git a/Ifish/controllers/erweima/ScanViewController.m b/Ifish/controllers/erweima/ScanViewController.m index f74e3a6..7585e7a 100644 --- a/Ifish/controllers/erweima/ScanViewController.m +++ b/Ifish/controllers/erweima/ScanViewController.m @@ -60,7 +60,9 @@ _bakbutton.frame = CGRectMake(0, 0, 47,44); [_bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [_bakbutton addTarget: self action: @selector(backButtonEvent) forControlEvents: UIControlEventTouchUpInside]; - + [_bakbutton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, -10)]; + _bakbutton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; + UIBarButtonItem * lbbItem=[[UIBarButtonItem alloc]initWithCustomView:_bakbutton]; self.navigationItem.leftBarButtonItem=lbbItem; diff --git a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m index d2303fd..d4d0564 100644 --- a/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m +++ b/Ifish/controllers/leftcontrollers/ConnectHotpotViewController.m @@ -61,8 +61,17 @@ fiveTapGesture.numberOfTapsRequired = 5; [self.containerView addGestureRecognizer:fiveTapGesture]; - UIImage *hamburger = [[UIImage imageNamed:@"back_btn"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithImage:hamburger style:0 target:self action:@selector(clickBack)]; + 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; } -(void)clickBack{ diff --git a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib index fcc5a1c..9b080af 100644 --- a/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib +++ b/Ifish/controllers/leftcontrollers/SecondConnectWifiController.xib @@ -1,11 +1,11 @@ - + - + @@ -29,23 +29,23 @@ - - - + + + + + - + + + + + + + + + - + + + + + + + - + + diff --git a/Ifish/controllers/logAddRegistController/ForgetViewController.m b/Ifish/controllers/logAddRegistController/ForgetViewController.m index f96c1f8..681d580 100644 --- a/Ifish/controllers/logAddRegistController/ForgetViewController.m +++ b/Ifish/controllers/logAddRegistController/ForgetViewController.m @@ -13,9 +13,11 @@ @interface ForgetViewController () @property (weak, nonatomic) IBOutlet UIButton *timerButton; @property (weak, nonatomic) IBOutlet UIButton *nextTepBtn; +@property (weak, nonatomic) IBOutlet UIButton *switchBtn; @property(nonatomic,copy)NSString*verifyData; @property(nonatomic,copy) NSString *areaCode; + @end @implementation ForgetViewController @@ -124,11 +126,11 @@ -(void)getVerifycode{ - [IFISHHTTPTOOL getverifyWithTimerButton:_timerButton addphoneNumber:self.phoneNumberFiled.text zone:self.areaCode result:^(NSError *err) { + BOOL isTextCode = [[_switchBtn titleForState:UIControlStateNormal] isEqualToString:@"语音验证码"]; + [IFISHHTTPTOOL getverifyWithTimerButton:_timerButton addphoneNumber:self.phoneNumberFiled.text zone:self.areaCode isTextCode:isTextCode result:^(NSError *err) { }]; - } #define mark - 获取阿里验证码 已去 @@ -236,4 +238,16 @@ } +#pragma mark -- Actions -- +// 切换语音验证码还是短信验证码 +- (IBAction)switchAction:(UIButton* )sender { + if ([[self.timerButton titleForState:UIControlStateNormal] isEqualToString:@"语音验证码"]) { + [self.timerButton setTitle:@"短信验证码" forState:UIControlStateNormal]; + [sender setTitle:@"语音验证码" forState:UIControlStateNormal]; + } else if ([[self.timerButton titleForState:UIControlStateNormal] isEqualToString:@"短信验证码"]) { + [self.timerButton setTitle:@"语音验证码" forState:UIControlStateNormal]; + [sender setTitle:@"短信验证码" forState:UIControlStateNormal]; + } +} + @end diff --git a/Ifish/controllers/logAddRegistController/ForgetViewController.xib b/Ifish/controllers/logAddRegistController/ForgetViewController.xib index 59582d6..52e45b0 100644 --- a/Ifish/controllers/logAddRegistController/ForgetViewController.xib +++ b/Ifish/controllers/logAddRegistController/ForgetViewController.xib @@ -1,12 +1,11 @@ - - + + - - + @@ -16,6 +15,7 @@ + @@ -23,14 +23,14 @@ - + - + - + @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ - - + @@ -115,10 +122,12 @@ + + @@ -127,6 +136,7 @@ +