Commit 788b47e

committed

换图改界面

1 parent 7c27c76 commit 788b47eCopy full SHA for 788b47e

File tree

37 files changed

+12

-80

lines changed

Coding_iOS.xcodeproj
- project.pbxproj
Coding_iOS
- Controllers
  - PointRecordsViewController.m
  - RootControllers
    - Project_RootViewController.m
- Images
  - nav_arrow_down@2x.png
  - nav_button
- Util/OC_Category/DownMenuViewController
  - UIDownMenuButton.m
- Views
  - Search
    - CategorySearchBar.m
  - TableListView
    - ProjectTaskListView.m

37 files changed

+12

-80

lines changed

`‎Coding_iOS.xcodeproj/project.pbxproj‎`

Lines changed: 0 additions & 36 deletions

Large diffs are not rendered by default.

`‎Coding_iOS/Controllers/PointRecordsViewController.m‎`

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ @interface PointRecordsViewController ()<UITableViewDataSource, UITableViewDeleg`
`23`	`23`
`24`	`24`	`@property (nonatomic, strong) UITableView *myTableView;`
`25`	`25`	`@property (nonatomic, strong) ODRefreshControl *refreshControl;`
`26`		`-@property (strong, nonatomic) UIButton *rightNavBtn;`
`27`	`26`	`@property (assign, nonatomic) BOOL isShowingTip;`
`28`	`27`	`@property (strong, nonatomic) UIView *tipContainerV;`
`29`	`28`	`@property (strong, nonatomic) UIImageView *tipBGV;`
`@@ -56,9 +55,7 @@ - (void)viewDidLoad`
`56`	`55`	`_refreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];`
`57`	`56`	`[_refreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];`
`58`	`57`
`59`		`- _rightNavBtn = [[UIButton alloc]initWithFrame:CGRectMake(0, 0, 40, 40)];`
`60`		`- [_rightNavBtn addTarget:self action:@selector(rightNavBtnClicked) forControlEvents:UIControlEventTouchUpInside];`
`61`		`- self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:_rightNavBtn];`
	`58`	`+ self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"tip_normal_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)];`
`62`	`59`	`self.isShowingTip = NO;`
`63`	`60`
`64`	`61`	`__weak typeof(self) weakSelf = self;`
`@@ -68,11 +65,6 @@ - (void)viewDidLoad`
`68`	`65`	`[self refresh];`
`69`	`66`	`}`
`70`	`67`
`71`		`-- (void)setIsShowingTip:(BOOL)isShowingTip{`
`72`		`- _isShowingTip = isShowingTip;`
`73`		`- [_rightNavBtn setImage:[UIImage imageNamed:_isShowingTip? @"tip_selected_Nav": @"tip_normal_Nav"] forState:UIControlStateNormal];`
`74`		`-}`
`75`		`-`
`76`	`68`	`- (void)refresh{`
`77`	`69`	`if (_curRecords.isLoading) {`
`78`	`70`	`return;`
`@@ -169,12 +161,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath`
`169`	`161`	`[tableView deselectRowAtIndexPath:indexPath animated:YES];`
`170`	`162`	`if (indexPath.section == 0 && indexPath.row == 1) {`
`171`	`163`	`//商城入口`
`172`		`-// WebViewController *vc = [WebViewController webVCWithUrlStr:@"/shop/"];`
`173`		`-// [self.navigationController pushViewController:vc animated:YES];`
`174`		`-`
`175`	`164`	`ShopViewController *shopvc = [[ShopViewController alloc] init];`
`176`	`165`	`[self.navigationController pushViewController:shopvc animated:YES];`
`177`		`-`
`178`	`166`	`}`
`179`	`167`	`}`
`180`	`168`

`‎Coding_iOS/Controllers/RootControllers/Project_RootViewController.m‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -207,13 +207,13 @@ - (void)setupTitleBtn{`
`207`	`207`	`- (void)setTitleBtnStr:(NSString *)titleStr{`
`208`	`208`	`if (_titleBtn) {`
`209`	`209`	`CGFloat titleWidth = [titleStr getWidthWithFont:_titleBtn.titleLabel.font constrainedToSize:CGSizeMake(kScreen_Width, 30)];`
`210`		`- CGFloat imageWidth = 20;`
	`210`	`+ CGFloat imageWidth = 12;`
`211`	`211`	`CGFloat btnWidth = titleWidth +imageWidth;`
`212`	`212`	`_titleBtn.frame = CGRectMake((kScreen_Width-btnWidth)/2, (44-30)/2, btnWidth, 30);`
`213`	`213`	`_titleBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -imageWidth, 0, imageWidth);`
`214`	`214`	`_titleBtn.imageEdgeInsets = UIEdgeInsetsMake(0, titleWidth, 0, -titleWidth);`
`215`	`215`	`[_titleBtn setTitle:titleStr forState:UIControlStateNormal];`
`216`		`- [_titleBtn setImage:[UIImage imageNamed:@"nav_arrow_down"] forState:UIControlStateNormal];`
	`216`	`+ [_titleBtn setImage:[UIImage imageNamed:@"btn_fliter_down"] forState:UIControlStateNormal];`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`
`@@ -453,4 +453,4 @@ - (void)dealWithScanResult:(NSString *)resultStr ofVC:(ZXScanCodeViewController`
`453`	`453`	`[alertV show];`
`454`	`454`	`}`
`455`	`455`	`}`
`456`		`-@end`
	`456`	`+@end`