Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
陈高翔
/
DreamSleep-iOS
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 4436c8ba
由
cgx
编写于
2022-06-20 09:17:26 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
修复选择完成白噪音之后并开始播放,切换到其他栏目就会被强制终止bug
1 个父辈
bfdcabe8
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
15 行增加
和
3 行删除
DreamSleep/DreamSleep/Basement/Utils/DSConstUtil.h
DreamSleep/DreamSleep/Basement/Utils/DSConstUtil.m
DreamSleep/DreamSleep/Class/AISleepModule/Controller/RelaxTrainController.m
DreamSleep/DreamSleep/Class/HomeModule/Course/Controller/CourseDetailController.m
DreamSleep/DreamSleep/Class/HomeModule/Course/Controller/LookAllController.m
DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
DreamSleep/DreamSleep/Class/HomeModule/Home/View/DsMiddleView.m
DreamSleep/DreamSleep/Basement/Utils/DSConstUtil.h
查看文件 @
4436c8b
...
@@ -31,6 +31,8 @@ FOUNDATION_EXTERN NSString * const WXLoginAuthNoti;
...
@@ -31,6 +31,8 @@ FOUNDATION_EXTERN NSString * const WXLoginAuthNoti;
FOUNDATION_EXTERN
NSString
*
const
HasUpdateUserDataNoti
;
FOUNDATION_EXTERN
NSString
*
const
HasUpdateUserDataNoti
;
// 刷新主页通知
// 刷新主页通知
FOUNDATION_EXTERN
NSString
*
const
NeedUpdateHomePage
;
FOUNDATION_EXTERN
NSString
*
const
NeedUpdateHomePage
;
// 需要暂停所有白噪音播放
FOUNDATION_EXTERN
NSString
*
const
NeedPauseAllNoise
;
// 首页白噪音播放列表变化通知
// 首页白噪音播放列表变化通知
FOUNDATION_EXTERN
NSString
*
const
NoisePlaylistHasChange
;
FOUNDATION_EXTERN
NSString
*
const
NoisePlaylistHasChange
;
// 首页白噪音定时器被点击通知
// 首页白噪音定时器被点击通知
...
...
DreamSleep/DreamSleep/Basement/Utils/DSConstUtil.m
查看文件 @
4436c8b
...
@@ -22,6 +22,7 @@ NSString * const ExpireTime2 = @"06:00:00";
...
@@ -22,6 +22,7 @@ NSString * const ExpireTime2 = @"06:00:00";
NSString
*
const
WXLoginAuthNoti
=
@"wxLoginAuthNoti"
;
NSString
*
const
WXLoginAuthNoti
=
@"wxLoginAuthNoti"
;
NSString
*
const
HasUpdateUserDataNoti
=
@"hasUpdateUserDataNoti"
;
NSString
*
const
HasUpdateUserDataNoti
=
@"hasUpdateUserDataNoti"
;
NSString
*
const
NeedUpdateHomePage
=
@"NeedUpdateHomePageNoti"
;
NSString
*
const
NeedUpdateHomePage
=
@"NeedUpdateHomePageNoti"
;
NSString
*
const
NeedPauseAllNoise
=
@"NeedPauseAllNoiseNoti"
;
NSString
*
const
NoisePlaylistHasChange
=
@"NoisePlaylistHasChangeNoti"
;
NSString
*
const
NoisePlaylistHasChange
=
@"NoisePlaylistHasChangeNoti"
;
NSString
*
const
NoiseTimingDidClick
=
@"NoiseTimingDidClickNoti"
;
NSString
*
const
NoiseTimingDidClick
=
@"NoiseTimingDidClickNoti"
;
NSString
*
const
ExitCoaxSleep
=
@"ExitCoaxSleepNoti"
;
NSString
*
const
ExitCoaxSleep
=
@"ExitCoaxSleepNoti"
;
...
...
DreamSleep/DreamSleep/Class/AISleepModule/Controller/RelaxTrainController.m
查看文件 @
4436c8b
...
@@ -57,6 +57,8 @@
...
@@ -57,6 +57,8 @@
}
}
}];
}];
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
NeedPauseAllNoise
object
:
nil
];
[
DataStatisticsUtil
event
:
RelaxTrain
attributes
:@{
@"data"
:
@"腹式放松法页面"
}];
[
DataStatisticsUtil
event
:
RelaxTrain
attributes
:@{
@"data"
:
@"腹式放松法页面"
}];
}
}
...
...
DreamSleep/DreamSleep/Class/HomeModule/Course/Controller/CourseDetailController.m
查看文件 @
4436c8b
...
@@ -51,6 +51,8 @@
...
@@ -51,6 +51,8 @@
// 监听息屏页面点击播放、上一首、下一首点击通知,用于更新当前播放列表正在播放的音频UI状态
// 监听息屏页面点击播放、上一首、下一首点击通知,用于更新当前播放列表正在播放的音频UI状态
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
updateListNoti
:
)
name
:
RemoteCommandCenterDidClick
object
:
nil
];
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
updateListNoti
:
)
name
:
RemoteCommandCenterDidClick
object
:
nil
];
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
NeedPauseAllNoise
object
:
nil
];
NSString
*
eventID
=
self
.
courseType
==
CourseTypeSafe
?
Meditation_Click
:
Relax_Music_Click
;
NSString
*
eventID
=
self
.
courseType
==
CourseTypeSafe
?
Meditation_Click
:
Relax_Music_Click
;
NSString
*
entranceName
=
self
.
courseType
==
CourseTypeSafe
?
@"首页-舒眠课程"
:
@"首页-助眠音乐"
;
NSString
*
entranceName
=
self
.
courseType
==
CourseTypeSafe
?
@"首页-舒眠课程"
:
@"首页-助眠音乐"
;
if
(
self
.
entrance
==
EntranceCourseList
)
{
if
(
self
.
entrance
==
EntranceCourseList
)
{
...
...
DreamSleep/DreamSleep/Class/HomeModule/Course/Controller/LookAllController.m
查看文件 @
4436c8b
...
@@ -34,6 +34,8 @@
...
@@ -34,6 +34,8 @@
[
self
.
view
addSubview
:
self
.
headView
];
[
self
.
view
addSubview
:
self
.
headView
];
[
self
.
view
addSubview
:
self
.
bodyView
];
[
self
.
view
addSubview
:
self
.
bodyView
];
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
NeedPauseAllNoise
object
:
nil
];
}
}
#pragma mark - 品牌模式
#pragma mark - 品牌模式
...
...
DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
查看文件 @
4436c8b
...
@@ -70,6 +70,8 @@
...
@@ -70,6 +70,8 @@
// 监听主页需要刷新数据通知
// 监听主页需要刷新数据通知
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
needUpdate
)
name
:
NeedUpdateHomePage
object
:
nil
];
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
needUpdate
)
name
:
NeedUpdateHomePage
object
:
nil
];
// 监听需要暂停所有白噪音
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
pauseAllNoise
)
name
:
NeedPauseAllNoise
object
:
nil
];
}
}
-
(
void
)
viewWillAppear
:
(
BOOL
)
animated
{
-
(
void
)
viewWillAppear
:
(
BOOL
)
animated
{
...
@@ -89,14 +91,13 @@
...
@@ -89,14 +91,13 @@
[
self
.
homeTV
.
headerView
controllerWillDisAppear
];
[
self
.
homeTV
.
headerView
controllerWillDisAppear
];
}
}
-
(
void
)
viewDidDisappear
:
(
BOOL
)
animated
{
-
(
void
)
pauseAllNoise
{
[
super
viewDidDisappear
:
animated
];
[[
NoisePlayerManager
sharedNoisePlayerManager
]
pauseAll
];
[[
NoisePlayerManager
sharedNoisePlayerManager
]
pauseAll
];
}
}
-
(
void
)
dealloc
{
-
(
void
)
dealloc
{
[[
NSNotificationCenter
defaultCenter
]
removeObserver
:
self
name
:
NeedUpdateHomePage
object
:
nil
];
[[
NSNotificationCenter
defaultCenter
]
removeObserver
:
self
name
:
NeedUpdateHomePage
object
:
nil
];
[[
NSNotificationCenter
defaultCenter
]
removeObserver
:
self
name
:
NeedPauseAllNoise
object
:
nil
];
}
}
#pragma mark - 先放大,再缩小
#pragma mark - 先放大,再缩小
...
...
DreamSleep/DreamSleep/Class/HomeModule/Home/View/DsMiddleView.m
查看文件 @
4436c8b
...
@@ -194,6 +194,8 @@
...
@@ -194,6 +194,8 @@
// 跳转到登录页面
// 跳转到登录页面
[
LoginUtils
jumpToLoginControllerWithTarget
:
self
.
ds_viewController
];
[
LoginUtils
jumpToLoginControllerWithTarget
:
self
.
ds_viewController
];
}
}
[[
NSNotificationCenter
defaultCenter
]
postNotificationName
:
NeedPauseAllNoise
object
:
nil
];
}
}
@end
@end
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论