Skip to content

Commit

Permalink
修改item颜色 建立扫描页面
Browse files Browse the repository at this point in the history
  • Loading branch information
woaomo committed Sep 9, 2015
1 parent f0d0d13 commit 9cd598a
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 9 deletions.
14 changes: 14 additions & 0 deletions YHB_Prj/YHB_Prj.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
ABAAFB6D1B996B250012D1C6 /* DJYDCXDetailList.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAAFB681B996B250012D1C6 /* DJYDCXDetailList.m */; };
ABAAFB6E1B996B250012D1C6 /* DJYDCXResult.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAAFB6A1B996B250012D1C6 /* DJYDCXResult.m */; };
ABAAFB6F1B996B250012D1C6 /* DJYDCXRows.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAAFB6C1B996B250012D1C6 /* DJYDCXRows.m */; };
ABAE34A11BA0109C00221980 /* ScanVC.m in Sources */ = {isa = PBXBuildFile; fileRef = ABAE34A01BA0109C00221980 /* ScanVC.m */; };
ABE71E241B9C32E2000651A9 /* FBViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABE71E231B9C32E2000651A9 /* FBViewController.m */; };
ABEF1DA71B929D5400C1C2EA /* SupplierDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEF1DA61B929D5400C1C2EA /* SupplierDetailViewController.m */; };
ABEF1DAB1B92A18E00C1C2EA /* ClerkDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABEF1DAA1B92A18E00C1C2EA /* ClerkDetailViewController.m */; };
Expand Down Expand Up @@ -390,6 +391,8 @@
ABAAFB6A1B996B250012D1C6 /* DJYDCXResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DJYDCXResult.m; sourceTree = "<group>"; };
ABAAFB6B1B996B250012D1C6 /* DJYDCXRows.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DJYDCXRows.h; sourceTree = "<group>"; };
ABAAFB6C1B996B250012D1C6 /* DJYDCXRows.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DJYDCXRows.m; sourceTree = "<group>"; };
ABAE349F1BA0109C00221980 /* ScanVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScanVC.h; sourceTree = "<group>"; };
ABAE34A01BA0109C00221980 /* ScanVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScanVC.m; sourceTree = "<group>"; };
ABE71E221B9C32E2000651A9 /* FBViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBViewController.h; sourceTree = "<group>"; };
ABE71E231B9C32E2000651A9 /* FBViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBViewController.m; sourceTree = "<group>"; };
ABEF1DA51B929D5400C1C2EA /* SupplierDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SupplierDetailViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1040,6 +1043,15 @@
path = Model;
sourceTree = "<group>";
};
ABAE349E1BA0107A00221980 /* ScanVC */ = {
isa = PBXGroup;
children = (
ABAE349F1BA0109C00221980 /* ScanVC.h */,
ABAE34A01BA0109C00221980 /* ScanVC.m */,
);
path = ScanVC;
sourceTree = "<group>";
};
ABEF1DA41B929D4100C1C2EA /* SupplierDetailVC */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1329,6 +1341,7 @@
FF2A6C8D1A0F3CC9001607AC /* FourthViewController */ = {
isa = PBXGroup;
children = (
ABAE349E1BA0107A00221980 /* ScanVC */,
AB311F891B9BDBEA0070784E /* ProblemGoods */,
AB9F43E61B92E45000914C85 /* SettingVC */,
ABEF1DAC1B92AD1800C1C2EA /* Tenant */,
Expand Down Expand Up @@ -1925,6 +1938,7 @@
FF4DFD081B85B21C00617660 /* NSDateTool.m in Sources */,
FF2A6C6B1A0F3B7B001607AC /* MKAnnotationView+WebCache.m in Sources */,
FF5C87271B830F3000F79EC1 /* LoginManager.m in Sources */,
ABAE34A11BA0109C00221980 /* ScanVC.m in Sources */,
AB358E431B99855C007D62E9 /* YDCXDetailViewController.m in Sources */,
FF5CC6F91B93EE5300F55713 /* GysMode.m in Sources */,
FF5C87201B83024C00F79EC1 /* FMResultSet.m in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ - (void)viewDidLoad {
lineView.backgroundColor = RGBCOLOR(220, 220, 220);
[self.view addSubview:lineView];

UIColor *btnColor = [UIColor orangeColor];
UIColor *btnColor = KColor;
for (int i=0; i<2; i++)
{
UIButton *btn = [[UIButton alloc] initWithFrame:CGRectMake(15+kMainScreenWidth/2.0*i, lineView.bottom+35, kMainScreenWidth/2.0-30, 30)];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ - (instancetype)initWithFrame:(CGRect)frame

_chooseView = [[UIView alloc] initWithFrame:CGRectMake(height/2.0-4, height/2.0-4, 8, 8)];
_chooseView.layer.cornerRadius = 4;
_chooseView.backgroundColor = [UIColor orangeColor];
_chooseView.backgroundColor = KColor;
_chooseView.hidden = YES;
[self addSubview:_chooseView];
}
Expand All @@ -37,7 +37,7 @@ - (instancetype)initWithFrame:(CGRect)frame
- (void)becomeChoose
{
_chooseView.hidden = NO;
self.layer.borderColor = [[UIColor orangeColor] CGColor];
self.layer.borderColor = [KColor CGColor];
}

- (void)becomeHidden
Expand Down
9 changes: 6 additions & 3 deletions YHB_Prj/YHB_Prj/FourthViewController/FourthViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#import "SDWebImageManager.h"
#import "NetManager.h"
#import "ProblemGoodsViewController.h"
#import "ScanVC.h"

#define userFace @"userFace"

Expand Down Expand Up @@ -231,18 +232,20 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
[self.navigationController pushViewController:vc animated:YES];
break;
}
break;
case cellTypeScan:

{
ScanVC *vc = [[ScanVC alloc] init];
vc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:vc animated:YES];
break;
}
case cellTypeMatter:
{
ProblemGoodsViewController *vc = [[ProblemGoodsViewController alloc] init];
vc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:vc animated:YES];
break;
}
break;
default:
break;
}
Expand Down
13 changes: 13 additions & 0 deletions YHB_Prj/YHB_Prj/FourthViewController/ScanVC/ScanVC.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// ScanVC.h
// YHB_Prj
//
// Created by Johnny's on 15/9/9.
// Copyright (c) 2015年 striveliu. All rights reserved.
//

#import "BaseViewController.h"

@interface ScanVC : BaseViewController

@end
55 changes: 55 additions & 0 deletions YHB_Prj/YHB_Prj/FourthViewController/ScanVC/ScanVC.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
//
// ScanVC.m
// YHB_Prj
//
// Created by Johnny's on 15/9/9.
// Copyright (c) 2015年 striveliu. All rights reserved.
//

#import "ScanVC.h"
#import "DJScanViewController.h"

@interface ScanVC ()

@property(nonatomic,strong) UIButton *scanBtn;
@end

@implementation ScanVC

- (void)viewDidLoad {
[super viewDidLoad];
self.title = @"快速扫描";
self.view.backgroundColor = [UIColor whiteColor];

CGFloat btnWidth = 250;
_scanBtn = [[UIButton alloc] initWithFrame:CGRectMake(kMainScreenWidth/2.0-btnWidth/2.0, 30, btnWidth, 30)];
_scanBtn.backgroundColor = KColor;
_scanBtn.titleLabel.font = kFont12;
[_scanBtn setTitle:@"快速扫描" forState:UIControlStateNormal];
[_scanBtn addTarget:self action:@selector(touchScan) forControlEvents:UIControlEventTouchUpInside];
_scanBtn.layer.cornerRadius = 3;
[self.view addSubview:_scanBtn];
}

- (void)touchScan
{
DJScanViewController *vc= [[DJScanViewController alloc] init];
[self.navigationController pushViewController:vc animated:YES];
}

- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}

/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/

@end
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ - (void)viewDidLoad {
_btnChoose = [[UIButton alloc] initWithFrame:CGRectMake(kMainScreenWidth/2.0-btnWidth/2.0, _textViewFB.bottom+20, btnWidth, 40)];
_btnChoose.titleLabel.font = kFont13;
[_btnChoose setTitle:@"确认发送" forState:UIControlStateNormal];
_btnChoose.backgroundColor = [UIColor orangeColor];
_btnChoose.backgroundColor = KColor;
_btnChoose.layer.cornerRadius = 3;
[_btnChoose addTarget:self action:@selector(touchChoose) forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:_btnChoose];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ - (void)viewDidLoad {
[self.view addSubview:_setTV];

CGFloat cellH = [SetTableViewCell heightForSetCell];
UIColor *btnColor = [UIColor orangeColor];
UIColor *btnColor = KColor;
CGFloat btnWidth = 200;
UIView *tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kMainScreenWidth, kMainScreenHeight-64-4*cellH)];
_logoutBtn = [[UIButton alloc] initWithFrame:CGRectMake((kMainScreenWidth-btnWidth)/2.0, tableFooterView.bottom-40-50, btnWidth, 40)];
Expand Down
2 changes: 1 addition & 1 deletion YHB_Prj/YHB_Prj/Yudanchaxun/YDCXViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ - (void)reloadBottomView;
CGFloat length = attStr.length;
[attStr addAttribute:NSForegroundColorAttributeName value:[UIColor blackColor] range:preRange];
NSRange boRange = NSMakeRange(4, length-4);
[attStr addAttribute:NSForegroundColorAttributeName value:[UIColor orangeColor] range:boRange];
[attStr addAttribute:NSForegroundColorAttributeName value:KColor range:boRange];
_labelSum.attributedText = attStr;
}

Expand Down

0 comments on commit 9cd598a

Please sign in to comment.