Skip to content

陈高翔 / DreamSleep-iOS

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

搭建首页舒眠课程、助眠音乐 UI、调试图片黑夜模式等

1 个父辈 cba9571e
内嵌 并排
正在显示 41 个修改的文件 包含 748 行增加 和 58 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
D01814D227FFCBAF00583D4E /* CWFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814CD27FFCBAF00583D4E /* CWFlowLayout.m */; }; D01814D227FFCBAF00583D4E /* CWFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814CD27FFCBAF00583D4E /* CWFlowLayout.m */; };
D01814D527FFCCFA00583D4E /* HomeTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814D427FFCCFA00583D4E /* HomeTableView.m */; }; D01814D527FFCCFA00583D4E /* HomeTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814D427FFCCFA00583D4E /* HomeTableView.m */; };
D01814DC27FFD92200583D4E /* DSDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814DB27FFD92200583D4E /* DSDataSource.m */; }; D01814DC27FFD92200583D4E /* DSDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814DB27FFD92200583D4E /* DSDataSource.m */; };
D01814DF27FFDB6A00583D4E /* HomeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814DE27FFDB6A00583D4E /* HomeTableViewCell.m */; };
D01814E227FFDBB800583D4E /* HomeHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814E127FFDBB800583D4E /* HomeHeaderView.m */; }; D01814E227FFDBB800583D4E /* HomeHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814E127FFDBB800583D4E /* HomeHeaderView.m */; };
D01814E8280020F900583D4E /* CWPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814E6280020F800583D4E /* CWPageControl.m */; }; D01814E8280020F900583D4E /* CWPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814E6280020F800583D4E /* CWPageControl.m */; };
D01814EB28002A8200583D4E /* DsMiddleView.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814EA28002A8200583D4E /* DsMiddleView.m */; }; D01814EB28002A8200583D4E /* DsMiddleView.m in Sources */ = {isa = PBXBuildFile; fileRef = D01814EA28002A8200583D4E /* DsMiddleView.m */; };
...@@ -29,6 +28,10 @@ ...@@ -29,6 +28,10 @@
D04B3DBD27F6F8090022F8DF /* Profile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D04B3DBC27F6F8090022F8DF /* Profile.storyboard */; }; D04B3DBD27F6F8090022F8DF /* Profile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D04B3DBC27F6F8090022F8DF /* Profile.storyboard */; };
D04B3DC027F6F82D0022F8DF /* ProfileController.m in Sources */ = {isa = PBXBuildFile; fileRef = D04B3DBF27F6F82D0022F8DF /* ProfileController.m */; }; D04B3DC027F6F82D0022F8DF /* ProfileController.m in Sources */ = {isa = PBXBuildFile; fileRef = D04B3DBF27F6F82D0022F8DF /* ProfileController.m */; };
D04B3DC327F6F9390022F8DF /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D04B3DC227F6F9390022F8DF /* HomeViewController.m */; }; D04B3DC327F6F9390022F8DF /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D04B3DC227F6F9390022F8DF /* HomeViewController.m */; };
D0506B0C280503A800229278 /* UIButton+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = D0506B0B280503A800229278 /* UIButton+Extras.m */; };
D0506B1528051ED400229278 /* SafeSleepModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0506B1428051ED400229278 /* SafeSleepModel.m */; };
D0506B1828054ECD00229278 /* SafeHelperCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0506B1728054ECD00229278 /* SafeHelperCollectionView.m */; };
D0506B1B2805500E00229278 /* SafeHelperCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D0506B1A2805500E00229278 /* SafeHelperCollectionViewCell.m */; };
D076C14327F49DC000340B46 /* TmpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D076C14227F49DC000340B46 /* TmpViewController.m */; }; D076C14327F49DC000340B46 /* TmpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D076C14227F49DC000340B46 /* TmpViewController.m */; };
D07F9DE927F4683B0036372F /* DKColorTable.txt in Resources */ = {isa = PBXBuildFile; fileRef = D07F9DE827F4683B0036372F /* DKColorTable.txt */; }; D07F9DE927F4683B0036372F /* DKColorTable.txt in Resources */ = {isa = PBXBuildFile; fileRef = D07F9DE827F4683B0036372F /* DKColorTable.txt */; };
D0930F122801124E006B497A /* BaseNaviController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0930F112801124E006B497A /* BaseNaviController.m */; }; D0930F122801124E006B497A /* BaseNaviController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0930F112801124E006B497A /* BaseNaviController.m */; };
...@@ -60,6 +63,8 @@ ...@@ -60,6 +63,8 @@
D0E9408927FE96A900D57495 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E9408727FE96A900D57495 /* libWeChatSDK.a */; settings = {ATTRIBUTES = (Required, ); }; }; D0E9408927FE96A900D57495 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0E9408727FE96A900D57495 /* libWeChatSDK.a */; settings = {ATTRIBUTES = (Required, ); }; };
D0F808F52803D4E70097899F /* Track.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F808F32803D4E70097899F /* Track.m */; }; D0F808F52803D4E70097899F /* Track.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F808F32803D4E70097899F /* Track.m */; };
D0F808FE280421C20097899F /* ThreeMinuteController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F808FD280421C20097899F /* ThreeMinuteController.m */; }; D0F808FE280421C20097899F /* ThreeMinuteController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F808FD280421C20097899F /* ThreeMinuteController.m */; };
D0F8090428042A0B0097899F /* SafeSleepCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F8090328042A0B0097899F /* SafeSleepCell.m */; };
D0F80907280431100097899F /* UILabel+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F80906280431100097899F /* UILabel+Extras.m */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
...@@ -76,8 +81,6 @@ ...@@ -76,8 +81,6 @@
D01814D427FFCCFA00583D4E /* HomeTableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeTableView.m; sourceTree = "<group>"; }; D01814D427FFCCFA00583D4E /* HomeTableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeTableView.m; sourceTree = "<group>"; };
D01814DA27FFD92200583D4E /* DSDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DSDataSource.h; sourceTree = "<group>"; }; D01814DA27FFD92200583D4E /* DSDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DSDataSource.h; sourceTree = "<group>"; };
D01814DB27FFD92200583D4E /* DSDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSDataSource.m; sourceTree = "<group>"; }; D01814DB27FFD92200583D4E /* DSDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSDataSource.m; sourceTree = "<group>"; };
D01814DD27FFDB6A00583D4E /* HomeTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeTableViewCell.h; sourceTree = "<group>"; };
D01814DE27FFDB6A00583D4E /* HomeTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeTableViewCell.m; sourceTree = "<group>"; };
D01814E027FFDBB800583D4E /* HomeHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeHeaderView.h; sourceTree = "<group>"; }; D01814E027FFDBB800583D4E /* HomeHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeHeaderView.h; sourceTree = "<group>"; };
D01814E127FFDBB800583D4E /* HomeHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeHeaderView.m; sourceTree = "<group>"; }; D01814E127FFDBB800583D4E /* HomeHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeHeaderView.m; sourceTree = "<group>"; };
D01814E6280020F800583D4E /* CWPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CWPageControl.m; sourceTree = "<group>"; }; D01814E6280020F800583D4E /* CWPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CWPageControl.m; sourceTree = "<group>"; };
...@@ -106,6 +109,14 @@ ...@@ -106,6 +109,14 @@
D04B3DBF27F6F82D0022F8DF /* ProfileController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ProfileController.m; sourceTree = "<group>"; }; D04B3DBF27F6F82D0022F8DF /* ProfileController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ProfileController.m; sourceTree = "<group>"; };
D04B3DC127F6F9390022F8DF /* HomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; }; D04B3DC127F6F9390022F8DF /* HomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
D04B3DC227F6F9390022F8DF /* HomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; }; D04B3DC227F6F9390022F8DF /* HomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
D0506B0A280503A800229278 /* UIButton+Extras.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIButton+Extras.h"; sourceTree = "<group>"; };
D0506B0B280503A800229278 /* UIButton+Extras.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+Extras.m"; sourceTree = "<group>"; };
D0506B1328051ED400229278 /* SafeSleepModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SafeSleepModel.h; sourceTree = "<group>"; };
D0506B1428051ED400229278 /* SafeSleepModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SafeSleepModel.m; sourceTree = "<group>"; };
D0506B1628054ECD00229278 /* SafeHelperCollectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SafeHelperCollectionView.h; sourceTree = "<group>"; };
D0506B1728054ECD00229278 /* SafeHelperCollectionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SafeHelperCollectionView.m; sourceTree = "<group>"; };
D0506B192805500E00229278 /* SafeHelperCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SafeHelperCollectionViewCell.h; sourceTree = "<group>"; };
D0506B1A2805500E00229278 /* SafeHelperCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SafeHelperCollectionViewCell.m; sourceTree = "<group>"; };
D076C14127F49DC000340B46 /* TmpViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TmpViewController.h; sourceTree = "<group>"; }; D076C14127F49DC000340B46 /* TmpViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TmpViewController.h; sourceTree = "<group>"; };
D076C14227F49DC000340B46 /* TmpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TmpViewController.m; sourceTree = "<group>"; }; D076C14227F49DC000340B46 /* TmpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TmpViewController.m; sourceTree = "<group>"; };
D07F9D0627F45CB20036372F /* DKNightVersion.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DKNightVersion.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D07F9D0627F45CB20036372F /* DKNightVersion.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DKNightVersion.framework; sourceTree = BUILT_PRODUCTS_DIR; };
...@@ -167,6 +178,10 @@ ...@@ -167,6 +178,10 @@
D0F808F42803D4E70097899F /* Track.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Track.h; sourceTree = "<group>"; }; D0F808F42803D4E70097899F /* Track.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Track.h; sourceTree = "<group>"; };
D0F808FC280421C20097899F /* ThreeMinuteController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ThreeMinuteController.h; sourceTree = "<group>"; }; D0F808FC280421C20097899F /* ThreeMinuteController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ThreeMinuteController.h; sourceTree = "<group>"; };
D0F808FD280421C20097899F /* ThreeMinuteController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ThreeMinuteController.m; sourceTree = "<group>"; }; D0F808FD280421C20097899F /* ThreeMinuteController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ThreeMinuteController.m; sourceTree = "<group>"; };
D0F8090228042A0B0097899F /* SafeSleepCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SafeSleepCell.h; sourceTree = "<group>"; };
D0F8090328042A0B0097899F /* SafeSleepCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SafeSleepCell.m; sourceTree = "<group>"; };
D0F80905280431100097899F /* UILabel+Extras.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+Extras.h"; sourceTree = "<group>"; };
D0F80906280431100097899F /* UILabel+Extras.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+Extras.m"; sourceTree = "<group>"; };
F02C34A5649294F60932630C /* Pods-DreamSleep.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DreamSleep.release.xcconfig"; path = "Target Support Files/Pods-DreamSleep/Pods-DreamSleep.release.xcconfig"; sourceTree = "<group>"; }; F02C34A5649294F60932630C /* Pods-DreamSleep.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DreamSleep.release.xcconfig"; path = "Target Support Files/Pods-DreamSleep/Pods-DreamSleep.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -237,6 +252,10 @@ ...@@ -237,6 +252,10 @@
D027EE2F27FB52DA004BBA61 /* UIImage+Extras.m */, D027EE2F27FB52DA004BBA61 /* UIImage+Extras.m */,
D0C50B4027FD39C800DC68F0 /* UIViewController+FullScreenModal.h */, D0C50B4027FD39C800DC68F0 /* UIViewController+FullScreenModal.h */,
D0C50B4127FD39C800DC68F0 /* UIViewController+FullScreenModal.m */, D0C50B4127FD39C800DC68F0 /* UIViewController+FullScreenModal.m */,
D0F80905280431100097899F /* UILabel+Extras.h */,
D0F80906280431100097899F /* UILabel+Extras.m */,
D0506B0A280503A800229278 /* UIButton+Extras.h */,
D0506B0B280503A800229278 /* UIButton+Extras.m */,
); );
path = Category; path = Category;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -468,8 +487,12 @@ ...@@ -468,8 +487,12 @@
D01814E127FFDBB800583D4E /* HomeHeaderView.m */, D01814E127FFDBB800583D4E /* HomeHeaderView.m */,
D01814E928002A8200583D4E /* DsMiddleView.h */, D01814E928002A8200583D4E /* DsMiddleView.h */,
D01814EA28002A8200583D4E /* DsMiddleView.m */, D01814EA28002A8200583D4E /* DsMiddleView.m */,
D01814DD27FFDB6A00583D4E /* HomeTableViewCell.h */, D0F8090228042A0B0097899F /* SafeSleepCell.h */,
D01814DE27FFDB6A00583D4E /* HomeTableViewCell.m */, D0F8090328042A0B0097899F /* SafeSleepCell.m */,
D0506B1628054ECD00229278 /* SafeHelperCollectionView.h */,
D0506B1728054ECD00229278 /* SafeHelperCollectionView.m */,
D0506B192805500E00229278 /* SafeHelperCollectionViewCell.h */,
D0506B1A2805500E00229278 /* SafeHelperCollectionViewCell.m */,
); );
path = View; path = View;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -479,6 +502,8 @@ ...@@ -479,6 +502,8 @@
children = ( children = (
D01814EC28002DC700583D4E /* HeaderDataModel.h */, D01814EC28002DC700583D4E /* HeaderDataModel.h */,
D01814ED28002DC700583D4E /* HeaderDataModel.m */, D01814ED28002DC700583D4E /* HeaderDataModel.m */,
D0506B1328051ED400229278 /* SafeSleepModel.h */,
D0506B1428051ED400229278 /* SafeSleepModel.m */,
); );
path = Model; path = Model;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -635,8 +660,10 @@ ...@@ -635,8 +660,10 @@
D04B3DC027F6F82D0022F8DF /* ProfileController.m in Sources */, D04B3DC027F6F82D0022F8DF /* ProfileController.m in Sources */,
D0C50B3027FD1BEB00DC68F0 /* PrivacyView.m in Sources */, D0C50B3027FD1BEB00DC68F0 /* PrivacyView.m in Sources */,
D0B5ECD527F2F0B2003EDFE3 /* AdaptationUtil.m in Sources */, D0B5ECD527F2F0B2003EDFE3 /* AdaptationUtil.m in Sources */,
D0F8090428042A0B0097899F /* SafeSleepCell.m in Sources */,
D01814D127FFCBAF00583D4E /* CWCarousel.m in Sources */, D01814D127FFCBAF00583D4E /* CWCarousel.m in Sources */,
D0B5ECB727F2D9E0003EDFE3 /* main.m in Sources */, D0B5ECB727F2D9E0003EDFE3 /* main.m in Sources */,
D0506B0C280503A800229278 /* UIButton+Extras.m in Sources */,
D0C50B3F27FD381000DC68F0 /* UIView+Extras.m in Sources */, D0C50B3F27FD381000DC68F0 /* UIView+Extras.m in Sources */,
D04B3DBB27F6F7940022F8DF /* AISleepCoachController.m in Sources */, D04B3DBB27F6F7940022F8DF /* AISleepCoachController.m in Sources */,
D027EE2627FB3DC0004BBA61 /* NetLoadingStateView.m in Sources */, D027EE2627FB3DC0004BBA61 /* NetLoadingStateView.m in Sources */,
...@@ -644,8 +671,9 @@ ...@@ -644,8 +671,9 @@
D0C50B4627FD66FB00DC68F0 /* DSConstUtil.m in Sources */, D0C50B4627FD66FB00DC68F0 /* DSConstUtil.m in Sources */,
D01814D227FFCBAF00583D4E /* CWFlowLayout.m in Sources */, D01814D227FFCBAF00583D4E /* CWFlowLayout.m in Sources */,
D0930F1B2801874B006B497A /* UINavigationController+Pop.m in Sources */, D0930F1B2801874B006B497A /* UINavigationController+Pop.m in Sources */,
D01814DF27FFDB6A00583D4E /* HomeTableViewCell.m in Sources */, D0506B1528051ED400229278 /* SafeSleepModel.m in Sources */,
D01814D527FFCCFA00583D4E /* HomeTableView.m in Sources */, D01814D527FFCCFA00583D4E /* HomeTableView.m in Sources */,
D0F80907280431100097899F /* UILabel+Extras.m in Sources */,
D076C14327F49DC000340B46 /* TmpViewController.m in Sources */, D076C14327F49DC000340B46 /* TmpViewController.m in Sources */,
D04B3DAC27F6EEB50022F8DF /* DSTabBarController.m in Sources */, D04B3DAC27F6EEB50022F8DF /* DSTabBarController.m in Sources */,
D0C50B4F27FD832300DC68F0 /* LeadView.m in Sources */, D0C50B4F27FD832300DC68F0 /* LeadView.m in Sources */,
...@@ -653,6 +681,7 @@ ...@@ -653,6 +681,7 @@
D0C50B4227FD39C800DC68F0 /* UIViewController+FullScreenModal.m in Sources */, D0C50B4227FD39C800DC68F0 /* UIViewController+FullScreenModal.m in Sources */,
D027EE2927FB51D0004BBA61 /* DSGifHeader.m in Sources */, D027EE2927FB51D0004BBA61 /* DSGifHeader.m in Sources */,
D01814EE28002DC700583D4E /* HeaderDataModel.m in Sources */, D01814EE28002DC700583D4E /* HeaderDataModel.m in Sources */,
D0506B1B2805500E00229278 /* SafeHelperCollectionViewCell.m in Sources */,
D01814DC27FFD92200583D4E /* DSDataSource.m in Sources */, D01814DC27FFD92200583D4E /* DSDataSource.m in Sources */,
D0B5ECC827F2E97A003EDFE3 /* MacroFuncUtil.m in Sources */, D0B5ECC827F2E97A003EDFE3 /* MacroFuncUtil.m in Sources */,
D01814E227FFDBB800583D4E /* HomeHeaderView.m in Sources */, D01814E227FFDBB800583D4E /* HomeHeaderView.m in Sources */,
...@@ -663,6 +692,7 @@ ...@@ -663,6 +692,7 @@
D0F808FE280421C20097899F /* ThreeMinuteController.m in Sources */, D0F808FE280421C20097899F /* ThreeMinuteController.m in Sources */,
D01814E8280020F900583D4E /* CWPageControl.m in Sources */, D01814E8280020F900583D4E /* CWPageControl.m in Sources */,
D027EE3027FB52DA004BBA61 /* UIImage+Extras.m in Sources */, D027EE3027FB52DA004BBA61 /* UIImage+Extras.m in Sources */,
D0506B1828054ECD00229278 /* SafeHelperCollectionView.m in Sources */,
D04B3DC327F6F9390022F8DF /* HomeViewController.m in Sources */, D04B3DC327F6F9390022F8DF /* HomeViewController.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
......
DreamSleep/DreamSleep/Category/UIButton+Extras.h 0 → 100644
//
// UIButton+Extras.h
// DreamSleep
//
// Created by peter on 2022/4/12.
//
#import <UIKit/UIKit.h>
typedef NS_ENUM(NSUInteger, UIButtonLayoutType) {
UIButtonLayoutTypeLeftTitleRightImage = 0,
UIButtonLayoutTypeUpImageBottomTitle = 1
};
NS_ASSUME_NONNULL_BEGIN
@interface UIButton (Extras)
+ (instancetype)btnWithTitle:(NSString *)title titleColor:(UIColor *)titleColor imgName:(NSString *)imgName font:(UIFont *)font;
/// 创建 UIButton
/// @param subTitle 二级 title
/// @param imgName 图片名
/// @param font 字体
+ (instancetype)dkBtnWithSubTitle:(NSString *)subTitle imgName:(NSString *)imgName font:(UIFont *)font;
/**
* 按钮中图片和标题布局方式(上下及左右)
*
* @param type 按钮布局类型
* @param midSpace 图片和标题间距
* @param sizeToFit 是否按尺寸调整
*/
- (void)adjustLayoutWithType:(UIButtonLayoutType)type midSpace:(CGFloat)midSpace sizeToFit:(BOOL)sizeToFit;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Category/UIButton+Extras.m 0 → 100644
//
// UIButton+Extras.m
// DreamSleep
//
// Created by peter on 2022/4/12.
//
#import "UIButton+Extras.h"
@implementation UIButton (Extras)
+ (instancetype)btnWithTitle:(NSString *)title titleColor:(UIColor *)titleColor imgName:(NSString *)imgName font:(UIFont *)font {
UIButton *btn = [UIButton new];
[btn setTitle:title forState:UIControlStateNormal];
[btn setTitleColor:titleColor forState:UIControlStateNormal];
[btn setImage:[UIImage imageNamed:imgName] forState:UIControlStateNormal];
[btn.titleLabel setFont:font];
return btn;
}
+ (instancetype)dkBtnWithSubTitle:(NSString *)subTitle imgName:(NSString *)imgName font:(UIFont *)font {
UIButton *btn = [UIButton new];
[btn setTitle:subTitle forState:UIControlStateNormal];
[btn dk_setTitleColorPicker:DKColorPickerWithKey(SubTEXT) forState:UIControlStateNormal];
[btn setImage:[UIImage imageNamed:imgName] forState:UIControlStateNormal];
[btn.titleLabel setFont:font];
return btn;
}
- (void)adjustLayoutWithType:(UIButtonLayoutType)type midSpace:(CGFloat)midSpace sizeToFit:(BOOL)sizeToFit
{
if (sizeToFit) {
[self sizeToFit];
if (UIButtonLayoutTypeLeftTitleRightImage == type) {
self.width += midSpace;
}
}
CGSize titleSize;
titleSize = [[self titleForState:UIControlStateNormal] sizeWithAttributes:@{NSFontAttributeName:self.titleLabel.font}];
UIEdgeInsets titleEdgeInset = UIEdgeInsetsZero;
UIEdgeInsets imageEdgeInset = UIEdgeInsetsZero;
CGSize imageSize = self.imageView.frame.size;
if (UIButtonLayoutTypeLeftTitleRightImage == type) {
titleEdgeInset = UIEdgeInsetsMake(0, -imageSize.width, 0, self.imageView.width + midSpace);
imageEdgeInset = UIEdgeInsetsMake(0, titleSize.width + midSpace, 0, -titleSize.width);
} else if (UIButtonLayoutTypeUpImageBottomTitle == type) {
titleEdgeInset = UIEdgeInsetsMake(imageSize.height + midSpace, -imageSize.width, 0, 0);
imageEdgeInset = UIEdgeInsetsMake(-(titleSize.height + midSpace), 0, 0, -titleSize.width);
}
[self setTitleEdgeInsets:titleEdgeInset];
[self setImageEdgeInsets:imageEdgeInset];
}
@end
DreamSleep/DreamSleep/Category/UILabel+Extras.h 0 → 100644
//
// UILabel+Extras.h
// DreamSleep
//
// Created by peter on 2022/4/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface UILabel (Extras)
#pragma mark - Create
// 白天和黑夜模式下的UILabel
+ (UILabel *)dkLabWithText:(NSString *)text font:(UIFont *)font;
+ (UILabel *)dkLabWithFont:(UIFont *)font;
+ (UILabel *)labWithTextColor:(UIColor *)textColor font:(UIFont *)font;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Category/UILabel+Extras.m 0 → 100644
//
// UILabel+Extras.m
// DreamSleep
//
// Created by peter on 2022/4/11.
//
#import "UILabel+Extras.h"
@implementation UILabel (Extras)
#pragma mark - Create
+ (UILabel *)dkLabWithText:(NSString *)text font:(UIFont *)font {
UILabel *lab = [UILabel new];
lab.text = text;
lab.font = font;
lab.dk_textColorPicker = DKColorPickerWithKey(TEXT);
[lab sizeToFit];
return lab;
}
+ (UILabel *)dkLabWithFont:(UIFont *)font {
UILabel *lab = [UILabel new];
lab.font = font;
lab.dk_textColorPicker = DKColorPickerWithKey(TEXT);
return lab;
}
+ (UILabel *)labWithTextColor:(UIColor *)textColor font:(UIFont *)font {
UILabel *lab = [UILabel new];
lab.font = font;
lab.textColor = textColor;
return lab;
}
@end
DreamSleep/DreamSleep/HomeModule/Home/Controller/HomeViewController.m
...@@ -21,20 +21,10 @@ ...@@ -21,20 +21,10 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// 导航栏背景色
// self.navigationController.navigationBar.dk_barTintColorPicker = DKColorPickerWithKey(NaviBG);
// leftItem // leftItem
UILabel *leftLab = [[UILabel alloc] init]; UILabel *leftLab = [UILabel dkLabWithText:@"小梦睡眠" font:BoldFont(24.0)];
leftLab.text = @"小梦睡眠";
leftLab.dk_textColorPicker = DKColorPickerWithKey(TEXT);
leftLab.font = [UIFont boldSystemFontOfSize:24.0];
[leftLab sizeToFit];
UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:leftLab]; UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:leftLab];
self.navigationItem.leftBarButtonItem = leftItem; self.navigationItem.leftBarButtonItem = leftItem;
// view背景色
// self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
} }
#pragma mark - 导航栏日间模式 #pragma mark - 导航栏日间模式
......
DreamSleep/DreamSleep/HomeModule/Home/Model/SafeSleepModel.h 0 → 100644
//
// SafeSleepModel.h
// DreamSleep
//
// Created by peter on 2022/4/12.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
/// 舒眠课程、助眠音乐、好眠声音数据 model
@interface SafeSleepModel : NSObject
@property (nonatomic, copy) NSString *title;
+ (NSArray *)getDatas;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/HomeModule/Home/Model/SafeSleepModel.m 0 → 100644
//
// SafeSleepModel.m
// DreamSleep
//
// Created by peter on 2022/4/12.
//
#import "SafeSleepModel.h"
@implementation SafeSleepModel
+ (NSArray *)getDatas {
NSArray *titles = @[@"舒眠课程", @"助眠音乐", @"好眠声音"];
NSMutableArray *tmpDatas = [NSMutableArray array];
for (int i = 0; i < 3; i++) {
SafeSleepModel *m = [SafeSleepModel new];
m.title = titles[i];
[tmpDatas addObject:m];
}
return [tmpDatas copy];
}
@end
DreamSleep/DreamSleep/HomeModule/Home/View/HomeTableView.m
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#import "HomeTableView.h" #import "HomeTableView.h"
#import "DSGifHeader.h" #import "DSGifHeader.h"
#import "HomeTableViewCell.h"
#import "HomeHeaderView.h" #import "HomeHeaderView.h"
#import "SafeSleepCell.h"
@interface HomeTableView () <UITableViewDelegate> @interface HomeTableView () <UITableViewDelegate>
@property (nonatomic, strong) HomeHeaderView *headerView; @property (nonatomic, strong) HomeHeaderView *headerView;
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
- (instancetype)initDemo { - (instancetype)initDemo {
if (self = [super initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight) style:UITableViewStylePlain]) { if (self = [super initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight) style:UITableViewStylePlain]) {
self.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG); self.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
[self.homeDataSource addDataArray:@[@1, @2, @3]]; self.separatorStyle = UITableViewCellSeparatorStyleNone;
self.showsVerticalScrollIndicator = NO;
[self.homeDataSource addDataArray:[SafeSleepModel getDatas]];
self.mj_header = [DSGifHeader headerWithRefreshingBlock:^{ self.mj_header = [DSGifHeader headerWithRefreshingBlock:^{
dispatch_after(5.0, dispatch_get_main_queue(), ^{ dispatch_after(5.0, dispatch_get_main_queue(), ^{
[self.mj_header endRefreshing]; [self.mj_header endRefreshing];
...@@ -32,17 +34,14 @@ ...@@ -32,17 +34,14 @@
- (DSDataSource *)homeDataSource { - (DSDataSource *)homeDataSource {
if (!_homeDataSource) { if (!_homeDataSource) {
CellConfigureBlock cellBlock = ^(HomeTableViewCell * cell, id model, NSIndexPath * indexPath) { CellConfigureBlock cellBlock = ^(SafeSleepCell * cell, SafeSleepModel * model, NSIndexPath * indexPath) {
cell.textLabel.text = @"chengx"; [cell configureCellWithModel:model indexPath:indexPath];
cell.backgroundColor = BrandColor;
// [cell configureCell:model];
}; };
NSString * const homeCellIdentifier = @"HomeCellIdentifier"; NSString * const safeSleepCellID = @"safeSleepCellID";
_homeDataSource = [[DSDataSource alloc] initWithIdentifier:homeCellIdentifier datas:@[] isSection:NO configureBlock:cellBlock]; _homeDataSource = [[DSDataSource alloc] initWithIdentifier:safeSleepCellID datas:@[] isSection:NO configureBlock:cellBlock];
self.dataSource = _homeDataSource; self.dataSource = _homeDataSource;
self.delegate = self; self.delegate = self;
[self registerClass:[HomeTableViewCell class] forCellReuseIdentifier:homeCellIdentifier]; [self registerClass:[SafeSleepCell class] forCellReuseIdentifier:safeSleepCellID];
self.tableHeaderView = self.headerView; self.tableHeaderView = self.headerView;
} }
return _homeDataSource; return _homeDataSource;
...@@ -56,14 +55,20 @@ ...@@ -56,14 +55,20 @@
CGFloat width = (kScreenWidth - 2*15 - 14)/2; CGFloat width = (kScreenWidth - 2*15 - 14)/2;
CGFloat height = 15 + bannerH + 24 + 133*width/165.0; CGFloat height = 15 + bannerH + 24 + 133*width/165.0;
_headerView = [[HomeHeaderView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, height)]; _headerView = [[HomeHeaderView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, height)];
_headerView.backgroundColor = self.backgroundColor; _headerView.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
} }
return _headerView; return _headerView;
} }
#pragma mark - UITableViewDelegate #pragma mark - UITableViewDelegate
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
return 70; CGFloat height = 300;
if (indexPath.row == 0) {
height = 206;
} else if (indexPath.row == 1) {
height = 196;
}
return height;
} }
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
......
DreamSleep/DreamSleep/HomeModule/Home/View/HomeTableViewCell.m deleted 100644 → 0
//
// HomeTableViewCell.m
// DreamSleep
//
// Created by peter on 2022/4/8.
//
#import "HomeTableViewCell.h"
@implementation HomeTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
DreamSleep/DreamSleep/HomeModule/Home/View/SafeHelperCollectionView.h 0 → 100644
//
// SafeHelperCollectionView.h
// DreamSleep
//
// Created by peter on 2022/4/12.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
/// 舒眠课程、助眠音乐集合视图
@interface SafeHelperCollectionView : UICollectionView
- (instancetype)initCollectionViewWithIndexPath:(NSIndexPath *)indexPath;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/HomeModule/Home/View/SafeHelperCollectionView.m 0 → 100644
//
// SafeHelperCollectionView.m
// DreamSleep
//
// Created by peter on 2022/4/12.
//
#import "SafeHelperCollectionView.h"
#import "SafeHelperCollectionViewCell.h"
@interface SafeHelperCollectionView () <UICollectionViewDelegate, UICollectionViewDataSource>
@property (nonatomic, strong) NSIndexPath *cellIndexPath;
@end
@implementation SafeHelperCollectionView
- (instancetype)initCollectionViewWithIndexPath:(NSIndexPath *)indexPath {
self.cellIndexPath = indexPath;
CGFloat width = indexPath.row == 0 ? 100 : 90;
CGFloat height = indexPath.row == 0 ? 130 : 120;
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 10);
layout.itemSize = CGSizeMake(width, height);
layout.minimumLineSpacing = 12;
layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
if (self = [super initWithFrame:CGRectMake(0, 0, 0, height) collectionViewLayout:layout]) {
[self registerClass:[SafeHelperCollectionViewCell class] forCellWithReuseIdentifier:@"shCollectionViewCell"];
self.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
self.showsHorizontalScrollIndicator = NO;
self.delegate = self;
self.dataSource = self;
}
return self;
}
#pragma mark - UICollectionViewDelegate && UICollectionViewDataSource
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
return 8;
}
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
SafeHelperCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"shCollectionViewCell" forIndexPath:indexPath];
[cell mockDatas:self.cellIndexPath];
return cell;
}
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
NSLog(@"row:%ld", indexPath.row);
}
@end
DreamSleep/DreamSleep/HomeModule/Home/View/HomeTableViewCell.h → DreamSleep/DreamSleep/HomeModule/Home/View/SafeHelperCollectionViewCell.h
// //
// HomeTableViewCell.h // SafeHelperCollectionViewCell.h
// DreamSleep // DreamSleep
// //
// Created by peter on 2022/4/8. // Created by peter on 2022/4/12.
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface HomeTableViewCell : UITableViewCell @interface SafeHelperCollectionViewCell : UICollectionViewCell
- (void)mockDatas:(NSIndexPath *)cellIndexPath;
@end @end
......
DreamSleep/DreamSleep/HomeModule/Home/View/SafeHelperCollectionViewCell.m 0 → 100644
//
// SafeHelperCollectionViewCell.m
// DreamSleep
//
// Created by peter on 2022/4/12.
//
#import "SafeHelperCollectionViewCell.h"
@interface SafeHelperCollectionViewCell ()
// 圆角视图（舒眠课程Cell显示）
@property (nonatomic, strong) UIView *roundedView;
// 主圆角图片
@property (nonatomic, strong) UIImageView *homeIV;
// 舒眠课程icon
@property (nonatomic, strong) UIImageView *courseIcon;
// 舒眠课时标签
@property (nonatomic, strong) UILabel *courseLab;
// 音乐类型
@property (nonatomic, strong) UILabel *audioTypeLab;
@end
@implementation SafeHelperCollectionViewCell
- (instancetype)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:frame]) {
[self addSubview:self.homeIV];
[self addSubview:self.audioTypeLab];
}
return self;
}
- (void)mockDatas:(NSIndexPath *)cellIndexPath {
self.homeIV.image = [UIImage imageNamed:cellIndexPath.row == 0 ? @"test0" : @"test1"];
self.audioTypeLab.text = @"都会浪漫";
[self.audioTypeLab sizeToFit];
if (cellIndexPath.row == 0) { // 舒眠课程
[self insertSubview:self.roundedView belowSubview:self.homeIV];
[self addSubview:self.courseIcon];
[self addSubview:self.courseLab];
self.courseLab.text = @"10课时";
[self.courseLab sizeToFit];
[self.roundedView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self);
make.width.equalTo(@(100 - 2*12));
make.height.equalTo(@20);
make.centerX.equalTo(self.homeIV);
}];
[self.courseIcon mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.homeIV).offset(7);
make.bottom.equalTo(self.homeIV).offset(-3);
}];
[self.courseLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.courseIcon.mas_right).offset(2);
make.centerY.equalTo(self.courseIcon);
}];
}
CGFloat width = cellIndexPath.row == 0 ? 100 : 90;
CGFloat bottomSpace = cellIndexPath.row == 0 ? 0 : -3;
CGFloat topSpacing = cellIndexPath.row == 0 ? 4 : 0;
[self.homeIV mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self).offset(topSpacing);
make.left.equalTo(self);
make.width.height.equalTo(@(width));
}];
[self.audioTypeLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.homeIV);
make.bottom.equalTo(self).offset(bottomSpace);
}];
}
- (UIView *)roundedView {
if (!_roundedView) {
_roundedView = [UIView new];
_roundedView.backgroundColor = ColorFromHex(0xECECEC);
_roundedView.layer.cornerRadius = 12;
_roundedView.layer.masksToBounds = YES;
}
return _roundedView;
}
- (UIImageView *)homeIV {
if (!_homeIV) {
_homeIV = [UIImageView new];
_homeIV.contentMode = UIViewContentModeScaleAspectFill;
}
return _homeIV;
}
- (UIImageView *)courseIcon {
if (!_courseIcon) {
_courseIcon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"courseIcon"]];
[_courseIcon sizeToFit];
}
return _courseIcon;
}
- (UILabel *)courseLab {
if (!_courseLab) {
_courseLab = [UILabel labWithTextColor:DSWhite font:SysFont(10)];
}
return _courseLab;
}
- (UILabel *)audioTypeLab {
if (!_audioTypeLab) {
_audioTypeLab = [UILabel dkLabWithFont:SysFont(15)];
}
return _audioTypeLab;
}
@end
DreamSleep/DreamSleep/HomeModule/Home/View/SafeSleepCell.h 0 → 100644
//
// SafeSleepCell.h
// DreamSleep
//
// Created by peter on 2022/4/11.
//
#import <UIKit/UIKit.h>
#import "SafeSleepModel.h"
NS_ASSUME_NONNULL_BEGIN
/// 舒眠课程、助眠音乐、好眠声音静态Cell
@interface SafeSleepCell : UITableViewCell
@property (nonatomic, strong) SafeSleepModel *model;
@property (nonatomic, strong) NSIndexPath *indexPath;
- (void)configureCellWithModel:(SafeSleepModel *)model indexPath:(NSIndexPath *)indexPath;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/HomeModule/Home/View/SafeSleepCell.m 0 → 100644
//
// SafeSleepCell.m
// DreamSleep
//
// Created by peter on 2022/4/11.
//
#import "SafeSleepCell.h"
#import "SafeHelperCollectionView.h"
#import "SafeHelperCollectionViewCell.h"
@interface SafeSleepCell ()
@property (nonatomic, strong) UIView *leftIV;
@property (nonatomic, strong) UILabel *recommandLb;
@property (nonatomic, strong) UIButton *moreBtn;
@property (nonatomic, strong) UIButton *timerBtn;
@property (nonatomic, strong) SafeHelperCollectionView *shCollectionView;
@end
@implementation SafeSleepCell
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.contentView.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
[self.contentView addSubview:self.leftIV];
[self.contentView addSubview:self.recommandLb];
}
return self;
}
// 隐藏选中Cell时的分割线
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
self.selectedBackgroundView = [[UIView alloc] initWithFrame:self.frame];
self.selectedBackgroundView.backgroundColor = DSClearColor;
[super setSelected:selected animated:animated];
}
- (void)configureCellWithModel:(SafeSleepModel *)model indexPath:(NSIndexPath *)indexPath {
_model = model;
_indexPath = indexPath;
self.recommandLb.text = model.title;
[self.leftIV mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.contentView.mas_left).offset(10);
make.top.equalTo(self.contentView.mas_top).offset(33);
make.width.equalTo(@4);
make.height.equalTo(@16);
}];
[self.recommandLb mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.leftIV.mas_right).offset(10);
make.centerY.equalTo(self.leftIV.mas_centerY);
}];
if (indexPath.row == 2) { // 好眠声音区域
[self.contentView addSubview:self.timerBtn];
[self.timerBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.contentView.mas_right).offset(-5);
make.width.equalTo(@100);
make.height.equalTo(@30);
make.centerY.equalTo(self.leftIV.mas_centerY);
}];
} else { // 舒眠课程和助眠音乐
[self.contentView addSubview:self.moreBtn];
[self.contentView addSubview:self.shCollectionView];
[self.moreBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.contentView.mas_right).offset(-5);
make.width.equalTo(@100);
make.height.equalTo(@30);
make.centerY.equalTo(self.leftIV.mas_centerY);
}];
[self.shCollectionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.recommandLb.mas_bottom).offset(17);
make.left.equalTo(self.leftIV);
make.right.equalTo(self.contentView);
make.bottom.equalTo(self.contentView).offset(0);
}];
}
}
- (UIView *)leftIV {
if (!_leftIV) {
_leftIV = [UIView new];
_leftIV.backgroundColor = BrandColor;
_leftIV.layer.cornerRadius = 3;
_leftIV.layer.masksToBounds = YES;
}
return _leftIV;
}
- (UILabel *)recommandLb {
if (!_recommandLb) {
_recommandLb = [UILabel dkLabWithText:@"助眠音乐" font:BoldFont(16.0)];
}
return _recommandLb;
}
- (UIButton *)moreBtn {
if (!_moreBtn) {
_moreBtn = [UIButton dkBtnWithSubTitle:@"查看全部" imgName:@"rightRow" font:SysFont(12)];
_moreBtn.frame = CGRectMake(0, 0, 100, 40);
[_moreBtn adjustLayoutWithType:UIButtonLayoutTypeLeftTitleRightImage midSpace:4 sizeToFit:NO];
[_moreBtn addTarget:self action:@selector(lookMore:) forControlEvents:UIControlEventTouchUpInside];
}
return _moreBtn;
}
- (UIButton *)timerBtn {
if (!_timerBtn) {
_timerBtn = [UIButton new];
[_timerBtn dk_setImage:DKImagePickerWithNames(@"timerIcon", @"timerIcon_dk") forState:UIControlStateNormal];
[_timerBtn addTarget:self action:@selector(timerSetting:) forControlEvents:UIControlEventTouchUpInside];
}
return _timerBtn;
}
- (SafeHelperCollectionView *)shCollectionView {
if (!_shCollectionView) {
_shCollectionView = [[SafeHelperCollectionView alloc] initCollectionViewWithIndexPath:self.indexPath];
}
return _shCollectionView;
}
#pragma mark - Actions
- (void)timerSetting:(UIButton *)sender {
DSLog(@"timerSetting");
}
- (void)lookMore:(UIButton *)sender {
DSLog(@"cellIndexPath:%ld", self.indexPath.row);
}
@end
DreamSleep/DreamSleep/Network/DSGifHeader.h
...@@ -11,7 +11,6 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -11,7 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
/// 下拉Gif刷新控件 /// 下拉Gif刷新控件
@interface DSGifHeader : MJRefreshGifHeader @interface DSGifHeader : MJRefreshGifHeader
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Profile/ProfileController.m
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
// 模拟切换黑夜模式 // 模拟切换黑夜模式
if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) { if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) {
[self.dk_manager dawnComing]; self.dk_manager.themeVersion = DKThemeVersionNormal;
} else { } else {
[self.dk_manager nightFalling]; self.dk_manager.themeVersion = DKThemeVersionNight;
} }
} }
......
DreamSleep/DreamSleep/Resource/Assets.xcassets/SafeSleep/Contents.json 0 → 100644
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
DreamSleep/DreamSleep/Resource/Assets.xcassets/SafeSleep/courseIcon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "courseIcon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "courseIcon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "courseIcon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DreamSleep/DreamSleep/Resource/Assets.xcassets/SafeSleep/rightRow.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "rightRow.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "rightRow@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DreamSleep/DreamSleep/Resource/Assets.xcassets/SafeSleep/test0.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "test0.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DreamSleep/DreamSleep/Resource/Assets.xcassets/SafeSleep/test1.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "test1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DreamSleep/DreamSleep/Resource/Assets.xcassets/SafeSleep/timerIcon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "timerIcon_dk.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "timerIcon_dk@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "timerIcon_dk@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DreamSleep/DreamSleep/Resource/Assets.xcassets/SafeSleep/timerIcon_dk.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "timerIcon_dk.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "timerIcon_dk@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "timerIcon_dk@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DreamSleep/DreamSleep/Resource/DKColorTable.txt
...@@ -11,5 +11,6 @@ NORMAL NIGHT RED ...@@ -11,5 +11,6 @@ NORMAL NIGHT RED
#FFFFFF #161E38 #FAF5F5 NaviBG #FFFFFF #161E38 #FAF5F5 NaviBG
#333333 #FFFFFF #000000 TEXT #333333 #FFFFFF #000000 TEXT
#AAAAAA #FFFFFF #000000 SubTEXT
DreamSleep/DreamSleep/Utils/AdaptationUtil.h
...@@ -68,6 +68,12 @@ ...@@ -68,6 +68,12 @@
/** 紧急提示文案颜色 */ /** 紧急提示文案颜色 */
#define UrgencyColor [UIColor colorWithHexString:@"#FD5E5E"] #define UrgencyColor [UIColor colorWithHexString:@"#FD5E5E"]
#pragma mark - 字体
/** 常规适配 */
#define SysFont(size) [UIFont systemFontOfSize:size]
/** 粗体适配 */
#define BoldFont(size) [UIFont boldSystemFontOfSize:size]
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface AdaptationUtil : NSObject @interface AdaptationUtil : NSObject
// 获取keyWindow（在iOS 13.5真机存在bug？） // 获取keyWindow（在iOS 13.5真机存在bug？）
......
DreamSleep/DreamSleep/Utils/PrefixHeader.pch
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#import <Masonry/Masonry.h> #import <Masonry/Masonry.h>
#import "UIView+Extras.h" #import "UIView+Extras.h"
#import "UILabel+Extras.h"
#import "UIButton+Extras.h"
#import "NaviBarHandlerProtocol.h" #import "NaviBarHandlerProtocol.h"
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!