Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
陈高翔
/
DreamSleep-iOS
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 438fbb29
由
cgx
编写于
2022-05-11 08:48:40 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
助眠音乐播放列表底部没有操作按钮
1 个父辈
d9fb03a7
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
13 行增加
和
10 行删除
DreamSleep/DreamSleep/Class/HomeModule/Home/AudioDetailHeaderView.m
DreamSleep/DreamSleep/Class/HomeModule/Home/CourseDetailController.m
DreamSleep/DreamSleep/Class/HomeModule/Home/MusicPlayerController.h
DreamSleep/DreamSleep/Class/HomeModule/Home/MusicPlayerController.m
DreamSleep/DreamSleep/Class/HomeModule/Home/AudioDetailHeaderView.m
查看文件 @
438fbb2
...
@@ -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
)
{
...
...
DreamSleep/DreamSleep/Class/HomeModule/Home/CourseDetailController.m
查看文件 @
438fbb2
...
@@ -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
];
[
self
.
view
addSubview
:
self
.
unlockBtn
];
// 舒眠课程才有"开始第一节"、"登录解锁全部章节"按钮
[
self
.
unlockBtn
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
if
(
self
.
courseType
==
CourseTypeSafe
)
{
make
.
centerX
.
equalTo
(
self
.
view
);
[
self
.
view
addSubview
:
self
.
unlockBtn
];
make
.
bottom
.
equalTo
(
self
.
view
).
offset
(
-
52
);
[
self
.
unlockBtn
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
size
.
mas_equalTo
(
CGSizeMake
(
155
,
40
));
make
.
centerX
.
equalTo
(
self
.
view
);
}];
make
.
bottom
.
equalTo
(
self
.
view
).
offset
(
-
52
);
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
];
}
}
...
...
DreamSleep/DreamSleep/Class/HomeModule/Home/MusicPlayerController.h
查看文件 @
438fbb2
...
@@ -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
DreamSleep/DreamSleep/Class/HomeModule/Home/MusicPlayerController.m
查看文件 @
438fbb2
...
@@ -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!
Cancel
请
注册
或
登录
后发表评论