Skip to content

Commit 788b47e

Browse files
committed
换图 改界面
1 parent 7c27c76 commit 788b47e

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 numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ @interface PointRecordsViewController ()<UITableViewDataSource, UITableViewDeleg
2323

2424
@property (nonatomic, strong) UITableView *myTableView;
2525
@property (nonatomic, strong) ODRefreshControl *refreshControl;
26-
@property (strong, nonatomic) UIButton *rightNavBtn;
2726
@property (assign, nonatomic) BOOL isShowingTip;
2827
@property (strong, nonatomic) UIView *tipContainerV;
2928
@property (strong, nonatomic) UIImageView *tipBGV;
@@ -56,9 +55,7 @@ - (void)viewDidLoad
5655
_refreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];
5756
[_refreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
5857

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)];
6259
self.isShowingTip = NO;
6360

6461
__weak typeof(self) weakSelf = self;
@@ -68,11 +65,6 @@ - (void)viewDidLoad
6865
[self refresh];
6966
}
7067

71-
- (void)setIsShowingTip:(BOOL)isShowingTip{
72-
_isShowingTip = isShowingTip;
73-
[_rightNavBtn setImage:[UIImage imageNamed:_isShowingTip? @"tip_selected_Nav": @"tip_normal_Nav"] forState:UIControlStateNormal];
74-
}
75-
7668
- (void)refresh{
7769
if (_curRecords.isLoading) {
7870
return;
@@ -169,12 +161,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
169161
[tableView deselectRowAtIndexPath:indexPath animated:YES];
170162
if (indexPath.section == 0 && indexPath.row == 1) {
171163
//商城入口
172-
// WebViewController *vc = [WebViewController webVCWithUrlStr:@"/shop/"];
173-
// [self.navigationController pushViewController:vc animated:YES];
174-
175164
ShopViewController *shopvc = [[ShopViewController alloc] init];
176165
[self.navigationController pushViewController:shopvc animated:YES];
177-
178166
}
179167
}
180168

Coding_iOS/Controllers/RootControllers/Project_RootViewController.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,13 @@ - (void)setupTitleBtn{
207207
- (void)setTitleBtnStr:(NSString *)titleStr{
208208
if (_titleBtn) {
209209
CGFloat titleWidth = [titleStr getWidthWithFont:_titleBtn.titleLabel.font constrainedToSize:CGSizeMake(kScreen_Width, 30)];
210-
CGFloat imageWidth = 20;
210+
CGFloat imageWidth = 12;
211211
CGFloat btnWidth = titleWidth +imageWidth;
212212
_titleBtn.frame = CGRectMake((kScreen_Width-btnWidth)/2, (44-30)/2, btnWidth, 30);
213213
_titleBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -imageWidth, 0, imageWidth);
214214
_titleBtn.imageEdgeInsets = UIEdgeInsetsMake(0, titleWidth, 0, -titleWidth);
215215
[_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];
217217
}
218218
}
219219

@@ -453,4 +453,4 @@ - (void)dealWithScanResult:(NSString *)resultStr ofVC:(ZXScanCodeViewController
453453
[alertV show];
454454
}
455455
}
456-
@end
456+
@end
-1.27 KB
Binary file not shown.
35 Bytes
Loading
-20 Bytes
Loading
618 Bytes
Loading
523 Bytes
Loading
-502 Bytes
Binary file not shown.
-885 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)