Commit 438fbb29 cgx

助眠音乐播放列表底部没有操作按钮

1 个父辈 d9fb03a7
...@@ -32,10 +32,6 @@ ...@@ -32,10 +32,6 @@
[self addSubview:self.cornerView]; [self addSubview:self.cornerView];
self.audioDescLab.text = model.audio_desc; self.audioDescLab.text = model.audio_desc;
// self.bgIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1.0, .5, .5);
// self.audioIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1.0, .5, .5);
} else { } else {
[self addSubview:self.maskView]; [self addSubview:self.maskView];
[self.maskView mas_makeConstraints:^(MASConstraintMaker *make) { [self.maskView mas_makeConstraints:^(MASConstraintMaker *make) {
......
...@@ -25,12 +25,16 @@ ...@@ -25,12 +25,16 @@
[self.view addSubview:self.audioListView]; [self.view addSubview:self.audioListView];
[self.view addSubview:self.dsNaviBar]; [self.view addSubview:self.dsNaviBar];
[self.view addSubview:self.dkBackBtn]; [self.view addSubview:self.dkBackBtn];
// 舒眠课程才有"开始第一节"、"登录解锁全部章节"按钮
if (self.courseType == CourseTypeSafe) {
[self.view addSubview:self.unlockBtn]; [self.view addSubview:self.unlockBtn];
[self.unlockBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.unlockBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.view); make.centerX.equalTo(self.view);
make.bottom.equalTo(self.view).offset(-52); make.bottom.equalTo(self.view).offset(-52);
make.size.mas_equalTo(CGSizeMake(155, 40)); make.size.mas_equalTo(CGSizeMake(155, 40));
}]; }];
}
self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG); self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
self.titleLab.text = self.courseModel.audio_name; self.titleLab.text = self.courseModel.audio_name;
...@@ -111,6 +115,7 @@ ...@@ -111,6 +115,7 @@
playerVC.currentIndex = index; playerVC.currentIndex = index;
playerVC.playAudios = [tmpArr copy]; playerVC.playAudios = [tmpArr copy];
playerVC.courseModel = self.courseModel; playerVC.courseModel = self.courseModel;
playerVC.courseType = self.courseType;
UINavigationController *naviVC = [[UINavigationController alloc] initWithRootViewController:playerVC]; UINavigationController *naviVC = [[UINavigationController alloc] initWithRootViewController:playerVC];
[self presentViewController:naviVC animated:YES completion:nil]; [self presentViewController:naviVC animated:YES completion:nil];
} }
......
...@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger currentIndex; @property (nonatomic, assign) NSInteger currentIndex;
/// 舒眠课程、助眠音乐列表点击进入详情页传递过来的 /// 舒眠课程、助眠音乐列表点击进入详情页传递过来的
@property (nonatomic, strong) CourseModel *courseModel; @property (nonatomic, strong) CourseModel *courseModel;
@property (nonatomic, assign) CourseType courseType;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
coureDetailVC.courseModel = self.courseModel; coureDetailVC.courseModel = self.courseModel;
coureDetailVC.playingIndex = self.audioStream.isPlaying ? self.currentIndex : -1; coureDetailVC.playingIndex = self.audioStream.isPlaying ? self.currentIndex : -1;
coureDetailVC.isFromPlayer = YES; coureDetailVC.isFromPlayer = YES;
coureDetailVC.courseType = self.courseType;
coureDetailVC.delegate = self; coureDetailVC.delegate = self;
[self.navigationController pushViewController:coureDetailVC animated:YES]; [self.navigationController pushViewController:coureDetailVC animated:YES];
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!