改来改去改来改去

wanghengheng · wanghengheng · commit 6972f78bb922 · 2016-09-23T15:19:21.000+08:00
diff --git a/Coding_iOS/.DS_Store b/Coding_iOS/.DS_Store
diff --git a/Coding_iOS/Controllers/RootControllers/BaseNavigationController.m b/Coding_iOS/Controllers/RootControllers/BaseNavigationController.m
@@ -25,7 +25,7 @@ - (void)viewWillAppear:(BOOL)animated{
     //添新
     if (!_navLineV) {
         _navLineV = [[UIView alloc]initWithFrame:CGRectMake(0, 44, kScreen_Width, 1.0/ [UIScreen mainScreen].scale)];
-        _navLineV.backgroundColor = kColorDDD;
+        _navLineV.backgroundColor = kColorCCC;
         [self.navigationBar addSubview:_navLineV];
     }
 }
diff --git a/Coding_iOS/Controllers/RootControllers/RootTabViewController.m b/Coding_iOS/Controllers/RootControllers/RootTabViewController.m
@@ -116,7 +116,7 @@ - (void)customizeTabBarForController {
         [item setTitle:[tabBarItemTitles objectAtIndex:index]];
         index++;
     }
-    [self.tabBar addLineUp:YES andDown:NO];
+    [self.tabBar addLineUp:YES andDown:NO andColor:kColorCCC];
 }
 
 #pragma mark RDVTabBarControllerDelegate
diff --git a/Coding_iOS/Util/Manager/SendRewardManager.m b/Coding_iOS/Util/Manager/SendRewardManager.m
@@ -109,7 +109,7 @@ - (instancetype)init
         _passwordF.textColor = kColor222;
         _passwordF.secureTextEntry = YES;
         _passwordF.textAlignment = NSTextAlignmentCenter;
-        [_passwordF doBorderWidth:1.0 color:[UIColor colorWithHexString:@"0xCCCCCC"] cornerRadius:2.0];
+        [_passwordF doBorderWidth:1.0 color:kColorCCC cornerRadius:2.0];
         _passwordF.placeholder = @" 请输入密码";
         _passwordF.alpha = 0;
         _bottomL.font = [UIFont systemFontOfSize:12];
diff --git a/Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m b/Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m
@@ -109,7 +109,7 @@ - (void)setRecentEmojis:(NSMutableArray *)recentEmojis {
 - (instancetype)initWithFrame:(CGRect)frame dataSource:(id<AGEmojiKeyboardViewDataSource>)dataSource  showBigEmotion:(BOOL)showBigEmotion{
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = kColorTableSectionBg;
+        self.backgroundColor = kColorNavBG;
         // initialize category
         _dataSource = dataSource;
         self.category = [self categoryNameAtIndex:self.defaultSelectedCategory];
@@ -453,7 +453,7 @@ - (void)setSelectedIndex:(NSInteger)selectedIndex{
             UIButton *tabButton = self.tabButtons[i];
             if (i==selectedIndex) {
                 [tabButton setImage:self.selectedImages[i] forState:UIControlStateNormal];
-                [tabButton setBackgroundColor:kColorTableSectionBg];
+                [tabButton setBackgroundColor:kColorNavBG];
             }else{
                 [tabButton setImage:self.unSelectedImages[i] forState:UIControlStateNormal];
                 [tabButton setBackgroundColor:[UIColor clearColor]];
diff --git a/Coding_iOS/Views/Cell/EditLabelHeadCell.m b/Coding_iOS/Views/Cell/EditLabelHeadCell.m
@@ -28,7 +28,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         }
         if (!_addBtn) {
             _addBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - kPaddingLeftWidth - 50, 7, 50, 30)];
-            [_addBtn doBorderWidth:0.5 color:[UIColor colorWithHexString:@"0xCCCCCC"] cornerRadius:4];
+            [_addBtn doBorderWidth:0.5 color:kColorCCC cornerRadius:4];
             [_addBtn setImage:[UIImage imageNamed:@"tag_button_add"] forState:UIControlStateNormal];
             _addBtn.enabled = FALSE;
             [self.contentView addSubview:_addBtn];
diff --git a/Coding_iOS/Views/Cell/Input_OnlyText_Cell.m b/Coding_iOS/Views/Cell/Input_OnlyText_Cell.m
@@ -97,7 +97,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             });
             UIView *lineV = ({
                 UIView *view = [UIView new];
-                view.backgroundColor = [UIColor colorWithHexString:@"0xCCCCCC"];
+                view.backgroundColor = kColorCCC;
                 [self.contentView addSubview:view];
                 [view mas_makeConstraints:^(MASConstraintMaker *make) {
                     make.left.equalTo(self.countryCodeL.mas_right).offset(8);
diff --git a/Coding_iOS/Views/Cell/TagColorEditCell.m b/Coding_iOS/Views/Cell/TagColorEditCell.m
@@ -24,7 +24,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         }
         if (!_randomBtn) {
             _randomBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - kPaddingLeftWidth - 50, 7, 50, 30)];
-            [_randomBtn doBorderWidth:0.5 color:[UIColor colorWithHexString:@"0xCCCCCC"] cornerRadius:4];
+            [_randomBtn doBorderWidth:0.5 color:kColorCCC cornerRadius:4];
             [_randomBtn setImage:[UIImage imageNamed:@"tag_button_randomColor"] forState:UIControlStateNormal];
             [self.contentView addSubview:_randomBtn];
         }
diff --git a/Coding_iOS/Views/CodingBannersView.m b/Coding_iOS/Views/CodingBannersView.m
@@ -34,6 +34,7 @@ - (instancetype)init
         _ratio = 0.4;
         CGFloat viewHeight = _padding_top + _padding_bottom + _image_width * _ratio;
         [self setSize:CGSizeMake(kScreen_Width, viewHeight)];
+        [self addLineUp:NO andDown:YES];
     }
     return self;
 }
