Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
陈高翔
/
DreamSleep-iOS
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 174f7448
由
cgx
编写于
2022-10-26 16:06:07 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
睡眠故事处理未登录逻辑
1 个父辈
39b8f0be
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
21 行增加
和
11 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
DreamSleep/DreamSleep/Class/HomeModule/Home/View/HomeHeaderView.m
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
查看文件 @
174f744
...
@@ -3221,7 +3221,7 @@
...
@@ -3221,7 +3221,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 = Manual;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION =
1
;
CURRENT_PROJECT_VERSION =
2
;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW;
DEVELOPMENT_TEAM = 4NDZ6UX8PW;
...
@@ -3304,7 +3304,7 @@
...
@@ -3304,7 +3304,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
;
DEFINES_MODULE = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW;
DEVELOPMENT_TEAM = 4NDZ6UX8PW;
ENABLE_BITCODE = NO;
ENABLE_BITCODE = NO;
...
@@ -3447,7 +3447,7 @@
...
@@ -3447,7 +3447,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
;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW;
DEVELOPMENT_TEAM = 4NDZ6UX8PW;
...
...
DreamSleep/DreamSleep/Class/HomeModule/Home/View/HomeHeaderView.m
查看文件 @
174f744
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
self
.
audioDescLab
.
text
=
storyModel
.
audio
.
audio_desc
;
self
.
audioDescLab
.
text
=
storyModel
.
audio
.
audio_desc
;
self
.
playTimeLab
.
text
=
storyModel
.
audio
.
play_time
;
self
.
playTimeLab
.
text
=
storyModel
.
audio
.
play_time
;
self
.
playCountLab
.
text
=
[
NSString
stringWithFormat
:
@"%d次"
,
storyModel
.
audio
.
play_count
];
self
.
playCountLab
.
text
=
[
NSString
stringWithFormat
:
@"%d次"
,
storyModel
.
audio
.
play_count
];
if
(
model
)
{
if
(
model
)
{
UIColor
*
dayBgColor
=
[
UIColor
colorWithHexStr
:
storyModel
.
audio
.
day_bg_color
];
UIColor
*
dayBgColor
=
[
UIColor
colorWithHexStr
:
storyModel
.
audio
.
day_bg_color
];
UIColor
*
nightBgColor
=
[
UIColor
colorWithHexStr
:
storyModel
.
audio
.
night_bg_color
];
UIColor
*
nightBgColor
=
[
UIColor
colorWithHexStr
:
storyModel
.
audio
.
night_bg_color
];
...
@@ -191,17 +191,27 @@
...
@@ -191,17 +191,27 @@
#pragma mark - UIScrollViewDelegate
#pragma mark - UIScrollViewDelegate
-
(
void
)
scrollViewDidEndDragging
:
(
UIScrollView
*
)
scrollView
willDecelerate
:
(
BOOL
)
decelerate
{
-
(
void
)
scrollViewDidEndDragging
:
(
UIScrollView
*
)
scrollView
willDecelerate
:
(
BOOL
)
decelerate
{
if
(
scrollView
.
contentOffset
.
x
>=
30
)
{
if
(
scrollView
.
contentOffset
.
x
>=
30
)
{
dispatch_after
(
dispatch_time
(
DISPATCH_TIME_NOW
,
(
int64_t
)(
1
.
0
*
NSEC_PER_SEC
)),
dispatch_get_main_queue
(),
^
{
if
([
LoginUtils
getUserLoginData
])
{
[
self
.
ds_viewController
.
navigationController
pushViewController
:[
SleepStoryController
new
]
animated
:
YES
];
dispatch_after
(
dispatch_time
(
DISPATCH_TIME_NOW
,
(
int64_t
)(
1
.
0
*
NSEC_PER_SEC
)),
dispatch_get_main_queue
(),
^
{
});
[
self
.
ds_viewController
.
navigationController
pushViewController
:[
SleepStoryController
new
]
animated
:
YES
];
});
}
else
{
// 跳转到登录页面
[
LoginUtils
jumpToLoginControllerWithTarget
:
self
.
ds_viewController
];
}
}
}
}
}
#pragma private
#pragma private
-
(
void
)
playAction
{
-
(
void
)
playAction
{
StoryPlayController
*
playVC
=
[
StoryPlayController
new
];
if
([
LoginUtils
getUserLoginData
])
{
playVC
.
audioModel
=
self
.
audioModel
;
StoryPlayController
*
playVC
=
[
StoryPlayController
new
];
[
self
.
ds_viewController
presentViewController
:
playVC
animated
:
YES
completion
:
nil
];
playVC
.
audioModel
=
self
.
audioModel
;
[
self
.
ds_viewController
presentViewController
:
playVC
animated
:
YES
completion
:
nil
];
}
else
{
// 跳转到登录页面
[
LoginUtils
jumpToLoginControllerWithTarget
:
self
.
ds_viewController
];
}
}
}
#pragma mark - lazy
#pragma mark - lazy
...
@@ -270,7 +280,7 @@
...
@@ -270,7 +280,7 @@
bottomView
.
dk_backgroundColorPicker
=
DKColorPickerWithKey
(
CornerViewBG
);
bottomView
.
dk_backgroundColorPicker
=
DKColorPickerWithKey
(
CornerViewBG
);
[
tmpView
addSubview
:
bottomView
];
[
tmpView
addSubview
:
bottomView
];
self
.
bottomView
=
bottomView
;
self
.
bottomView
=
bottomView
;
self
.
audioIV
=
[[
UIImageView
alloc
]
initWithImage
:[
UIImage
defaultPlaceholderWithSize
:
CGSizeMake
(
76
,
90
)]];
self
.
audioIV
=
[[
UIImageView
alloc
]
initWithImage
:[
UIImage
defaultPlaceholderWithSize
:
CGSizeMake
(
76
,
90
)]];
[
self
.
audioIV
cornerRadius
:
12
];
[
self
.
audioIV
cornerRadius
:
12
];
self
.
audioIV
.
contentMode
=
UIViewContentModeScaleAspectFit
;
self
.
audioIV
.
contentMode
=
UIViewContentModeScaleAspectFit
;
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论