查漏补缺

wanghengheng · wanghengheng · commit 1b70aed9e2d7 · 2017-04-28T17:51:58.000+08:00
diff --git a/Coding_iOS/Controllers/Shop/LocationViewController.m b/Coding_iOS/Controllers/Shop/LocationViewController.m
@@ -32,7 +32,7 @@ - (void)viewDidLoad{
         tableView.dataSource = self;
         [tableView registerClass:[LocationCell class] forCellReuseIdentifier:kCellIdentifier_LocationCell];
         tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
-        tableView.separatorColor = [UIColor colorWithHexString:@"0xDDDDDD"];
+        tableView.separatorColor = kColorDDD;
         tableView.separatorInset = UIEdgeInsetsMake(0, 12, 0, 12);
         [self.view addSubview:tableView];
         [tableView mas_makeConstraints:^(MASConstraintMaker *make) {
diff --git a/Coding_iOS/Views/Cell/LeftImage_LRTextCell.m b/Coding_iOS/Views/Cell/LeftImage_LRTextCell.m
@@ -31,14 +31,14 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         }
         if (!_leftLabel) {
             _leftLabel = [[UILabel alloc] initWithFrame:CGRectMake(60,  ([LeftImage_LRTextCell cellHeight] - 30) / 2, 80, 30)];
-            _leftLabel.font = [UIFont systemFontOfSize:16];
+            _leftLabel.font = [UIFont systemFontOfSize:15];
             _leftLabel.textColor = kColorDark3;
             _leftLabel.textAlignment = NSTextAlignmentLeft;
             [self.contentView addSubview:_leftLabel];
         }
         if (!_rightLabel) {
             _rightLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_leftLabel.frame),  ([LeftImage_LRTextCell cellHeight] - 30) / 2, kScreen_Width - CGRectGetMaxX(_leftLabel.frame) - 35, 30)];
-            _rightLabel.font = [UIFont systemFontOfSize:16];
+            _rightLabel.font = [UIFont systemFontOfSize:15];
             _rightLabel.textColor = kColorDark7;
             _rightLabel.textAlignment = NSTextAlignmentRight;
             [self.contentView addSubview:_rightLabel];
diff --git a/Coding_iOS/Views/Cell/TaskContentCell.m b/Coding_iOS/Views/Cell/TaskContentCell.m
@@ -8,7 +8,7 @@
 #define kTaskContentCell_ContentHeightMin kScaleFrom_iPhone5_Desgin(90.0)
 #define kTextView_Pading 8.0
 #define kTaskContentCell_ContentWidth (kScreen_Width-kPaddingLeftWidth-kPaddingLeftWidth + 2*kTextView_Pading)
-#define kTaskContentCell_ContentFont [UIFont systemFontOfSize:18]
+#define kTaskContentCell_ContentFont [UIFont systemFontOfSize:15]
 
 
 #import "TaskContentCell.h"
@@ -77,7 +77,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         if (!_deleteBtn) {
             _deleteBtn = ({
                 UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
-                button.titleLabel.font = [UIFont systemFontOfSize:13];
+                button.titleLabel.font = [UIFont systemFontOfSize:12];
                 [button setTitleColor:kColorDark7 forState:UIControlStateNormal];
                 [button setTitle:@"&#21024;&#38500;" forState:UIControlStateNormal];
                 [button addTarget:self action:@selector(deleteBtnClicked:) forControlEvents:UIControlEventTouchUpInside];
diff --git a/Coding_iOS/Views/Cell/TaskDescriptionCell.m b/Coding_iOS/Views/Cell/TaskDescriptionCell.m
@@ -22,7 +22,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         
         if (!_button) {
             _button = [[UIButton alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, ([[self class] cellHeight] - 36)/2, kScreen_Width - 2*kPaddingLeftWidth, 36)];
-            _button.titleLabel.font = [UIFont systemFontOfSize:16];
+            _button.titleLabel.font = [UIFont systemFontOfSize:14];
             _button.backgroundColor = kColorTableSectionBg;
             _button.layer.masksToBounds = YES;
             _button.layer.cornerRadius = 2.0;
diff --git a/Coding_iOS/Views/Cell/TaskSelectionCell.m b/Coding_iOS/Views/Cell/TaskSelectionCell.m
@@ -50,7 +50,7 @@ - (void)creatView {
     _selImageView.sd_layout.rightSpaceToView(self.contentView, 20).centerYEqualToView(self.contentView).widthIs(20).heightIs(21);
     
     _line = [[UILabel alloc] init];
-    _line.backgroundColor = [UIColor colorWithRGBHex:0xdddddd];
+    _line.backgroundColor = kColorDDD;
     [self.contentView addSubview:_line];
     _line.sd_layout.leftSpaceToView(self.contentView, 0).rightSpaceToView(self.contentView, 0).bottomSpaceToView(self.contentView, 0).heightIs(.5);
     _line.hidden = YES;
diff --git a/Coding_iOS/Views/PhoneCodeButton.m b/Coding_iOS/Views/PhoneCodeButton.m
@@ -32,7 +32,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (void)setEnabled:(BOOL)enabled{
     [super setEnabled:enabled];
-    UIColor *foreColor = [UIColor colorWithHexString:enabled? @"0x2EBE76": @"0xCCCCCC"];
+    UIColor *foreColor = enabled? kColorBrandGreen: kColorCCC;
     [self setTitleColor:foreColor forState:UIControlStateNormal];
     if (enabled) {
         [self setTitle:@"&#21457;&#36865;&#39564;&#35777;&#30721;" forState:UIControlStateNormal];
diff --git a/Coding_iOS/Views/ScreenView.m b/Coding_iOS/Views/ScreenView.m
@@ -163,7 +163,7 @@ - (void)creatView {
     resetButton.sd_layout.leftSpaceToView(mainView, 0).bottomSpaceToView(mainView, 0).rightSpaceToView(mainView, 0).heightIs(48.5);
     
     UILabel *line = [[UILabel alloc] init];
-    line.backgroundColor = [UIColor colorWithRGBHex:0xdddddd];
+    line.backgroundColor = kColorDDD;
     [mainView addSubview:line];
     line.sd_layout.leftSpaceToView(mainView, 0).rightSpaceToView(mainView, 0).bottomSpaceToView(resetButton, 0).heightIs(.5);
 
