Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 2f094e91 由 cgx
选项

暂时隐藏积分任务

1 个父辈 bfc2f088
内嵌 并排
正在显示 3 个修改的文件 包含 170 行增加 和 155 行删除
DreamSleep/DreamSleep/Class/AISleepModule/Controller/AISleepCoachController.m
...@@ -136,11 +136,11 @@ ...@@ -136,11 +136,11 @@
break; break;
case 2: // 登录点击开启-开启我的页面里面的AI睡眠教练 case 2: // 登录点击开启-开启我的页面里面的AI睡眠教练
{ {
[UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) { // [UserRequestModel autoLoginRequestWithCompletion:^(UserRequestModel * _Nonnull requestModel) {
if (requestModel.resCode == DSResCodeSuccess) { // if (requestModel.resCode == DSResCodeSuccess) {
[[NSNotificationCenter defaultCenter] postNotificationName:NeedUpdateStartAI object:nil]; // [[NSNotificationCenter defaultCenter] postNotificationName:NeedUpdateStartAI object:nil];
} // }
}]; // }];
} }
break; break;
case 3: // 轻拍哄睡 case 3: // 轻拍哄睡
......
DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
// leftItem // leftItem
UILabel *leftLab = [UILabel dkLabWithText:@"小梦睡眠" font:BoldFont(24.0)]; UILabel *leftLab = [UILabel dkLabWithText:@"小梦睡眠" font:BoldFont(24.0)];
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:leftLab]; self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:leftLab];
// rightItem
/* rightItem
UIButton *dailyTaskBtn = [UIButton new]; UIButton *dailyTaskBtn = [UIButton new];
[dailyTaskBtn addTarget:self action:@selector(jumpToDailyTaskPage) forControlEvents:UIControlEventTouchUpInside]; [dailyTaskBtn addTarget:self action:@selector(jumpToDailyTaskPage) forControlEvents:UIControlEventTouchUpInside];
[dailyTaskBtn dk_setImage:DKImagePickerWithNames(@"ic_home_meirirw", @"dk_ic_home_meirirw", @"ic_home_meirirw") forState:UIControlStateNormal]; [dailyTaskBtn dk_setImage:DKImagePickerWithNames(@"ic_home_meirirw", @"dk_ic_home_meirirw", @"ic_home_meirirw") forState:UIControlStateNormal];
...@@ -40,6 +41,7 @@ ...@@ -40,6 +41,7 @@
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self addScaleAnimtaionWithView:dailyTaskBtn]; [self addScaleAnimtaionWithView:dailyTaskBtn];
}); });
*/
[self.view addSubview:self.homeTV]; [self.view addSubview:self.homeTV];
[self.view addSubview:self.noisePlayBar]; [self.view addSubview:self.noisePlayBar];
......
DreamSleep/DreamSleep/Class/ProfileModule/Me/ProfileHeaderView.m
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
@property (nonatomic, strong) UILabel *titleLab; @property (nonatomic, strong) UILabel *titleLab;
@property (nonatomic, strong) UIImageView *levelIV; @property (nonatomic, strong) UIImageView *levelIV;
@property (nonatomic, strong) UIButton *modifyBtn; @property (nonatomic, strong) UIButton *modifyBtn;
@property (nonatomic, strong) UIView *scoreTaskEvaluateView; //@property (nonatomic, strong) UIView *scoreTaskEvaluateView;
@property (nonatomic, strong) UILabel *scoreCountLab; //@property (nonatomic, strong) UILabel *scoreCountLab;
@property (nonatomic, strong) UIButton *openAIBtn; //@property (nonatomic, strong) UIButton *openAIBtn;
@property (nonatomic, strong) UIView *reportReviewsView; //@property (nonatomic, strong) UIView *reportReviewsView;
@end @end
@implementation ProfileHeaderView @implementation ProfileHeaderView
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
} }
} }
- (void)monitorAIStartNoti { //- (void)monitorAIStartNoti {
UserModel *usrModel = [LoginUtils getUserLoginData]; // UserModel *usrModel = [LoginUtils getUserLoginData];
self.openAIBtn.hidden = usrModel.is_access == 1; // self.openAIBtn.hidden = usrModel.is_access == 1;
self.reportReviewsView.hidden = !self.openAIBtn.hidden; // self.reportReviewsView.hidden = !self.openAIBtn.hidden;
} //}
- (void)updateUserView { - (void)updateUserView {
UserModel *model = [LoginUtils getUserLoginData]; UserModel *model = [LoginUtils getUserLoginData];
...@@ -46,16 +46,21 @@ ...@@ -46,16 +46,21 @@
[self.titleLab mas_remakeConstraints:^(MASConstraintMaker *make) { [self.titleLab mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.portraitIV.mas_right).offset(20); make.left.equalTo(self.portraitIV.mas_right).offset(20);
make.top.equalTo(self.portraitIV).offset(4); make.centerY.equalTo(self.portraitIV);
}];
[self.levelIV mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.titleLab).offset(-8);
make.top.equalTo(self.titleLab.mas_bottom).offset(4);
make.size.mas_equalTo(CGSizeMake(95, 35));
}]; }];
self.openAIBtn.hidden = model.is_access == 1;
self.reportReviewsView.hidden = !self.openAIBtn.hidden; // [self.titleLab mas_remakeConstraints:^(MASConstraintMaker *make) {
self.scoreCountLab.text = [NSString stringWithFormat:@"我的积分：%d", model.total_points]; // make.left.equalTo(self.portraitIV.mas_right).offset(20);
// make.top.equalTo(self.portraitIV).offset(4);
// }];
// [self.levelIV mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.equalTo(self.titleLab).offset(-8);
// make.top.equalTo(self.titleLab.mas_bottom).offset(4);
// make.size.mas_equalTo(CGSizeMake(95, 35));
// }];
// self.openAIBtn.hidden = model.is_access == 1;
// self.reportReviewsView.hidden = !self.openAIBtn.hidden;
// self.scoreCountLab.text = [NSString stringWithFormat:@"我的积分：%d", model.total_points];
} else { } else {
self.portraitIV.image = [UIImage imageNamed:@"basicPlaceholder"]; self.portraitIV.image = [UIImage imageNamed:@"basicPlaceholder"];
self.titleLab.text = @"注册/登录"; self.titleLab.text = @"注册/登录";
...@@ -67,9 +72,9 @@ ...@@ -67,9 +72,9 @@
make.centerY.equalTo(self.portraitIV); make.centerY.equalTo(self.portraitIV);
}]; }];
self.openAIBtn.hidden = NO; // self.openAIBtn.hidden = NO;
self.reportReviewsView.hidden = YES; // self.reportReviewsView.hidden = YES;
self.scoreCountLab.text = @"我的积分"; // self.scoreCountLab.text = @"我的积分";
} }
} }
...@@ -84,8 +89,12 @@ ...@@ -84,8 +89,12 @@
if (self = [super initWithFrame:CGRectMake(0, 0, 0, 0)]) { if (self = [super initWithFrame:CGRectMake(0, 0, 0, 0)]) {
_delegate = delegate; _delegate = delegate;
// [self mas_makeConstraints:^(MASConstraintMaker *make) {
// make.height.greaterThanOrEqualTo(@338);
// make.width.equalTo(@(kScreenWidth));
// }];
[self mas_makeConstraints:^(MASConstraintMaker *make) { [self mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.greaterThanOrEqualTo(@338); make.height.greaterThanOrEqualTo(@196);
make.width.equalTo(@(kScreenWidth)); make.width.equalTo(@(kScreenWidth));
}]; }];
...@@ -93,18 +102,21 @@ ...@@ -93,18 +102,21 @@
[self addSubview:userInfoView]; [self addSubview:userInfoView];
self.userInfoView = userInfoView; self.userInfoView = userInfoView;
/*
UIView *scoreTaskEvaluateView = [UIView new]; UIView *scoreTaskEvaluateView = [UIView new];
[self addSubview:scoreTaskEvaluateView]; [self addSubview:scoreTaskEvaluateView];
self.scoreTaskEvaluateView = scoreTaskEvaluateView; self.scoreTaskEvaluateView = scoreTaskEvaluateView;
[scoreTaskEvaluateView debugViewShowBorder];
UIButton *dailyTaskBtn = [self btnWithDKImagePicker:DKImagePickerWithNames(@"btn_person_meirirenwu", @"dk_btn_person_meirirenwu", @"btn_person_meirirenwu") tag:1]; UIButton *dailyTaskBtn = [self btnWithDKImagePicker:DKImagePickerWithNames(@"btn_person_meirirenwu", @"dk_btn_person_meirirenwu", @"btn_person_meirirenwu") tag:1];
UIButton *myScoreBtn = [self btnWithDKImagePicker:DKImagePickerWithNames(@"btn_person_wodejifen", @"dk_btn_person_wodejifen", @"btn_person_wodejifen") tag:2]; UIButton *myScoreBtn = [self btnWithDKImagePicker:DKImagePickerWithNames(@"btn_person_wodejifen", @"dk_btn_person_wodejifen", @"btn_person_wodejifen") tag:2];
*/
[self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) { [self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.equalTo(self); make.width.equalTo(self);
make.height.equalTo(@172); make.height.equalTo(@172);
make.top.left.right.equalTo(self); make.top.left.right.equalTo(self);
}]; }];
/*
[self.scoreTaskEvaluateView mas_makeConstraints:^(MASConstraintMaker *make) { [self.scoreTaskEvaluateView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.equalTo(self); make.width.equalTo(self);
make.top.equalTo(self.userInfoView.mas_bottom); make.top.equalTo(self.userInfoView.mas_bottom);
...@@ -137,6 +149,7 @@ ...@@ -137,6 +149,7 @@
[self.reportReviewsView mas_makeConstraints:^(MASConstraintMaker *make) { [self.reportReviewsView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.openAIBtn); make.edges.equalTo(self.openAIBtn);
}]; }];
*/
UILabel *meLab = [UILabel dkLabWithText:@"我的" font:BoldFont(24.0)]; UILabel *meLab = [UILabel dkLabWithText:@"我的" font:BoldFont(24.0)];
[self.userInfoView addSubview:meLab]; [self.userInfoView addSubview:meLab];
...@@ -181,7 +194,7 @@ ...@@ -181,7 +194,7 @@
}]; }];
// 更新布局 // 更新布局
[self.scoreTaskEvaluateView layoutIfNeeded]; // [self.scoreTaskEvaluateView layoutIfNeeded];
[self layoutIfNeeded]; [self layoutIfNeeded];
[self updateUserView]; [self updateUserView];
...@@ -189,141 +202,141 @@ ...@@ -189,141 +202,141 @@
// 监听用户数据更新通知 // 监听用户数据更新通知
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateUserView) name:HasUpdateUserDataNoti object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateUserView) name:HasUpdateUserDataNoti object:nil];
// 监听用户开启AI睡眠教练 // 监听用户开启AI睡眠教练
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(monitorAIStartNoti) name:NeedUpdateStartAI object:nil]; // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(monitorAIStartNoti) name:NeedUpdateStartAI object:nil];
} }
return self; return self;
} }
- (void)dealloc { - (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self name:HasUpdateUserDataNoti object:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self name:HasUpdateUserDataNoti object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:NeedUpdateStartAI object:nil]; // [[NSNotificationCenter defaultCenter] removeObserver:self name:NeedUpdateStartAI object:nil];
} }
#pragma mark - lazy #pragma mark - lazy
- (UIButton *)openAIBtn { //- (UIButton *)openAIBtn {
if (!_openAIBtn) { // if (!_openAIBtn) {
_openAIBtn = [UIButton new]; // _openAIBtn = [UIButton new];
_openAIBtn.hidden = YES; // _openAIBtn.hidden = YES;
[_openAIBtn dk_setImage:DKImagePickerWithNames(@"btn_person_kaitong", @"dk_btn_person_kaitong", @"btn_person_kaitong") forState:UIControlStateNormal]; // [_openAIBtn dk_setImage:DKImagePickerWithNames(@"btn_person_kaitong", @"dk_btn_person_kaitong", @"btn_person_kaitong") forState:UIControlStateNormal];
[_openAIBtn.imageView setContentMode:UIViewContentModeScaleAspectFill]; // [_openAIBtn.imageView setContentMode:UIViewContentModeScaleAspectFill];
_openAIBtn.contentHorizontalAlignment= UIControlContentHorizontalAlignmentFill; // _openAIBtn.contentHorizontalAlignment= UIControlContentHorizontalAlignmentFill;
_openAIBtn.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; // _openAIBtn.contentVerticalAlignment = UIControlContentVerticalAlignmentFill;
_openAIBtn.tag = 3; // _openAIBtn.tag = 3;
[_openAIBtn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside]; // [_openAIBtn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside];
[self.scoreTaskEvaluateView addSubview:_openAIBtn]; // [self.scoreTaskEvaluateView addSubview:_openAIBtn];
//
UILabel *titleLab = [UILabel labWithText:@"开通AI睡眠教练享专业报告与测评" font:BoldFont(14.0) fit:YES]; // UILabel *titleLab = [UILabel labWithText:@"开通AI睡眠教练享专业报告与测评" font:BoldFont(14.0) fit:YES];
titleLab.dk_textColorPicker = DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite); // titleLab.dk_textColorPicker = DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite);
[_openAIBtn addSubview:titleLab]; // [_openAIBtn addSubview:titleLab];
[titleLab mas_makeConstraints:^(MASConstraintMaker *make) { // [titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(_openAIBtn).offset(12); // make.left.mas_equalTo(_openAIBtn).offset(12);
make.centerY.equalTo(_openAIBtn); // make.centerY.equalTo(_openAIBtn);
}]; // }];
//
UILabel *openLab = [UILabel labWithText:@"去开通" textColor:DSWhite font:BoldFont(12.0)]; // UILabel *openLab = [UILabel labWithText:@"去开通" textColor:DSWhite font:BoldFont(12.0)];
openLab.textAlignment = NSTextAlignmentCenter; // openLab.textAlignment = NSTextAlignmentCenter;
[openLab cornerRadius:12.0]; // [openLab cornerRadius:12.0];
openLab.backgroundColor = BrandColor; // openLab.backgroundColor = BrandColor;
[_openAIBtn addSubview:openLab]; // [_openAIBtn addSubview:openLab];
[openLab mas_makeConstraints:^(MASConstraintMaker *make) { // [openLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(_openAIBtn).offset(-12); // make.right.equalTo(_openAIBtn).offset(-12);
make.centerY.equalTo(_openAIBtn); // make.centerY.equalTo(_openAIBtn);
make.size.mas_equalTo(CGSizeMake(76, 24)); // make.size.mas_equalTo(CGSizeMake(76, 24));
}]; // }];
} // }
return _openAIBtn; // return _openAIBtn;
} //}
//
- (UIView *)reportReviewsView { //- (UIView *)reportReviewsView {
if (!_reportReviewsView) { // if (!_reportReviewsView) {
_reportReviewsView = [UIView new]; // _reportReviewsView = [UIView new];
_reportReviewsView.dk_backgroundColorPicker = DKColorPickerWithColors(DSWhite, ColorFromHex(0x2A314B), DSWhite); // _reportReviewsView.dk_backgroundColorPicker = DKColorPickerWithColors(DSWhite, ColorFromHex(0x2A314B), DSWhite);
[_reportReviewsView cornerRadius:12.0]; // [_reportReviewsView cornerRadius:12.0];
[self.scoreTaskEvaluateView addSubview:_reportReviewsView]; // [self.scoreTaskEvaluateView addSubview:_reportReviewsView];
//
UIButton *reportBtn = [UIButton btnWithTitle:@"我的睡眠报告" font:BoldFont(15.0)]; // UIButton *reportBtn = [UIButton btnWithTitle:@"我的睡眠报告" font:BoldFont(15.0)];
reportBtn.tag = 4; // reportBtn.tag = 4;
reportBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 4, 0, 0); // reportBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 4, 0, 0);
[reportBtn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside]; // [reportBtn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside];
[reportBtn dk_setTitleColorPicker:DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite) forState:UIControlStateNormal]; // [reportBtn dk_setTitleColorPicker:DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite) forState:UIControlStateNormal];
[reportBtn dk_setImage:DKImagePickerWithNames(@"sleep_report", @"dk_sleep_report", @"sleep_report") forState:UIControlStateNormal]; // [reportBtn dk_setImage:DKImagePickerWithNames(@"sleep_report", @"dk_sleep_report", @"sleep_report") forState:UIControlStateNormal];
[_reportReviewsView addSubview:reportBtn]; // [_reportReviewsView addSubview:reportBtn];
//
UIView *line = [UIView new]; // UIView *line = [UIView new];
line.dk_backgroundColorPicker = DKColorPickerWithColors(DivideLineColor, DarkColor, DSWhite); // line.dk_backgroundColorPicker = DKColorPickerWithColors(DivideLineColor, DarkColor, DSWhite);
[_reportReviewsView addSubview:line]; // [_reportReviewsView addSubview:line];
//
UIButton *reviewBtn = [UIButton btnWithTitle:@"我的睡眠测评" font:BoldFont(15.0)]; // UIButton *reviewBtn = [UIButton btnWithTitle:@"我的睡眠测评" font:BoldFont(15.0)];
reviewBtn.tag = 5; // reviewBtn.tag = 5;
reviewBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 4, 0, 0); // reviewBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 4, 0, 0);
[reviewBtn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside]; // [reviewBtn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside];
[reviewBtn dk_setTitleColorPicker:DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite) forState:UIControlStateNormal]; // [reviewBtn dk_setTitleColorPicker:DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite) forState:UIControlStateNormal];
[reviewBtn dk_setImage:DKImagePickerWithNames(@"sleep_review", @"dk_sleep_review", @"sleep_review") forState:UIControlStateNormal]; // [reviewBtn dk_setImage:DKImagePickerWithNames(@"sleep_review", @"dk_sleep_review", @"sleep_review") forState:UIControlStateNormal];
[_reportReviewsView addSubview:reviewBtn]; // [_reportReviewsView addSubview:reviewBtn];
//
[reportBtn mas_makeConstraints:^(MASConstraintMaker *make) { // [reportBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.bottom.equalTo(_reportReviewsView); // make.top.left.bottom.equalTo(_reportReviewsView);
make.right.equalTo(reviewBtn.mas_left); // make.right.equalTo(reviewBtn.mas_left);
}]; // }];
[reviewBtn mas_makeConstraints:^(MASConstraintMaker *make) { // [reviewBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.right.bottom.equalTo(_reportReviewsView); // make.top.right.bottom.equalTo(_reportReviewsView);
make.size.equalTo(reportBtn); // make.size.equalTo(reportBtn);
}]; // }];
[line mas_makeConstraints:^(MASConstraintMaker *make) { // [line mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(_reportReviewsView).offset(11); // make.top.equalTo(_reportReviewsView).offset(11);
make.bottom.equalTo(_reportReviewsView).offset(-11); // make.bottom.equalTo(_reportReviewsView).offset(-11);
make.width.equalTo(@1); // make.width.equalTo(@1);
make.center.equalTo(_reportReviewsView); // make.center.equalTo(_reportReviewsView);
}]; // }];
} // }
return _reportReviewsView; // return _reportReviewsView;
} //}
#pragma mark - builders #pragma mark - builders
- (UIButton *)btnWithDKImagePicker:(DKImagePicker)imgPicker tag:(NSInteger)tag { //- (UIButton *)btnWithDKImagePicker:(DKImagePicker)imgPicker tag:(NSInteger)tag {
UIButton *btn = [UIButton new]; // UIButton *btn = [UIButton new];
btn.tag = tag; // btn.tag = tag;
[btn dk_setImage:imgPicker forState:UIControlStateNormal]; // [btn dk_setImage:imgPicker forState:UIControlStateNormal];
[btn.imageView setContentMode:UIViewContentModeScaleAspectFill]; // [btn.imageView setContentMode:UIViewContentModeScaleAspectFill];
btn.contentHorizontalAlignment= UIControlContentHorizontalAlignmentFill; // btn.contentHorizontalAlignment= UIControlContentHorizontalAlignmentFill;
btn.contentVerticalAlignment = UIControlContentVerticalAlignmentFill; // btn.contentVerticalAlignment = UIControlContentVerticalAlignmentFill;
[btn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside]; // [btn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside];
[self.scoreTaskEvaluateView addSubview:btn]; // [self.scoreTaskEvaluateView addSubview:btn];
//
UILabel *titleLab = [UILabel labWithText:(tag == 1 ? @"每日任务" : @"我的积分") font:BoldFont(15.0) fit:YES]; // UILabel *titleLab = [UILabel labWithText:(tag == 1 ? @"每日任务" : @"我的积分") font:BoldFont(15.0) fit:YES];
titleLab.dk_textColorPicker = DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite); // titleLab.dk_textColorPicker = DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite);
[btn addSubview:titleLab]; // [btn addSubview:titleLab];
//
[titleLab mas_makeConstraints:^(MASConstraintMaker *make) { // [titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(btn).offset(12); // make.left.equalTo(btn).offset(12);
make.top.equalTo(btn).offset(10); // make.top.equalTo(btn).offset(10);
}]; // }];
//
if (tag == 1) { // if (tag == 1) {
UILabel *tipsLab = [UILabel labWithText:@"做任务攒积分 >" textColor:BrandColor font:SysFont(8.0)]; // UILabel *tipsLab = [UILabel labWithText:@"做任务攒积分 >" textColor:BrandColor font:SysFont(8.0)];
tipsLab.textAlignment = NSTextAlignmentCenter; // tipsLab.textAlignment = NSTextAlignmentCenter;
[tipsLab cornerRadius:8.0]; // [tipsLab cornerRadius:8.0];
tipsLab.layer.borderWidth = .5; // tipsLab.layer.borderWidth = .5;
tipsLab.layer.borderColor = BrandColor.CGColor; // tipsLab.layer.borderColor = BrandColor.CGColor;
[btn addSubview:tipsLab]; // [btn addSubview:tipsLab];
[tipsLab mas_makeConstraints:^(MASConstraintMaker *make) { // [tipsLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(titleLab); // make.left.equalTo(titleLab);
make.bottom.equalTo(btn).offset(-10); // make.bottom.equalTo(btn).offset(-10);
make.size.mas_equalTo(CGSizeMake(65, 15)); // make.size.mas_equalTo(CGSizeMake(65, 15));
}]; // }];
} else { // } else {
UILabel *scoreCountLab = [UILabel labWithFont:SysFont(12.0)]; // UILabel *scoreCountLab = [UILabel labWithFont:SysFont(12.0)];
scoreCountLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, DkTitleColor, DSWhite); // scoreCountLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, DkTitleColor, DSWhite);
[btn addSubview:scoreCountLab]; // [btn addSubview:scoreCountLab];
self.scoreCountLab = scoreCountLab; // self.scoreCountLab = scoreCountLab;
[scoreCountLab mas_makeConstraints:^(MASConstraintMaker *make) { // [scoreCountLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(titleLab); // make.left.equalTo(titleLab);
make.bottom.equalTo(btn).offset(-10); // make.bottom.equalTo(btn).offset(-10);
make.right.equalTo(btn).offset(-79); // make.right.equalTo(btn).offset(-79);
}]; // }];
} // }
//
return btn; // return btn;
} //}
@end @end
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!