Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 1765b8bf 由 cgx
选项

整理音频课程模块

1 个父辈 2c30dc06
内嵌 并排
正在显示 32 个修改的文件 包含 83 行增加 和 34 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -658,6 +658,7 @@ ...@@ -658,6 +658,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D0F808F72804204B0097899F /* Home */, D0F808F72804204B0097899F /* Home */,
D0A72E30282B4FE300EED7BE /* Course */,
D0F808FB280421160097899F /* FallAsleep */, D0F808FB280421160097899F /* FallAsleep */,
D0F808F628041FB60097899F /* BreathingMethod */, D0F808F628041FB60097899F /* BreathingMethod */,
); );
...@@ -897,6 +898,78 @@ ...@@ -897,6 +898,78 @@
path = SystemSet; path = SystemSet;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
D0A72E30282B4FE300EED7BE /* Course */ = {
isa = PBXGroup;
children = (
D0A72E32282B504C00EED7BE /* View */,
D0A72E33282B509400EED7BE /* Model */,
D0A72E31282B502B00EED7BE /* Controller */,
D0A72E34282B50A600EED7BE /* RequestModel */,
);
path = Course;
sourceTree = "<group>";
};
D0A72E31282B502B00EED7BE /* Controller */ = {
isa = PBXGroup;
children = (
D0D69ED1282360F100A0D5EB /* LookAllController.h */,
D0D69ED2282360F100A0D5EB /* LookAllController.m */,
D0D69ED428236E0800A0D5EB /* SafeSleepListController.h */,
D0D69ED528236E0800A0D5EB /* SafeSleepListController.m */,
D055BEC0282526B700BC11A4 /* CourseDetailController.h */,
D055BEC1282526B700BC11A4 /* CourseDetailController.m */,
D0F9AC522826563400FD7A3B /* MusicPlayerController.h */,
D0F9AC532826563400FD7A3B /* MusicPlayerController.m */,
);
path = Controller;
sourceTree = "<group>";
};
D0A72E32282B504C00EED7BE /* View */ = {
isa = PBXGroup;
children = (
D055BEC628252D8200BC11A4 /* AudioCourseCell.h */,
D055BEC728252D8200BC11A4 /* AudioCourseCell.m */,
D0F9AC5C282660CC00FD7A3B /* MusicPlayerView.h */,
D0F9AC5D282660CC00FD7A3B /* MusicPlayerView.m */,
D055BEB728250D3400BC11A4 /* CourseCollectionCell.h */,
D055BEB828250D3400BC11A4 /* CourseCollectionCell.m */,
D055BEC328252B8900BC11A4 /* AudioDetailHeaderView.h */,
D055BEC428252B8900BC11A4 /* AudioDetailHeaderView.m */,
);
path = View;
sourceTree = "<group>";
};
D0A72E33282B509400EED7BE /* Model */ = {
isa = PBXGroup;
children = (
D055BEBA28250E8F00BC11A4 /* CourseModel.h */,
D055BEBB28250E8F00BC11A4 /* CourseModel.m */,
D055BEC928252E4000BC11A4 /* SubAudioModel.h */,
D055BECA28252E4000BC11A4 /* SubAudioModel.m */,
D0506B1328051ED400229278 /* SafeSleepModel.h */,
D0506B1428051ED400229278 /* SafeSleepModel.m */,
);
path = Model;
sourceTree = "<group>";
};
D0A72E34282B50A600EED7BE /* RequestModel */ = {
isa = PBXGroup;
children = (
D0E660012807B5AE006562F2 /* SafeSleepRequestModel.h */,
D0E660002807B5AE006562F2 /* SafeSleepRequestModel.m */,
);
path = RequestModel;
sourceTree = "<group>";
};
D0A72E35282B516B00EED7BE /* RequestModel */ = {
isa = PBXGroup;
children = (
D0BE32E42814D42B006539BE /* HomeRequestModel.h */,
D0BE32E52814D42B006539BE /* HomeRequestModel.m */,
);
path = RequestModel;
sourceTree = "<group>";
};
D0B5EC9827F2D9DE003EDFE3 = { D0B5EC9827F2D9DE003EDFE3 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -943,6 +1016,8 @@ ...@@ -943,6 +1016,8 @@
D0B5ECD927F2F410003EDFE3 /* Utils */ = { D0B5ECD927F2F410003EDFE3 /* Utils */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D0AE1E3328281B6F008CEF27 /* TimerProxy.h */,
D0AE1E3428281B6F008CEF27 /* TimerProxy.m */,
D0C50B4427FD66FB00DC68F0 /* DSConstUtil.h */, D0C50B4427FD66FB00DC68F0 /* DSConstUtil.h */,
D0C50B4527FD66FB00DC68F0 /* DSConstUtil.m */, D0C50B4527FD66FB00DC68F0 /* DSConstUtil.m */,
D0B5ECC627F2E97A003EDFE3 /* MacroFuncUtil.h */, D0B5ECC627F2E97A003EDFE3 /* MacroFuncUtil.h */,
...@@ -1051,34 +1126,11 @@ ...@@ -1051,34 +1126,11 @@
D0F808F72804204B0097899F /* Home */ = { D0F808F72804204B0097899F /* Home */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D0874BBC2816E54000CECB3C /* ActivityPopup */,
D0F808FA280420DE0097899F /* Model */,
D0F808F9280420A30097899F /* View */, D0F808F9280420A30097899F /* View */,
D0F808FA280420DE0097899F /* Model */,
D0F808F82804208C0097899F /* Controller */, D0F808F82804208C0097899F /* Controller */,
D0D69ED1282360F100A0D5EB /* LookAllController.h */, D0874BBC2816E54000CECB3C /* ActivityPopup */,
D0D69ED2282360F100A0D5EB /* LookAllController.m */, D0A72E35282B516B00EED7BE /* RequestModel */,
D0D69ED428236E0800A0D5EB /* SafeSleepListController.h */,
D0D69ED528236E0800A0D5EB /* SafeSleepListController.m */,
D055BEC0282526B700BC11A4 /* CourseDetailController.h */,
D055BEC1282526B700BC11A4 /* CourseDetailController.m */,
D055BEB728250D3400BC11A4 /* CourseCollectionCell.h */,
D055BEB828250D3400BC11A4 /* CourseCollectionCell.m */,
D055BEBA28250E8F00BC11A4 /* CourseModel.h */,
D055BEBB28250E8F00BC11A4 /* CourseModel.m */,
D055BEC328252B8900BC11A4 /* AudioDetailHeaderView.h */,
D055BEC428252B8900BC11A4 /* AudioDetailHeaderView.m */,
D055BEC628252D8200BC11A4 /* AudioCourseCell.h */,
D055BEC728252D8200BC11A4 /* AudioCourseCell.m */,
D055BEC928252E4000BC11A4 /* SubAudioModel.h */,
D055BECA28252E4000BC11A4 /* SubAudioModel.m */,
D0F9AC522826563400FD7A3B /* MusicPlayerController.h */,
D0F9AC532826563400FD7A3B /* MusicPlayerController.m */,
D0F9AC5C282660CC00FD7A3B /* MusicPlayerView.h */,
D0F9AC5D282660CC00FD7A3B /* MusicPlayerView.m */,
D0AE1E3328281B6F008CEF27 /* TimerProxy.h */,
D0AE1E3428281B6F008CEF27 /* TimerProxy.m */,
D0E6F1FB28290128004150E5 /* TimingView.h */,
D0E6F1FC28290128004150E5 /* TimingView.m */,
); );
path = Home; path = Home;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1096,6 +1148,8 @@ ...@@ -1096,6 +1148,8 @@
D0F808F9280420A30097899F /* View */ = { D0F808F9280420A30097899F /* View */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D0E6F1FB28290128004150E5 /* TimingView.h */,
D0E6F1FC28290128004150E5 /* TimingView.m */,
D01814D327FFCCFA00583D4E /* HomeTableView.h */, D01814D327FFCCFA00583D4E /* HomeTableView.h */,
D01814D427FFCCFA00583D4E /* HomeTableView.m */, D01814D427FFCCFA00583D4E /* HomeTableView.m */,
D01814E027FFDBB800583D4E /* HomeHeaderView.h */, D01814E027FFDBB800583D4E /* HomeHeaderView.h */,
...@@ -1117,16 +1171,10 @@ ...@@ -1117,16 +1171,10 @@
children = ( children = (
D01814EC28002DC700583D4E /* HeaderDataModel.h */, D01814EC28002DC700583D4E /* HeaderDataModel.h */,
D01814ED28002DC700583D4E /* HeaderDataModel.m */, D01814ED28002DC700583D4E /* HeaderDataModel.m */,
D0506B1328051ED400229278 /* SafeSleepModel.h */,
D0506B1428051ED400229278 /* SafeSleepModel.m */,
D0E660012807B5AE006562F2 /* SafeSleepRequestModel.h */,
D0E660002807B5AE006562F2 /* SafeSleepRequestModel.m */,
D0DF90AC2814390000FC0F64 /* BannerModel.h */, D0DF90AC2814390000FC0F64 /* BannerModel.h */,
D0DF90AD2814390000FC0F64 /* BannerModel.m */, D0DF90AD2814390000FC0F64 /* BannerModel.m */,
D0DB33A628224D5100E15914 /* PromotionModel.h */, D0DB33A628224D5100E15914 /* PromotionModel.h */,
D0DB33A728224D5100E15914 /* PromotionModel.m */, D0DB33A728224D5100E15914 /* PromotionModel.m */,
D0BE32E42814D42B006539BE /* HomeRequestModel.h */,
D0BE32E52814D42B006539BE /* HomeRequestModel.m */,
); );
path = Model; path = Model;
sourceTree = "<group>"; sourceTree = "<group>";
......
DreamSleep/DreamSleep/Class/HomeModule/Home/TimerProxy.h → DreamSleep/DreamSleep/Basement/Utils/TimerProxy.h
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/// 用于解决定时器出现内存问题
@interface TimerProxy : NSProxy @interface TimerProxy : NSProxy
+ (instancetype)proxyWithTarget:(id)target; + (instancetype)proxyWithTarget:(id)target;
@end @end
......
DreamSleep/DreamSleep/Class/HomeModule/Home/AudioDetailHeaderView.m → DreamSleep/DreamSleep/Class/HomeModule/Course/View/AudioDetailHeaderView.m
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
// 添加遮罩 // 添加遮罩
if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) { if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) {
[self.bgIV addMaskWithType:MaskTypeCornerBottom cornerRadius:22.0]; [self.bgIV addMaskWithType:MaskTypeCornerBottom cornerRadius:22.0];
[self.audioIV addMaskWithType:MaskTypeAllCorner cornerRadius:12.0]; [self.audioIV addMaskWithType:MaskTypeAllCorner cornerRadius:15.5];
} }
} else { } else {
self.bgIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1.0, .3, .5); self.bgIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1.0, .3, .5);
......
DreamSleep/DreamSleep/Class/HomeModule/FallAsleep/ThreeMinuteController.h
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/// 三分钟即刻入睡VC（哄睡界面） /// 三分钟即刻入睡VC（哄睡界面、Unity界面）
@interface ThreeMinuteController : UIViewController @interface ThreeMinuteController : UIViewController
@end @end
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!