From c9935f3186fe038dd87d9c83944e70f1c5175f83 Mon Sep 17 00:00:00 2001 From: xuemh Date: Tue, 3 Apr 2018 00:32:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ifish.xcodeproj/project.pbxproj | 4 ++++ .../BaseVIewContorller/BaseVIewContorller.m | 2 +- .../ClearNavBaseViewController.m | 2 +- .../BaseVIewContorller/FatherController.m | 2 +- .../maincontroller/CenterViewController.m | 4 +--- .../maincontroller/RightViewController.m | 2 +- .../IfishChatVC/IfishSessionViewController.m | 2 +- .../ViewController/NTESSessionListViewController.m | 2 +- .../IfishP2PMonitorController.m | 2 +- .../ScreenShotView/ShotScreenImgViewController.m | 4 ++-- .../KTPhotoBrowser/KTPhotoScrollViewController.m | 4 ++-- Ifish/controllers/erweima/ScanViewController.m | 2 +- .../NewLeftRightAddBack/back_btn@2x.png | Bin 0 -> 467 bytes 13 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 Ifish/ifishImgSouce/NewLeftRightAddBack/back_btn@2x.png diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 07d0d7b..3ce0395 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2453,6 +2453,7 @@ 88F5EFF01D48D08100CC7CAF /* split.c in Sources */ = {isa = PBXBuildFile; fileRef = 88F5EF8E1D48D08100CC7CAF /* split.c */; }; 88F5EFF11D48D08100CC7CAF /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88F5EFA81D48D08100CC7CAF /* libzbar.a */; }; 88F740C01ECC28E800876AED /* ShopAddGoodsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */; }; + E547870B20728F390060C2C2 /* back_btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E547870A20728F380060C2C2 /* back_btn@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -6212,6 +6213,7 @@ 88F5EFA81D48D08100CC7CAF /* libzbar.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libzbar.a; sourceTree = ""; }; 88F740BE1ECC28E800876AED /* ShopAddGoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopAddGoodsViewController.h; sourceTree = ""; }; 88F740BF1ECC28E800876AED /* ShopAddGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopAddGoodsViewController.m; sourceTree = ""; }; + E547870A20728F380060C2C2 /* back_btn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back_btn@2x.png"; sourceTree = ""; }; E5C644C0206BBD7100C558D5 /* CommonMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonMacros.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -8109,6 +8111,7 @@ 882955011DBDA3A100E9DDD7 /* NewLeftRightAddBack */ = { isa = PBXGroup; children = ( + E547870A20728F380060C2C2 /* back_btn@2x.png */, 885FBDFC1E4D5CD200E0D7D1 /* arrow_b.png */, 885FBDFD1E4D5CD200E0D7D1 /* arrow_l.png */, 885FBDFE1E4D5CD200E0D7D1 /* blackbar_white.png */, @@ -13945,6 +13948,7 @@ 882956B61DBDA3A200E9DDD7 /* scan_left.png in Resources */, 8815D1E81E02662600BEA2DA /* FullPlay_Previous_down.png in Resources */, 88C1B1EE1DC9AF3700C2C99A /* home_iocnmydevice@2x.png in Resources */, + E547870B20728F390060C2C2 /* back_btn@2x.png in Resources */, 885FBE1D1E4D66C100E0D7D1 /* merchant_iocn_a_member@2x.png in Resources */, 8871C4421E6D223F000AA49F /* QianDaoBannerViewCell.xib in Resources */, 882955DA1DBDA3A100E9DDD7 /* blac@3x.png in Resources */, diff --git a/Ifish/controllers/BaseVIewContorller/BaseVIewContorller.m b/Ifish/controllers/BaseVIewContorller/BaseVIewContorller.m index 44c40db..968f977 100644 --- a/Ifish/controllers/BaseVIewContorller/BaseVIewContorller.m +++ b/Ifish/controllers/BaseVIewContorller/BaseVIewContorller.m @@ -56,7 +56,7 @@ // self.navigationItem.backBarButtonItem=backItem; _bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; _bakbutton.frame = CGRectMake(0,0,48,44); - [_bakbutton setImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [_bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [_bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m b/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m index e488d55..7a13cf0 100644 --- a/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m +++ b/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m @@ -47,7 +47,7 @@ _bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; _bakbutton.frame = CGRectMake(0,0,48,44); - [_bakbutton setImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [_bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [_bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/controllers/BaseVIewContorller/FatherController.m b/Ifish/controllers/BaseVIewContorller/FatherController.m index 3d45d62..9635a3c 100644 --- a/Ifish/controllers/BaseVIewContorller/FatherController.m +++ b/Ifish/controllers/BaseVIewContorller/FatherController.m @@ -23,7 +23,7 @@ -(void)setNav{ UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom]; btn.frame = CGRectMake(2, 5,47, 44); - [btn setBackgroundImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [btn setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [btn addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; UIBarButtonItem*back=[[UIBarButtonItem alloc]initWithCustomView:btn]; diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m index ad8fe3a..77478b8 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m @@ -127,7 +127,7 @@ // 左侧按钮背景 - UIImage *hamburger = [UIImage imageNamed:@"arrow_l"]; + UIImage *hamburger = [UIImage imageNamed:@"back_btn"]; self.openDrawerButton = [UIButton buttonWithType:UIButtonTypeCustom]; self.openDrawerButton.frame = CGRectMake(0, 0, 47,44); [self.openDrawerButton setImage:hamburger forState:UIControlStateNormal]; @@ -135,8 +135,6 @@ [self.openDrawerButton addTarget:self action:@selector(leftBtnGoBackAction) forControlEvents:UIControlEventTouchUpInside]; UIBarButtonItem *leftItem=[[UIBarButtonItem alloc] initWithImage:hamburger style:UIBarButtonItemStylePlain target:self action:@selector(leftBtnGoBackAction)]; - - leftItem.customView = self.openDrawerButton; self.navigationItem.leftBarButtonItem = leftItem; diff --git a/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m b/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m index 93f74c1..a85e6cb 100644 --- a/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m +++ b/Ifish/controllers/FishTinkController/maincontroller/RightViewController.m @@ -218,7 +218,7 @@ NS_ENUM(NSInteger,deviceType){ -(void)setNav{ UIButton *bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; bakbutton.frame = CGRectMake(0,0,48,44); - [bakbutton setImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/IfishChatVC/IfishSessionViewController.m b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/IfishChatVC/IfishSessionViewController.m index 64387e2..4a646f9 100644 --- a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/IfishChatVC/IfishSessionViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/IfishChatVC/IfishSessionViewController.m @@ -143,7 +143,7 @@ NIMContactSelectDelegate //黑色 UIButton *bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; bakbutton.frame = CGRectMake(0,0,48,44); - [bakbutton setImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [bakbutton addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m index e7a6fc3..11fbff7 100644 --- a/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m +++ b/Ifish/controllers/IfishTabControllers/消息/IfishIMFiles/Sessions/SessionList/ViewController/NTESSessionListViewController.m @@ -91,7 +91,7 @@ //消息列表不在tab栏中时设置返回按钮 UIButton *bakbutton = [UIButton buttonWithType:UIButtonTypeCustom]; bakbutton.frame = CGRectMake(0,0,48,44); - [bakbutton setImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [bakbutton setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [bakbutton addTarget: self action: @selector(backAction) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index f130df4..3bf9d7f 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -468,7 +468,7 @@ [self.navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"blackbar.png"] forBarMetrics:UIBarMetricsDefault]; UIButton*leftBtn = [UIButton buttonWithType:UIButtonTypeCustom]; leftBtn.frame = CGRectMake(0, 0, 47,44); - [leftBtn setBackgroundImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [leftBtn setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [leftBtn addTarget: self action: @selector(btnClickToBack:) forControlEvents: UIControlEventTouchUpInside]; 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 3906142..3589e46 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/ScreenShotView/ShotScreenImgViewController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/ScreenShotView/ShotScreenImgViewController.m @@ -38,8 +38,8 @@ UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom]; back.frame = CGRectMake(0,0,48,44); - [back setImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; - // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; + // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [back addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/KTPhotoBrowser/KTPhotoScrollViewController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/KTPhotoBrowser/KTPhotoScrollViewController.m index 03ddef3..71906f6 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/KTPhotoBrowser/KTPhotoScrollViewController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/KTPhotoBrowser/KTPhotoScrollViewController.m @@ -510,8 +510,8 @@ const CGFloat ktkDefaultToolbarHeight = 49; UIButton *back = [UIButton buttonWithType:UIButtonTypeCustom]; back.frame = CGRectMake(0,0,48,44); - [back setImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; - // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"arrow_l"] forState:UIControlStateNormal]; + [back setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; + // [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [back addTarget: self action: @selector(goBackAction) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/controllers/erweima/ScanViewController.m b/Ifish/controllers/erweima/ScanViewController.m index e2bbdcd..912204a 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:@"arrow_l"] forState:UIControlStateNormal]; + [_bakbutton setBackgroundImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal]; [_bakbutton addTarget: self action: @selector(backButtonEvent) forControlEvents: UIControlEventTouchUpInside]; diff --git a/Ifish/ifishImgSouce/NewLeftRightAddBack/back_btn@2x.png b/Ifish/ifishImgSouce/NewLeftRightAddBack/back_btn@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c8e76b4866b01fc7d2d6e021960eab021996f747 GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^5nT0xSW|Cp@3z^lW}t?{s_j`@l0!4>kXrB(?a}tMn?nzu#dim3(OK zBBT2nFE{^us~+hpT)y-`= z-mxfhd#s@+C;NnQ^+i9ElWwN4{o|L(naJy(^OE;NkX7If;T~nZx~ZF84fxK9i7k@+ yv$(K|Rro+oqt1_s8ZZB>aWn9n|MG2wk-YyLHS=rd|H=Wq%HZkh=d#Wzp$P!hSqgXn literal 0 HcmV?d00001