Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
陈高翔
/
DreamSleep-iOS
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 4583f834
由
cgx
编写于
2022-05-14 18:15:59 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
修复均衡呼吸法与4-7-8振动与文字不同步、舒眠课程播放按钮点击无反应、白噪音页面间距bug
1 个父辈
f1c2ed4b
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
8 行增加
和
7 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
DreamSleep/DreamSleep/Class/HomeModule/BreathingMethod/BreatheController.m
DreamSleep/DreamSleep/Class/HomeModule/Course/View/AudioCourseCell.m
DreamSleep/DreamSleep/Class/HomeModule/WhiteNoise/Controller/NoiseListController.m
DreamSleep/DreamSleep/Class/HomeModule/WhiteNoise/Model/NoiseDataManager.h
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
查看文件 @
4583f83
...
@@ -1902,7 +1902,7 @@
...
@@ -1902,7 +1902,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION =
1
;
CURRENT_PROJECT_VERSION =
2
;
DEVELOPMENT_TEAM = SPH85C3TWU;
DEVELOPMENT_TEAM = SPH85C3TWU;
EXCLUDED_ARCHS = "";
EXCLUDED_ARCHS = "";
FRAMEWORK_SEARCH_PATHS = (
FRAMEWORK_SEARCH_PATHS = (
...
@@ -1968,7 +1968,7 @@
...
@@ -1968,7 +1968,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION =
1
;
CURRENT_PROJECT_VERSION =
2
;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(inherited)",
...
@@ -2095,7 +2095,7 @@
...
@@ -2095,7 +2095,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION =
1
;
CURRENT_PROJECT_VERSION =
2
;
DEVELOPMENT_TEAM = 4NDZ6UX8PW;
DEVELOPMENT_TEAM = 4NDZ6UX8PW;
FRAMEWORK_SEARCH_PATHS = (
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(inherited)",
...
...
DreamSleep/DreamSleep/Class/HomeModule/BreathingMethod/BreatheController.m
查看文件 @
4583f83
...
@@ -174,7 +174,7 @@
...
@@ -174,7 +174,7 @@
-
(
void
)
timerAction
:
(
NSTimer
*
)
timer
{
-
(
void
)
timerAction
:
(
NSTimer
*
)
timer
{
self
.
playDuration
--
;
self
.
playDuration
--
;
if
(
self
.
playDuration
%
5
==
0
&&
self
.
playDuration
>=
0
)
{
if
(
self
.
playDuration
%
4
==
0
&&
self
.
playDuration
>=
0
)
{
AudioServicesPlaySystemSound
(
1520
);
AudioServicesPlaySystemSound
(
1520
);
}
}
if
(
self
.
playDuration
==
0
)
{
if
(
self
.
playDuration
==
0
)
{
...
...
DreamSleep/DreamSleep/Class/HomeModule/Course/View/AudioCourseCell.m
查看文件 @
4583f83
...
@@ -100,6 +100,7 @@
...
@@ -100,6 +100,7 @@
}];
}];
self
.
pleyerBtn
=
[
UIButton
new
];
self
.
pleyerBtn
=
[
UIButton
new
];
self
.
pleyerBtn
.
userInteractionEnabled
=
NO
;
[
self
.
bigView
addSubview
:
self
.
pleyerBtn
];
[
self
.
bigView
addSubview
:
self
.
pleyerBtn
];
[
self
.
pleyerBtn
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
[
self
.
pleyerBtn
mas_makeConstraints
:
^
(
MASConstraintMaker
*
make
)
{
make
.
right
.
equalTo
(
self
.
bigView
.
mas_right
).
offset
(
-
15
);
make
.
right
.
equalTo
(
self
.
bigView
.
mas_right
).
offset
(
-
15
);
...
...
DreamSleep/DreamSleep/Class/HomeModule/WhiteNoise/Controller/NoiseListController.m
查看文件 @
4583f83
...
@@ -115,9 +115,9 @@
...
@@ -115,9 +115,9 @@
#pragma mark - lazy
#pragma mark - lazy
-
(
UICollectionView
*
)
noiseAudioView
{
-
(
UICollectionView
*
)
noiseAudioView
{
if
(
!
_noiseAudioView
)
{
if
(
!
_noiseAudioView
)
{
CGFloat
space
=
(
kScreenWidth
-
240
-
66
)
/
3
.
0
;
CGFloat
space
=
(
kScreenWidth
-
240
-
40
)
/
3
.
0
;
UICollectionViewFlowLayout
*
layout
=
[[
UICollectionViewFlowLayout
alloc
]
init
];
UICollectionViewFlowLayout
*
layout
=
[[
UICollectionViewFlowLayout
alloc
]
init
];
layout
.
sectionInset
=
UIEdgeInsetsMake
(
15
,
33
,
0
,
33
);
layout
.
sectionInset
=
UIEdgeInsetsMake
(
15
,
20
,
0
,
20
);
layout
.
itemSize
=
CGSizeMake
(
60
,
53
);
layout
.
itemSize
=
CGSizeMake
(
60
,
53
);
layout
.
minimumLineSpacing
=
12
;
layout
.
minimumLineSpacing
=
12
;
layout
.
minimumInteritemSpacing
=
space
;
layout
.
minimumInteritemSpacing
=
space
;
...
...
DreamSleep/DreamSleep/Class/HomeModule/WhiteNoise/Model/NoiseDataManager.h
查看文件 @
4583f83
...
@@ -17,7 +17,7 @@ SingletonH(NoiseDataManager)
...
@@ -17,7 +17,7 @@ SingletonH(NoiseDataManager)
/// 选中的白噪音数据
/// 选中的白噪音数据
@property
(
nonatomic
,
strong
)
NSArray
*
playList
;
@property
(
nonatomic
,
strong
)
NSArray
*
playList
;
/// 停止
白噪音
/// 停止
所有白噪音播放
-
(
void
)
stopNoiseAudio
;
-
(
void
)
stopNoiseAudio
;
@end
@end
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论