diff --git a/Coding_iOS/Views/PopFliterMenu.m b/Coding_iOS/Views/PopFliterMenu.m
@@ -223,7 +223,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         if(indexPath.row==0){
             [titleLab removeFromSuperview];
             UIView *seperatorLine=[[UIView alloc] initWithFrame:CGRectMake(20, 15, self.bounds.size.width-40, 0.5)];
-            seperatorLine.backgroundColor=[UIColor colorWithHexString:@"0xcccccc"];
+            seperatorLine.backgroundColor=kColorCCC;
             [cell.contentView addSubview:seperatorLine];
             cell.selectionStyle=UITableViewCellSelectionStyleNone;
         }else{
@@ -235,7 +235,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         if(indexPath.row==0){
             [titleLab removeFromSuperview];
             UIView *seperatorLine=[[UIView alloc] initWithFrame:CGRectMake(20, 15, self.bounds.size.width-40, 0.5)];
-            seperatorLine.backgroundColor=[UIColor colorWithHexString:@"0xcccccc"];
+            seperatorLine.backgroundColor=kColorCCC;
             [cell.contentView addSubview:seperatorLine];
             cell.selectionStyle=UITableViewCellSelectionStyleNone;
         }else{
diff --git a/Coding_iOS/Views/ShopGoodsInfoView.m b/Coding_iOS/Views/ShopGoodsInfoView.m
@@ -101,7 +101,7 @@ - (void)setUpContentView
     }];
     
     DashesLineView *lineView = [[DashesLineView alloc] init];
-    lineView.lineColor = [UIColor colorWithHexString:@"0xCCCCCC"];
+    lineView.lineColor = kColorCCC;
     lineView.backgroundColor = [UIColor clearColor];
     [superView addSubview:lineView];
     [lineView mas_makeConstraints:^(MASConstraintMaker *make) {
diff --git a/Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m b/Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m
@@ -152,8 +152,8 @@ - (id)initWithFrame:(CGRect)frame
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
-        self.backgroundColor = kColorTableSectionBg;
-        [self addLineUp:YES andDown:NO andColor:[UIColor lightGrayColor]];
+        self.backgroundColor = kColorNavBG;
+        [self addLineUp:YES andDown:NO andColor:kColorCCC];
         _viewHeightOld = CGRectGetHeight(frame);
         _inputState = UIMessageInputViewStateSystem;
         _isAlwaysShow = NO;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ - (void)viewWillAppear:(BOOL)animated{`
`25`	`25`	`//添新`
`26`	`26`	`if (!_navLineV) {`
`27`	`27`	`_navLineV = [[UIView alloc]initWithFrame:CGRectMake(0, 44, kScreen_Width, 1.0/ [UIScreen mainScreen].scale)];`
`28`		`- _navLineV.backgroundColor = kColorDDD;`
	`28`	`+ _navLineV.backgroundColor = kColorCCC;`
`29`	`29`	`[self.navigationBar addSubview:_navLineV];`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ - (void)customizeTabBarForController {`
`116`	`116`	`[item setTitle:[tabBarItemTitles objectAtIndex:index]];`
`117`	`117`	`index++;`
`118`	`118`	`}`
`119`		`- [self.tabBar addLineUp:YES andDown:NO];`
	`119`	`+ [self.tabBar addLineUp:YES andDown:NO andColor:kColorCCC];`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`#pragma mark RDVTabBarControllerDelegate`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus`
`28`	`28`	`}`
`29`	`29`	`if (!_addBtn) {`
`30`	`30`	`_addBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - kPaddingLeftWidth - 50, 7, 50, 30)];`
`31`		`- [_addBtn doBorderWidth:0.5 color:[UIColor colorWithHexString:@"0xCCCCCC"] cornerRadius:4];`
	`31`	`+ [_addBtn doBorderWidth:0.5 color:kColorCCC cornerRadius:4];`
`32`	`32`	`[_addBtn setImage:[UIImage imageNamed:@"tag_button_add"] forState:UIControlStateNormal];`
`33`	`33`	`_addBtn.enabled = FALSE;`
`34`	`34`	`[self.contentView addSubview:_addBtn];`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus`
`24`	`24`	`}`
`25`	`25`	`if (!_randomBtn) {`
`26`	`26`	`_randomBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - kPaddingLeftWidth - 50, 7, 50, 30)];`
`27`		`- [_randomBtn doBorderWidth:0.5 color:[UIColor colorWithHexString:@"0xCCCCCC"] cornerRadius:4];`
	`27`	`+ [_randomBtn doBorderWidth:0.5 color:kColorCCC cornerRadius:4];`
`28`	`28`	`[_randomBtn setImage:[UIImage imageNamed:@"tag_button_randomColor"] forState:UIControlStateNormal];`
`29`	`29`	`[self.contentView addSubview:_randomBtn];`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ - (instancetype)init`
`34`	`34`	`_ratio = 0.4;`
`35`	`35`	`CGFloat viewHeight = _padding_top + _padding_bottom + _image_width * _ratio;`
`36`	`36`	`[self setSize:CGSizeMake(kScreen_Width, viewHeight)];`
	`37`	`+ [self addLineUp:NO andDown:YES];`
`37`	`38`	`}`
`38`	`39`	`return self;`
`39`	`40`	`}`