Skip to content

陈高翔 / DreamSleep-iOS

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

我的页面新增开启AI睡眠报告和评测，优化点击区域

1 个父辈 4086eb77
内嵌 并排
正在显示 4 个修改的文件 包含 205 行增加 和 167 行删除
DreamSleep/DreamSleep/Class/AISleepModule/Controller/AISleepCoachController.m
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
[super viewDidLoad]; [super viewDidLoad];
self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG); self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
// 创建WKWebView对象，添加到界面(storyboard没有控件) // 创建WKWebView对象，添加到界面(storyboard没有控件)
[self.view addSubview:self.aiWebView]; [self.view addSubview:self.aiWebView];
[self.view addSubview:self.progressView]; [self.view addSubview:self.progressView];
...@@ -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/BreathingMethod/BreatheController.m
...@@ -199,6 +199,7 @@ ...@@ -199,6 +199,7 @@
self.minuteLb.hidden = YES; self.minuteLb.hidden = YES;
self.startRelaxBtn.hidden = YES; self.startRelaxBtn.hidden = YES;
self.minutePickerView.hidden = YES; self.minutePickerView.hidden = YES;
self.zoomView.animationProgress = 0.0;
[self.zoomView play]; [self.zoomView play];
self.zoomView.hidden = NO; self.zoomView.hidden = NO;
......
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];
...@@ -49,18 +49,21 @@ ...@@ -49,18 +49,21 @@
make.centerY.equalTo(self.portraitIV); make.centerY.equalTo(self.portraitIV);
}]; }];
// [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.top.equalTo(self.portraitIV).offset(4);
// }]; // }];
// [self.levelIV mas_makeConstraints:^(MASConstraintMaker *make) { // [self.levelIV mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.equalTo(self.titleLab).offset(-8); // make.left.equalTo(self.titleLab).offset(-8);
// make.top.equalTo(self.titleLab.mas_bottom).offset(4); // make.top.equalTo(self.titleLab.mas_bottom).offset(4);
// make.size.mas_equalTo(CGSizeMake(95, 35)); // make.size.mas_equalTo(CGSizeMake(95, 35));
// }]; // }];
// self.openAIBtn.hidden = model.is_access == 1; // self.openAIBtn.hidden = model.is_access == 1;
// self.reportReviewsView.hidden = !self.openAIBtn.hidden; // self.reportReviewsView.hidden = !self.openAIBtn.hidden;
// self.scoreCountLab.text = [NSString stringWithFormat:@"我的积分：%d", model.total_points]; // self.scoreCountLab.text = [NSString stringWithFormat:@"我的积分：%d", model.total_points];
self.openAIBtn.hidden = model.is_access == 1;
self.reportReviewsView.hidden = !self.openAIBtn.hidden;
} else { } else {
self.portraitIV.image = [UIImage imageNamed:@"basicPlaceholder"]; self.portraitIV.image = [UIImage imageNamed:@"basicPlaceholder"];
self.titleLab.text = @"注册/登录"; self.titleLab.text = @"注册/登录";
...@@ -72,9 +75,12 @@ ...@@ -72,9 +75,12 @@
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 = @"我的积分";
self.openAIBtn.hidden = NO;
self.reportReviewsView.hidden = !self.openAIBtn.hidden;
} }
} }
...@@ -89,10 +95,10 @@ ...@@ -89,10 +95,10 @@
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) { // [self mas_makeConstraints:^(MASConstraintMaker *make) {
// make.height.greaterThanOrEqualTo(@338); // make.height.greaterThanOrEqualTo(@338);
// make.width.equalTo(@(kScreenWidth)); // make.width.equalTo(@(kScreenWidth));
// }]; // }];
[self mas_makeConstraints:^(MASConstraintMaker *make) { [self mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.greaterThanOrEqualTo(@196); make.height.greaterThanOrEqualTo(@196);
make.width.equalTo(@(kScreenWidth)); make.width.equalTo(@(kScreenWidth));
...@@ -102,97 +108,130 @@ ...@@ -102,97 +108,130 @@
[self addSubview:userInfoView]; [self addSubview:userInfoView];
self.userInfoView = userInfoView; self.userInfoView = userInfoView;
/*
UIView *scoreTaskEvaluateView = [UIView new];
[self addSubview:scoreTaskEvaluateView];
self.scoreTaskEvaluateView = scoreTaskEvaluateView;
[scoreTaskEvaluateView debugViewShowBorder];
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];
*/
[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) {
make.width.equalTo(self);
make.top.equalTo(self.userInfoView.mas_bottom);
make.left.right.equalTo(self);
make.bottom.equalTo(self).priorityHigh();
}];
CGFloat btn_width = (kScreenWidth - 30 - 13)/2.0;
CGFloat btn_height = 62*btn_width/166.0;
[dailyTaskBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.scoreTaskEvaluateView).offset(15);
make.top.equalTo(self.scoreTaskEvaluateView).offset(19);
make.right.equalTo(myScoreBtn.mas_left).offset(-13);
make.height.equalTo(@(btn_height));
make.size.equalTo(myScoreBtn);
}];
[myScoreBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.scoreTaskEvaluateView).offset(-15);
make.top.equalTo(dailyTaskBtn);
}];
CGFloat ai_btn_width = kScreenWidth - 30;
CGFloat ai_btn_height = 62*ai_btn_width/345.0;
[self.openAIBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.scoreTaskEvaluateView).offset(15);
make.right.equalTo(self.scoreTaskEvaluateView).offset(-15);
make.top.equalTo(dailyTaskBtn.mas_bottom).offset(18);
make.height.equalTo(@(ai_btn_height));
make.bottom.equalTo(self.scoreTaskEvaluateView).offset(-19);
}];
[self.reportReviewsView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.openAIBtn);
}];
*/
UILabel *meLab = [UILabel dkLabWithText:@"我的" font:BoldFont(24.0)]; UILabel *meLab = [UILabel dkLabWithText:@"我的" font:BoldFont(24.0)];
CGFloat meH = [NSString getHeightWithText:@"我的" withFont:BoldFont(24.0) withMaxWidth:100];
[self.userInfoView addSubview:meLab]; [self.userInfoView addSubview:meLab];
self.meLab = meLab; self.meLab = meLab;
UIButton *bgBtn = [UIButton new];
[bgBtn addTarget:self action:@selector(modifyAction) forControlEvents:UIControlEventTouchUpInside];
[self.userInfoView addSubview:bgBtn];
UIImageView *portraitIV = [UIImageView new]; UIImageView *portraitIV = [UIImageView new];
[portraitIV cornerRadius:30]; [portraitIV cornerRadius:30];
portraitIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1.0, .5, .5); portraitIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1.0, .5, .5);
[self.userInfoView addSubview:portraitIV]; [bgBtn addSubview:portraitIV];
self.portraitIV = portraitIV; self.portraitIV = portraitIV;
UILabel *titleLab = [UILabel dkLabWithFont:BoldFont(16.0)]; UILabel *titleLab = [UILabel dkLabWithFont:BoldFont(16.0)];
[self.userInfoView addSubview:titleLab]; [bgBtn addSubview:titleLab];
self.titleLab = titleLab; self.titleLab = titleLab;
UIImageView *levelIV = [UIImageView new]; UIImageView *levelIV = [UIImageView new];
[self.userInfoView addSubview:levelIV]; [bgBtn addSubview:levelIV];
self.levelIV = levelIV; self.levelIV = levelIV;
UIButton *modifyBtn = [UIButton btnWithTitle:@"点击修改信息" font:SysFont(12)]; UIButton *modifyBtn = [UIButton btnWithTitle:@"点击修改信息" font:SysFont(12)];
modifyBtn.userInteractionEnabled = NO;
[modifyBtn dk_setTitleColorPicker:DKColorPickerWithColors(BrandColor, ColorFromHex(0x45A4B5), DSWhite) forState:UIControlStateNormal]; [modifyBtn dk_setTitleColorPicker:DKColorPickerWithColors(BrandColor, ColorFromHex(0x45A4B5), DSWhite) forState:UIControlStateNormal];
[modifyBtn dk_setImage:DKImagePickerWithNames(@"ic_person_more_normal", @"dk_ic_person_more_normal", @"ic_person_more_normal") forState:UIControlStateNormal]; [modifyBtn dk_setImage:DKImagePickerWithNames(@"ic_person_more_normal", @"dk_ic_person_more_normal", @"ic_person_more_normal") forState:UIControlStateNormal];
[modifyBtn adjustLayoutWithType:UIButtonLayoutTypeLeftTitleRightImage midSpace:4 sizeToFit:YES]; [modifyBtn adjustLayoutWithType:UIButtonLayoutTypeLeftTitleRightImage midSpace:4 sizeToFit:YES];
CGFloat width = modifyBtn.titleLabel.width + 30 + 4; CGFloat width = modifyBtn.titleLabel.width + 30 + 4;
[modifyBtn addTarget:self action:@selector(modifyAction) forControlEvents:UIControlEventTouchUpInside]; [bgBtn addSubview:modifyBtn];
[self.userInfoView addSubview:modifyBtn];
self.modifyBtn = modifyBtn; self.modifyBtn = modifyBtn;
[self.meLab mas_makeConstraints:^(MASConstraintMaker *make) { [self.meLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self).offset(kStatusBarHeight + 17); make.top.equalTo(self).offset(kStatusBarHeight + 17);
make.left.equalTo(self).offset(15); make.left.equalTo(self).offset(15);
make.height.equalTo(@(meH));
}]; }];
[self.portraitIV mas_makeConstraints:^(MASConstraintMaker *make) { [bgBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.meLab.mas_bottom).offset(30); make.top.equalTo(self.meLab.mas_bottom).offset(30);
make.left.right.bottom.equalTo(self.userInfoView);
}];
[self.portraitIV mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(bgBtn);
make.left.equalTo(self).offset(23); make.left.equalTo(self).offset(23);
make.width.height.equalTo(@60); make.width.height.equalTo(@60);
}]; }];
[self.modifyBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.modifyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self).offset(-23); make.right.equalTo(bgBtn).offset(-23);
make.centerY.equalTo(self.portraitIV); make.centerY.equalTo(self.portraitIV);
make.width.equalTo(@(width)); make.width.equalTo(@(width));
}]; }];
UIView *scoreTaskEvaluateView = [UIView new];
[self addSubview:scoreTaskEvaluateView];
self.scoreTaskEvaluateView = scoreTaskEvaluateView;
[self.scoreTaskEvaluateView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.equalTo(self);
make.top.equalTo(self.userInfoView.mas_bottom);
make.left.right.equalTo(self);
make.bottom.equalTo(self).priorityHigh();
}];
/*
UIView *scoreTaskEvaluateView = [UIView new];
[self addSubview:scoreTaskEvaluateView];
self.scoreTaskEvaluateView = scoreTaskEvaluateView;
[scoreTaskEvaluateView debugViewShowBorder];
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];
[self.scoreTaskEvaluateView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.equalTo(self);
make.top.equalTo(self.userInfoView.mas_bottom);
make.left.right.equalTo(self);
make.bottom.equalTo(self).priorityHigh();
}];
CGFloat btn_width = (kScreenWidth - 30 - 13)/2.0;
CGFloat btn_height = 62*btn_width/166.0;
[dailyTaskBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.scoreTaskEvaluateView).offset(15);
make.top.equalTo(self.scoreTaskEvaluateView).offset(19);
make.right.equalTo(myScoreBtn.mas_left).offset(-13);
make.height.equalTo(@(btn_height));
make.size.equalTo(myScoreBtn);
}];
[myScoreBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.scoreTaskEvaluateView).offset(-15);
make.top.equalTo(dailyTaskBtn);
}];
CGFloat ai_btn_width = kScreenWidth - 30;
CGFloat ai_btn_height = 62*ai_btn_width/345.0;
[self.openAIBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.scoreTaskEvaluateView).offset(15);
make.right.equalTo(self.scoreTaskEvaluateView).offset(-15);
make.top.equalTo(dailyTaskBtn.mas_bottom).offset(18);
make.height.equalTo(@(ai_btn_height));
make.bottom.equalTo(self.scoreTaskEvaluateView).offset(-19);
}];
[self.reportReviewsView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.openAIBtn);
}];
*/
CGFloat ai_btn_width = kScreenWidth - 30;
CGFloat ai_btn_height = 62*ai_btn_width/345.0;
[self.openAIBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.scoreTaskEvaluateView).offset(15);
make.right.equalTo(self.scoreTaskEvaluateView).offset(-15);
make.top.equalTo(scoreTaskEvaluateView).offset(18);
make.height.equalTo(@(ai_btn_height));
make.bottom.equalTo(self.scoreTaskEvaluateView).offset(-18);
}];
[self.reportReviewsView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.openAIBtn);
}];
// 更新布局 // 更新布局
// [self.scoreTaskEvaluateView layoutIfNeeded]; // [self.scoreTaskEvaluateView layoutIfNeeded];
[self layoutIfNeeded]; [self layoutIfNeeded];
...@@ -202,95 +241,95 @@ ...@@ -202,95 +241,95 @@
// 监听用户数据更新通知 // 监听用户数据更新通知
[[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 {
......
DreamSleep/DreamSleep/Class/ProfileModule/Me/ProfileTableView.m
...@@ -144,9 +144,7 @@ ...@@ -144,9 +144,7 @@
self.tableHeaderView = self.profileHeaderView; self.tableHeaderView = self.profileHeaderView;
self.tableFooterView = self.footerView; self.tableFooterView = self.footerView;
self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
[self registerClass:[ProfileCell class] forCellReuseIdentifier:NSStringFromClass([ProfileCell class])]; [self registerClass:[ProfileCell class] forCellReuseIdentifier:NSStringFromClass([ProfileCell class])];
} }
return self; return self;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!