diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 2fd4a61..a38f4d7 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2457,6 +2457,7 @@ 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 */; }; E54787112073192E0060C2C2 /* introlImage_iphonex_3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = E547870E2073192E0060C2C2 /* introlImage_iphonex_3.jpg */; }; + E58C9980208189780004C42B /* back_btn_1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E58C997F208189780004C42B /* back_btn_1@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -6220,6 +6221,7 @@ 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 = ""; }; E547870E2073192E0060C2C2 /* introlImage_iphonex_3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = introlImage_iphonex_3.jpg; sourceTree = ""; }; + E58C997F208189780004C42B /* back_btn_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back_btn_1@2x.png"; sourceTree = ""; }; E5C644C0206BBD7100C558D5 /* CommonMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonMacros.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -8120,6 +8122,7 @@ 882955011DBDA3A100E9DDD7 /* NewLeftRightAddBack */ = { isa = PBXGroup; children = ( + E58C997F208189780004C42B /* back_btn_1@2x.png */, E547870A20728F380060C2C2 /* back_btn@2x.png */, 885FBDFC1E4D5CD200E0D7D1 /* arrow_b.png */, 885FBDFD1E4D5CD200E0D7D1 /* arrow_l.png */, @@ -14297,6 +14300,7 @@ 88F23F2F1EA9D18700E4D298 /* live_label_v@3x.png in Resources */, 882957511DBDA3A300E9DDD7 /* swimmingfish0064.png in Resources */, 887491E11E78E28100CDA284 /* gold_iocn@2x.png in Resources */, + E58C9980208189780004C42B /* back_btn_1@2x.png in Resources */, 88696FF61E9CBC2E005D4AFB /* home_iocn_hotsell.png in Resources */, 882956171DBDA3A100E9DDD7 /* neves0026.png in Resources */, 886512041E97966400BABDF1 /* task_shareIfishApp.png in Resources */, diff --git a/Ifish/controllers/BaseVIewContorller/FatherController.m b/Ifish/controllers/BaseVIewContorller/FatherController.m index 9635a3c..9ed87e9 100644 --- a/Ifish/controllers/BaseVIewContorller/FatherController.m +++ b/Ifish/controllers/BaseVIewContorller/FatherController.m @@ -21,12 +21,7 @@ } -(void)setNav{ - UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom]; - btn.frame = CGRectMake(2, 5,47, 44); - [btn setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; - [btn addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; - - UIBarButtonItem*back=[[UIBarButtonItem alloc]initWithCustomView:btn]; + UIBarButtonItem*back=[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back_btn"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStyleDone target:self action:@selector(goBackAction)]; self.navigationItem.leftBarButtonItem=back; } - (void)addTitleViewWithTitle:(NSString *)title{ diff --git a/Ifish/controllers/BaseVIewContorller/WhiteNavBaseViewController.m b/Ifish/controllers/BaseVIewContorller/WhiteNavBaseViewController.m index ab11303..dd5177d 100644 --- a/Ifish/controllers/BaseVIewContorller/WhiteNavBaseViewController.m +++ b/Ifish/controllers/BaseVIewContorller/WhiteNavBaseViewController.m @@ -43,18 +43,8 @@ } -(void)initNav{ - // 1. 可以改变全栈back按钮 图片 60*60 @2x像素 - - _bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; - _bakbutton.frame = CGRectMake(0,0,48,44); - [_bakbutton setImage:[UIImage imageNamed:@"arrow_b"] forState:UIControlStateNormal]; - - - [_bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; - - _back=[[UIBarButtonItem alloc] initWithCustomView:_bakbutton]; + _back =[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back_btn_1"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStyleDone target:self action:@selector(goBackAction)]; self.navigationItem.leftBarButtonItem=_back; - } -(void)goBackAction{ diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m index 77478b8..06e0295 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m @@ -127,7 +127,7 @@ // 左侧按钮背景 - UIImage *hamburger = [UIImage imageNamed:@"back_btn"]; + UIImage *hamburger = [[UIImage imageNamed:@"back_btn"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; self.openDrawerButton = [UIButton buttonWithType:UIButtonTypeCustom]; self.openDrawerButton.frame = CGRectMake(0, 0, 47,44); [self.openDrawerButton setImage:hamburger forState:UIControlStateNormal]; diff --git a/Ifish/controllers/erweima/ScanViewController.m b/Ifish/controllers/erweima/ScanViewController.m index 912204a..840d56b 100644 --- a/Ifish/controllers/erweima/ScanViewController.m +++ b/Ifish/controllers/erweima/ScanViewController.m @@ -58,7 +58,7 @@ [self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault]; _bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; _bakbutton.frame = CGRectMake(0, 0, 47,44); - [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; + [_bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [_bakbutton addTarget: self action: @selector(backButtonEvent) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/ifishImgSouce/NewLeftRightAddBack/back_btn_1@2x.png b/Ifish/ifishImgSouce/NewLeftRightAddBack/back_btn_1@2x.png new file mode 100644 index 0000000..7f574c9 Binary files /dev/null and b/Ifish/ifishImgSouce/NewLeftRightAddBack/back_btn_1@2x.png differ