dada

CAIPU.xcodeproj/project.pbxproj

@@ -35,6 +35,15 @@
 		49EF9184207CB21C008B7187 /* CPHealthModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF9183207CB21C008B7187 /* CPHealthModel.m */; };
 		49EF9187207CB7D7008B7187 /* CPHealthDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF9186207CB7D7008B7187 /* CPHealthDetailViewController.m */; };
 		49EF918C207DF89D008B7187 /* CPFindLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF918B207DF89D008B7187 /* CPFindLayout.m */; };
+		49EF918F208054C0008B7187 /* CPHomeThemeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF918E208054C0008B7187 /* CPHomeThemeModel.m */; };
+		49EF919220807DE4008B7187 /* CPCommonTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF919120807DE4008B7187 /* CPCommonTool.m */; };
+		49EF91D320808E4A008B7187 /* CPTimeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF91D220808E4A008B7187 /* CPTimeViewController.m */; };
+		49EF91F120809E83008B7187 /* MLMSegmentHead.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF91E720809E83008B7187 /* MLMSegmentHead.m */; };
+		49EF91F220809E83008B7187 /* MLMSegmentManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF91E920809E83008B7187 /* MLMSegmentManager.m */; };
+		49EF91F320809E83008B7187 /* MLMSegmentScroll.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF91EB20809E83008B7187 /* MLMSegmentScroll.m */; };
+		49EF91F420809E83008B7187 /* UIView+EasyFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF91EE20809E83008B7187 /* UIView+EasyFrame.m */; };
+		49EF91F520809E83008B7187 /* UIView+ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF91F020809E83008B7187 /* UIView+ViewController.m */; };
+		49EF91F82080A90B008B7187 /* CPTimeSegViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF91F72080A90B008B7187 /* CPTimeSegViewController.m */; };
 		C428739A2028081300502005 /* CPStepTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = C42873992028081300502005 /* CPStepTableView.m */; };
 		C42873A02028086E00502005 /* CPStepTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C428739F2028086E00502005 /* CPStepTableViewCell.m */; };
 		C444ED522017100F0082AA5C /* CPHomeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = C444ED512017100F0082AA5C /* CPHomeListModel.m */; };
@@ -160,6 +169,25 @@
 		49EF9186207CB7D7008B7187 /* CPHealthDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPHealthDetailViewController.m; sourceTree = "<group>"; };
 		49EF918A207DF89D008B7187 /* CPFindLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPFindLayout.h; sourceTree = "<group>"; };
 		49EF918B207DF89D008B7187 /* CPFindLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPFindLayout.m; sourceTree = "<group>"; };
+		49EF918D208054C0008B7187 /* CPHomeThemeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPHomeThemeModel.h; sourceTree = "<group>"; };
+		49EF918E208054C0008B7187 /* CPHomeThemeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPHomeThemeModel.m; sourceTree = "<group>"; };
+		49EF919020807DE4008B7187 /* CPCommonTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPCommonTool.h; sourceTree = "<group>"; };
+		49EF919120807DE4008B7187 /* CPCommonTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPCommonTool.m; sourceTree = "<group>"; };
+		49EF91D120808E4A008B7187 /* CPTimeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPTimeViewController.h; sourceTree = "<group>"; };
+		49EF91D220808E4A008B7187 /* CPTimeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPTimeViewController.m; sourceTree = "<group>"; };
+		49EF91E620809E83008B7187 /* MLMSegmentHead.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLMSegmentHead.h; sourceTree = "<group>"; };
+		49EF91E720809E83008B7187 /* MLMSegmentHead.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLMSegmentHead.m; sourceTree = "<group>"; };
+		49EF91E820809E83008B7187 /* MLMSegmentManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLMSegmentManager.h; sourceTree = "<group>"; };
+		49EF91E920809E83008B7187 /* MLMSegmentManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLMSegmentManager.m; sourceTree = "<group>"; };
+		49EF91EA20809E83008B7187 /* MLMSegmentScroll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLMSegmentScroll.h; sourceTree = "<group>"; };
+		49EF91EB20809E83008B7187 /* MLMSegmentScroll.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLMSegmentScroll.m; sourceTree = "<group>"; };
+		49EF91EC20809E83008B7187 /* SegmentPageHead.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentPageHead.h; sourceTree = "<group>"; };
+		49EF91ED20809E83008B7187 /* UIView+EasyFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+EasyFrame.h"; sourceTree = "<group>"; };
+		49EF91EE20809E83008B7187 /* UIView+EasyFrame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+EasyFrame.m"; sourceTree = "<group>"; };
+		49EF91EF20809E83008B7187 /* UIView+ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+ViewController.h"; sourceTree = "<group>"; };
+		49EF91F020809E83008B7187 /* UIView+ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+ViewController.m"; sourceTree = "<group>"; };
+		49EF91F62080A90B008B7187 /* CPTimeSegViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPTimeSegViewController.h; sourceTree = "<group>"; };
+		49EF91F72080A90B008B7187 /* CPTimeSegViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPTimeSegViewController.m; sourceTree = "<group>"; };
 		5D7DDE3161671277618A2624 /* Pods-CAIPU.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CAIPU.release.xcconfig"; path = "Pods/Target Support Files/Pods-CAIPU/Pods-CAIPU.release.xcconfig"; sourceTree = "<group>"; };
 		83372F69E447D8645B21F903 /* Pods-CAIPU.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CAIPU.debug.xcconfig"; path = "Pods/Target Support Files/Pods-CAIPU/Pods-CAIPU.debug.xcconfig"; sourceTree = "<group>"; };
 		C42873982028081300502005 /* CPStepTableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPStepTableView.h; sourceTree = "<group>"; };
@@ -426,6 +454,25 @@
 			path = Source;
 			sourceTree = "<group>";
 		};
+		49EF91E520809E83008B7187 /* MLMSegmentPageView */ = {
+			isa = PBXGroup;
+			children = (
+				49EF91E620809E83008B7187 /* MLMSegmentHead.h */,
+				49EF91E720809E83008B7187 /* MLMSegmentHead.m */,
+				49EF91E820809E83008B7187 /* MLMSegmentManager.h */,
+				49EF91E920809E83008B7187 /* MLMSegmentManager.m */,
+				49EF91EA20809E83008B7187 /* MLMSegmentScroll.h */,
+				49EF91EB20809E83008B7187 /* MLMSegmentScroll.m */,
+				49EF91EC20809E83008B7187 /* SegmentPageHead.h */,
+				49EF91ED20809E83008B7187 /* UIView+EasyFrame.h */,
+				49EF91EE20809E83008B7187 /* UIView+EasyFrame.m */,
+				49EF91EF20809E83008B7187 /* UIView+ViewController.h */,
+				49EF91F020809E83008B7187 /* UIView+ViewController.m */,
+			);
+			name = MLMSegmentPageView;
+			path = "../../../../../../../../Downloads/MLMSegmentPage-master/MLMSegmentPageView";
+			sourceTree = "<group>";
+		};
 		C47D02702011EF5D00E5C025 /* NewPagedFlowView */ = {
 			isa = PBXGroup;
 			children = (
@@ -459,6 +506,7 @@
 		C4B7E2992011D1D00046C0EC /* Third(第三方) */ = {
 			isa = PBXGroup;
 			children = (
+				49EF91E520809E83008B7187 /* MLMSegmentPageView */,
 				49EF914A2073787C008B7187 /* SDCycleScrollView */,
 				C47D02902013198900E5C025 /* CPSegmentControl.h */,
 				C47D02912013198900E5C025 /* CPSegmentControl.m */,
@@ -622,6 +670,10 @@
 				C4B4106E202077A300C95284 /* CPDetailViewController.m */,
 				49EF9164207466CF008B7187 /* CPThemeDetailController.h */,
 				49EF9165207466CF008B7187 /* CPThemeDetailController.m */,
+				49EF91D120808E4A008B7187 /* CPTimeViewController.h */,
+				49EF91D220808E4A008B7187 /* CPTimeViewController.m */,
+				49EF91F62080A90B008B7187 /* CPTimeSegViewController.h */,
+				49EF91F72080A90B008B7187 /* CPTimeSegViewController.m */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -643,6 +695,8 @@
 				C4B4225E2021638700C95284 /* CPStepModel.m */,
 				C4B422602021653100C95284 /* CPIngredientModel.h */,
 				C4B422612021653100C95284 /* CPIngredientModel.m */,
+				49EF918D208054C0008B7187 /* CPHomeThemeModel.h */,
+				49EF918E208054C0008B7187 /* CPHomeThemeModel.m */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -719,6 +773,8 @@
 			children = (
 				497B1C2F2056503E00EBB024 /* SortDictManager.h */,
 				497B1C2E2056503D00EBB024 /* SortDictManager.m */,
+				49EF919020807DE4008B7187 /* CPCommonTool.h */,
+				49EF919120807DE4008B7187 /* CPCommonTool.m */,
 				C4F5116820106F8D0012111E /* CPHTTP.h */,
 				C4F5116920106F8D0012111E /* CPHTTP.m */,
 			);
@@ -886,7 +942,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		71393BF3FFF1783FF67A3610 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 8;
 			files = (
 			);
 			inputPaths = (
@@ -897,10 +953,9 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/Pods-CAIPU-checkManifestLockResult.txt",
 			);
-			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
 		};
 		9377BA666AA34D731D8222DC /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -956,9 +1011,11 @@
 				C4B4225F2021638700C95284 /* CPStepModel.m in Sources */,
 				C47D02952013265300E5C025 /* CPRequestViewModel.m in Sources */,
 				49EF9103207318A4008B7187 /* CPVideoCell.m in Sources */,
+				49EF919220807DE4008B7187 /* CPCommonTool.m in Sources */,
 				497B1BDD205138AC00EBB024 /* CPHistoryCell.m in Sources */,
 				497B1BE720523E2500EBB024 /* CPFeedBackController.m in Sources */,
 				C47D02982013296500E5C025 /* CPCategoryModel.m in Sources */,
+				49EF91F520809E83008B7187 /* UIView+ViewController.m in Sources */,
 				C4B4225C2021634700C95284 /* CPDetailModel.m in Sources */,
 				C4B422652021661E00C95284 /* CPDetailHeaderView.m in Sources */,
 				C4F5115B201034B10012111E /* CPTabBarController.m in Sources */,
@@ -975,12 +1032,14 @@
 				49EF90CE2071F8A5008B7187 /* CPHealthViewController.m in Sources */,
 				C47D02792011F2C000E5C025 /* CPHomeHeaderView.m in Sources */,
 				49EF9184207CB21C008B7187 /* CPHealthModel.m in Sources */,
+				49EF91F220809E83008B7187 /* MLMSegmentManager.m in Sources */,
 				C444ED522017100F0082AA5C /* CPHomeListModel.m in Sources */,
 				49EF90C32071CADC008B7187 /* CPThemeCollectionCell.m in Sources */,
 				497B1BE420523E0100EBB024 /* PlaceholderTextView.m in Sources */,
 				49EF915E2073787C008B7187 /* SDCollectionViewCell.m in Sources */,
 				C47D027C2011F64800E5C025 /* CPHotButton.m in Sources */,
 				C4B422622021653100C95284 /* CPIngredientModel.m in Sources */,
+				49EF91F420809E83008B7187 /* UIView+EasyFrame.m in Sources */,
 				C4F5116720106F0D0012111E /* MBProgressHUD+Extension.m in Sources */,
 				C4B4106F202077A300C95284 /* CPDetailViewController.m in Sources */,
 				C4F51152201033180012111E /* CPHomeViewController.m in Sources */,
@@ -990,16 +1049,20 @@
 				C4E30ECB202023B300B61788 /* CPSearchResultView.m in Sources */,
 				49EF91602073787C008B7187 /* UIView+SDExtension.m in Sources */,
 				C457079C2015827500F60FEE /* CPSearchManager.m in Sources */,
+				49EF918F208054C0008B7187 /* CPHomeThemeModel.m in Sources */,
 				497B1BE02051458700EBB024 /* CPCollectionModel.m in Sources */,
 				49EF916320737A6E008B7187 /* CPHealthCell.m in Sources */,
 				49EF915D2073787C008B7187 /* TAPageControl.m in Sources */,
+				49EF91F82080A90B008B7187 /* CPTimeSegViewController.m in Sources */,
 				C4B4226B2022BCFD00C95284 /* CPDetailTableView.m in Sources */,
 				C4F51155201033290012111E /* CPMoreViewController.m in Sources */,
 				C4B422682022A6FD00C95284 /* CPPerceptionView.m in Sources */,
 				49EF9187207CB7D7008B7187 /* CPHealthDetailViewController.m in Sources */,
 				C47ACA7D20108984005DA04C /* CPClassifyRightCollectionViewCell.m in Sources */,
 				497B1BD720512E6300EBB024 /* CPMyHistoryController.m in Sources */,
+				49EF91F120809E83008B7187 /* MLMSegmentHead.m in Sources */,
 				49EF90D42071FD59008B7187 /* CPPhotoCell.m in Sources */,
+				49EF91D320808E4A008B7187 /* CPTimeViewController.m in Sources */,
 				C4F5116A20106F8D0012111E /* CPHTTP.m in Sources */,
 				C42873A02028086E00502005 /* CPStepTableViewCell.m in Sources */,
 				C47D02762011EF5D00E5C025 /* PGIndexBannerSubiew.m in Sources */,
@@ -1009,6 +1072,7 @@
 				49EF915A2073787C008B7187 /* TAAbstractDotView.m in Sources */,
 				49EF90D12071FA62008B7187 /* CPFindViewController.m in Sources */,
 				497B1BEB205259B400EBB024 /* CPAboutViewController.m in Sources */,
+				49EF91F320809E83008B7187 /* MLMSegmentScroll.m in Sources */,
 				C4B7E2952011A1820046C0EC /* CPSearchViewController.m in Sources */,
 				C4F5116D2010726D0012111E /* CPClassifyLeftView.m in Sources */,
 				C4F5116120103B350012111E /* CPDismissViewController.m in Sources */,

CAIPU/Main/Classification(分类)/Models/CPHomeListModel.h

@@ -15,5 +15,6 @@
 @property (nonatomic,strong)NSNumber *views;
 @property (nonatomic,copy)  NSString *title;
 @property (nonatomic,copy)  NSString *url;
+@property (nonatomic,copy)  NSString *intro;
 
 @end

CAIPU/Main/Classification(分类)/Models/CPRequestViewModel.m

@@ -29,7 +29,7 @@
 }
 
 + (void)requestBannerData:(void (^)(NSArray *data))success{
-    NSString *urlString = [NSString stringWithFormat:@"%@/features/getBannerRecommend",URL];
+    NSString *urlString = [NSString stringWithFormat:@"%@/features/earlyMiddleAndLateTheme",URL];
     [CPHTTP post:urlString params:nil success:^(id json) {
         success(json);
     } failure:^(NSError *error) {
@@ -47,7 +47,7 @@
 }
 
 + (void)requestHomeTime:(NSNumber *)page Data:(void (^)(NSArray *data))success{
-    NSString *urlString = [NSString stringWithFormat:@"%@/features/getRecommend",URL];
+    NSString *urlString = [NSString stringWithFormat:@"%@/features/theLastRecipes",URL];
     [CPHTTP post:urlString params:@{@"page":page} success:^(id json) {
         success(json);
     } failure:^(NSError *error) {

CAIPU/Main/Find(发现)/View/CPPhotoCell.h

@@ -14,7 +14,6 @@ static NSString *KCPPhotoCellIdTwo = @"CPPhotoCellTypeTwoPic";
 static NSString *KCPPhotoCellIdThree = @"CPPhotoCellTypeThreePic";
 
 @interface CPPhotoCell : UITableViewCell
-+ (instancetype)cellWithTableView:(UITableView *)tableView;
 
 @property (nonatomic, strong) NSArray *photos;
 @property (nonatomic, strong) CPFindModel *model;

CAIPU/Main/Find(发现)/View/CPPhotoCell.m

@@ -10,6 +10,7 @@
 #import "PYPhotosView.h"
 #import "PYPhotoBrowseView.h"
 #import "CPFindIconView.h"
+#import "CPCommonTool.h"
 
 @interface CPPhotoCell ()
 @property (nonatomic, strong) UIView *content;
@@ -111,7 +112,7 @@
 - (void)setModel:(CPFindModel *)model {
     _model = model;
     self.nickLabel.text = model.vest_name;
-    self.timeLabel.text = model.publish_time;
+    self.timeLabel.text = [CPCommonTool getDateWith:model.publish_time];
     
     [self.iconView configViewWithIcons:model.thumb_up_imgs upCount:model.thumb_up_num];
     

CAIPU/Main/Find(发现)/View/CPVideoCell.m

@@ -8,6 +8,7 @@
 
 #import "CPVideoCell.h"
 #import "CPFindIconView.h"
+#import "CPCommonTool.h"
 
 @interface CPVideoCell ()
 @property (nonatomic, strong) UIView *content;
@@ -118,7 +119,8 @@
 - (void)setModel:(CPFindModel *)model {
     _model = model;
     self.nickLabel.text = model.vest_name;
-    self.timeLabel.text = model.publish_time;
+    self.timeLabel.text = [CPCommonTool getDateWith:model.publish_time];
+  
     [self.videoImage sd_setImageWithURL:[NSURL URLWithString:model.publish_info.firstObject]];
     
     [self.iconView configViewWithIcons:model.thumb_up_imgs upCount:model.thumb_up_num];

CAIPU/Main/Health(健康)/Controller/CPHealthViewController.m

@@ -21,6 +21,12 @@
 
 @implementation CPHealthViewController
 
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     

CAIPU/Main/Home(菜谱大全)/Controllers/CPHomeViewController.m

@@ -13,11 +13,14 @@
 #import "CPHomeListModel.h"
 #import "CPDetailViewController.h"
 #import "CPThemeCollectionCell.h"
+#import "CPHomeThemeModel.h"
+#import "CPThemeDetailController.h"
+#import "CPTimeViewController.h"
 
 static NSString *const homeIdentifier = @"homeIdentifier";
 static NSString *const themeIdentifier = @"themeIdentifier";
 
-@interface CPHomeViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,CPHomeHeaderViewDelegate>{
+@interface CPHomeViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,CPHomeHeaderViewDelegate,CPThemeCollectionCellDelegate>{
     NSInteger _page;
 }
 
@@ -29,6 +32,7 @@ static NSString *const themeIdentifier = @"themeIdentifier";
 
 @property (nonatomic, strong) UICollectionReusableView *headerView;
 @property (nonatomic, strong) UICollectionReusableView *sectionHeader;
+@property (nonatomic, strong) NSMutableArray *themeList;
 @end
 
 @implementation CPHomeViewController
@@ -42,6 +46,7 @@ static NSString *const themeIdentifier = @"themeIdentifier";
     [self createNav];
     [self createView];
     [self requestData:@(_page)];
+    [self requestThemeData];
 }
 
 - (void)viewWillAppear:(BOOL)animated{
@@ -73,9 +78,6 @@ static NSString *const themeIdentifier = @"themeIdentifier";
 - (void)createView{
     
     UICollectionViewFlowLayout *flowLayout = [[UICollectionViewFlowLayout alloc]init];
-//    flowLayout.itemSize = CGSizeMake((SCREEN_WIDTH - 30) / 2, 220*SCREEN_MUTI);
-//    flowLayout.minimumLineSpacing = 10;
-//    flowLayout.minimumInteritemSpacing = 5;
     UICollectionView *collectionView = [[UICollectionView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT - NavHeight - TabbarHeight) collectionViewLayout:flowLayout];
     self.collectionView = collectionView;
     collectionView.backgroundColor = [UIColor backgroudColor];
@@ -125,6 +127,26 @@ static NSString *const themeIdentifier = @"themeIdentifier";
     }];
 }
 
+
+/**
+ 加载主题的数据
+ */
+- (void)requestThemeData {
+    
+    NSString *urlString = [NSString stringWithFormat:@"%@/features/otherTheme",URL];
+    [CPHTTP post:urlString params:nil success:^(id json) {
+        
+        NSArray *list = [NSArray yy_modelArrayWithClass:[CPHomeThemeModel class] json:json];
+        [self.themeList addObjectsFromArray:list];
+        
+        [self.collectionView reloadData];
+    } failure:^(NSError *error) {
+        
+    }];
+    
+}
+
+
 - (void)searchAction{
    
     CPSearchViewController *search = [[CPSearchViewController alloc]init];
@@ -142,7 +164,7 @@ static NSString *const themeIdentifier = @"themeIdentifier";
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
     if (section == 0) {
-        return 3;
+        return self.themeList.count;
     }
     return self.dataSource.count;
 }
@@ -177,6 +199,7 @@ static NSString *const themeIdentifier = @"themeIdentifier";
     
     if (indexPath.section == 0) {
         CPThemeCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:themeIdentifier forIndexPath:indexPath];
+        cell.delegate = self;
         return cell;
     }
     
@@ -259,6 +282,24 @@ static NSString *const themeIdentifier = @"themeIdentifier";
  热门推荐 查看全部
  */
 - (void)allAction {
+    CPTimeViewController *time = [[CPTimeViewController alloc] init];
+    [self.navigationController pushViewController:time animated:YES];
+}
+
+#pragma mark ------------- CPThemeCollectionCellDelegate-----
+
+/**
+ 主题查看全部
+*/
+- (void)CPThemeCollectionCellClickAll:(CPHomeThemeModel *)model {
+    CPThemeDetailController *detail = [[CPThemeDetailController alloc] init];
+    [self.navigationController pushViewController:detail animated:YES];
+}
+
+/**
+ 点击主题里的商品
+ */
+- (void)CPThemeCollectionCellDidClickItemAtIndex:(NSInteger)index model:(CPHomeListModel *)model {
     
 }
 
@@ -283,6 +324,13 @@ static NSString *const themeIdentifier = @"themeIdentifier";
     return _dataSource;
 }
 
+- (NSMutableArray *)themeList {
+    if (!_themeList) {
+        _themeList = [NSMutableArray array];
+    }
+    return _themeList;
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -298,4 +346,6 @@ static NSString *const themeIdentifier = @"themeIdentifier";
 }
 */
 
+
+
 @end

CAIPU/Main/Home(菜谱大全)/Controllers/CPThemeDetailController.h

@@ -8,7 +8,8 @@
 
 #import <UIKit/UIKit.h>
 #import "CPBaseViewController.h"
+#import "CPHomeThemeModel.h"
 
 @interface CPThemeDetailController : CPBaseViewController
-
+@property (nonatomic, strong) CPHomeThemeModel *themeModel;
 @end

CAIPU/Main/Home(菜谱大全)/Controllers/CPThemeDetailController.m

@@ -109,7 +109,7 @@ static NSString *const homeIdentifier = @"homeIdentifier";
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    return 10;
+    return self.themeModel.menuList.count;
 }
 
 
@@ -118,7 +118,9 @@ static NSString *const homeIdentifier = @"homeIdentifier";
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     
+    CPHomeListModel *model = self.themeModel.menuList[indexPath.row];
     CPChoiceCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:homeIdentifier forIndexPath:indexPath];
+    cell.listModel = model;
     return cell;
 }
 
@@ -132,7 +134,6 @@ static NSString *const homeIdentifier = @"homeIdentifier";
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath {
-    NSLog(@"333");
 }
 - (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath NS_AVAILABLE_IOS(8_0) {
     self.collectionView.height = self.collectionView.contentSize.height;

CAIPU/Main/Home(菜谱大全)/Controllers/CPTimeSegViewController.h

@@ -0,0 +1,15 @@
+//
+//  CPTimeSegViewController.h
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/13.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "CPBaseViewController.h"
+@interface CPTimeSegViewController : CPBaseViewController
+
+@property (nonatomic, copy) NSString *themeId;
+
+@end

CAIPU/Main/Home(菜谱大全)/Controllers/CPTimeSegViewController.m

@@ -0,0 +1,184 @@
+//
+//  CPTimeSegViewController.m
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/13.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "CPTimeSegViewController.h"
+#import "CPChoiceCollectionViewCell.h"
+#import "CPDetailViewController.h"
+#import "CPHomeListModel.h"
+static NSString *timeCellID = @"timeCellID";
+static NSString *reusableHeader = @"reusableHeader";
+
+@interface CPTimeSegViewController ()<UICollectionViewDelegate,UICollectionViewDataSource>
+@property (nonatomic, strong) UICollectionView *collectionView;
+@property (nonatomic, strong) NSMutableArray *dataArr;
+@property (nonatomic, strong) UICollectionReusableView *header;
+@property (nonatomic, strong) CPHomeListModel *topModel;
+@end
+
+@implementation CPTimeSegViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self requestData];
+    [self createView];
+   
+}
+
+- (void)createView{
+    
+    UICollectionViewFlowLayout *flowLayout = [[UICollectionViewFlowLayout alloc]init];
+    UICollectionView *collectionView = [[UICollectionView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT - NavHeight) collectionViewLayout:flowLayout];
+    self.collectionView = collectionView;
+    flowLayout.itemSize = CGSizeMake((SCREEN_WIDTH - 20 -5) / 2, 220*SCREEN_MUTI);
+    collectionView.backgroundColor = [UIColor backgroudColor];
+    [collectionView registerClass:[CPChoiceCollectionViewCell class] forCellWithReuseIdentifier:timeCellID];
+    
+    [collectionView registerClass:[UICollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"header"];
+    [collectionView registerClass:[UICollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"sectionHeader"];
+    collectionView.delegate = self;
+    collectionView.dataSource = self;
+     [collectionView registerClass:[UICollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:reusableHeader];
+    
+    //上拉加载
+    MJRefreshAutoNormalFooter *footer=[[MJRefreshAutoNormalFooter alloc]init];
+    [footer setRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
+    collectionView.mj_footer = footer;
+    [self.view addSubview:collectionView];
+}
+
+- (void)requestData {
+    
+    NSString *urlString = [NSString stringWithFormat:@"%@/features/menuList",URL];
+    NSDictionary *param = @{@"id":@""};
+    [CPHTTP post:urlString params:param success:^(id json) {
+        
+        NSArray *list = [NSArray yy_modelArrayWithClass:[CPHomeListModel class] json:json];
+        self.topModel = list.firstObject;
+        [self.dataArr addObjectsFromArray:list];
+        [self.dataArr removeObjectAtIndex:0];
+        
+        [self.collectionView reloadData];
+        
+    } failure:^(NSError *error) {
+        
+    }];
+}
+
+
+- (void)loadMoreData {
+    
+}
+
+
+#pragma mark ------------------ collectionView delegete -----------
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
+    return 1;
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return self.dataArr.count;
+}
+
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section {
+   
+    return 10;
+}
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section {
+    return 5;
+}
+
+
+- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    
+    CPHomeListModel *model = self.dataArr[indexPath.row];
+    CPChoiceCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:timeCellID forIndexPath:indexPath];
+    cell.listModel = model;
+    return cell;
+}
+
+- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
+{
+    
+    self.header = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:reusableHeader forIndexPath:indexPath];
+    
+    UIImageView *imgView = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, SCREEN_WIDTH-20, (SCREEN_WIDTH-20)*9/16)];
+    imgView.userInteractionEnabled = YES;
+    [imgView sd_setImageWithURL:[NSURL URLWithString:self.topModel.url] placeholderImage:Placehold_Img];
+    [self.header addSubview:imgView];
+    
+    UILabel *label = [[UILabel alloc] initWithFrame:imgView.bounds];
+    NSMutableParagraphStyle  *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+    [paragraphStyle  setLineSpacing:8];
+    
+    NSString  *testString = @"设置Label的行间距设置Label的行间距设置Label的行间距设置Label的行间距设置Label的行间距设置Label的行间距设置";
+    NSMutableAttributedString  *setString = [[NSMutableAttributedString alloc] initWithString:testString];
+    [setString  addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, [testString length])];
+    [label  setAttributedText:setString];
+    label.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4];
+    label.textAlignment = NSTextAlignmentCenter;
+    label.font = [UIFont boldSystemFontOfSize:16];
+    label.textColor = [UIColor whiteColor];
+    label.numberOfLines = 0;
+    [imgView addSubview:label];
+    [self.header addSubview:imgView];
+    
+    UILabel *titleLb = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(imgView.frame), SCREEN_WIDTH, 60)];
+    titleLb.text = @"—————— 往期精选 —————— ";
+    titleLb.textAlignment = NSTextAlignmentCenter;
+    titleLb.font = [UIFont systemFontOfSize:15];
+    titleLb.textColor = [UIColor middleTitleColor];
+    [self.header addSubview:titleLb];
+    
+    
+    
+    
+    return self.header;
+    
+}
+
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
+{
+    return CGSizeMake(SCREEN_WIDTH, (SCREEN_WIDTH-20)*9/16+10+60);
+    
+}
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+    CPHomeListModel *model = self.dataArr[indexPath.row];
+    CPDetailViewController *detail = [[CPDetailViewController alloc]init];
+    detail.menu_id = model.Id;
+    [self.navigationController pushViewController:detail animated:YES];
+}
+
+-(UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
+{
+    return UIEdgeInsetsMake(0, 10, 0, 10);
+    
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

CAIPU/Main/Home(菜谱大全)/Controllers/CPTimeViewController.h

@@ -0,0 +1,14 @@
+//
+//  CPTimeViewController.h
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/13.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "CPBaseViewController.h"
+
+@interface CPTimeViewController : CPBaseViewController
+
+@end

CAIPU/Main/Home(菜谱大全)/Controllers/CPTimeViewController.m

@@ -0,0 +1,99 @@
+//
+//  CPTimeViewController.m
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/13.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "CPTimeViewController.h"
+#import "MLMSegmentHead.h"
+#import "MLMSegmentManager.h"
+#import "CPThemeDetailController.h"
+#import "CPTimeSegViewController.h"
+
+@interface CPTimeViewController ()<MLMSegmentHeadDelegate>
+@property (nonatomic, strong) MLMSegmentHead *titleView;
+@property (nonatomic, strong) MLMSegmentScroll *segScroll;
+@end
+
+@implementation CPTimeViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self createNav];
+    [self configNavigationBar];
+}
+
+-(void)createNav{
+    
+    [self addLeftBarButtonItemWithImageName:@"home_back" title:nil target:self selector:@selector(backAction)];
+    if (@available(iOS 11.0, *)) {
+        self.segScroll.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;//UIScrollView也适用
+    }else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+}
+
+-(void)backAction{
+    
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (void)configNavigationBar {
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    
+    NSArray *titles = @[@"早餐",@"午餐",@"晚餐"];
+    
+    NSMutableArray *list = [NSMutableArray array];
+    for (int i = 0; i < titles.count; i++) {
+        CPTimeSegViewController *seg = [[CPTimeSegViewController alloc] init];
+        
+        [list addObject:seg];
+    }
+    self.segScroll = [[MLMSegmentScroll alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-NavHeight) vcOrViews:list];
+    self.segScroll.loadAll = YES;
+    self.titleView = [[MLMSegmentHead alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-100, 44) titles:titles headStyle:SegmentHeadStyleArrow layoutStyle:MLMSegmentLayoutCenter];
+    self.titleView.headColor = [UIColor clearColor];
+    self.titleView.fontScale = 1.2;
+    self.titleView.fontSize = 14;
+    self.titleView.lineScale = .8;
+    self.titleView.arrowColor = [UIColor CPColorWithHex:0xff442a];
+    self.titleView.equalSize = YES;
+    self.titleView.bottomLineHeight = 0;
+    self.titleView.lineColor = [UIColor CPColorWithHex:0xff442a];
+    self.titleView.selectColor = [UIColor CPColorWithHex:0xff442a];
+    self.titleView.deSelectColor = [UIColor CPColorWithHex:0x666666];
+    [MLMSegmentManager associateHead:self.titleView withScroll:self.segScroll completion:^{
+        self.navigationItem.titleView = self.titleView;
+        [self.view addSubview:self.segScroll];
+    }];
+    
+    
+}
+
+#pragma mark --------------------- MLMSegmentHeadDelegate ---------
+
+- (void)didSelectedIndex:(NSInteger)index {
+    
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

CAIPU/Main/Home(菜谱大全)/Models/CPBannerModel.h

@@ -13,6 +13,6 @@
 @property (nonatomic, strong) NSNumber *Id;
 @property (nonatomic, copy)   NSString *title;             //轮播用
 @property (nonatomic, copy)   NSString *url;
-@property (nonatomic, copy)   NSString *name;              //热门用
-
+@property (nonatomic, copy)   NSString *name;
+@property (nonatomic, copy)   NSString *display_position;//1、2、3 对应 早、午、晚
 @end

CAIPU/Main/Home(菜谱大全)/Models/CPHomeThemeModel.h

@@ -0,0 +1,20 @@
+//
+//  CPHomeThemeModel.h
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/13.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CPHomeListModel.h"
+
+@interface CPHomeThemeModel : NSObject
+
+@property (nonatomic, strong) NSString *Id;
+@property (nonatomic, strong) NSString *title;
+@property (nonatomic, strong) NSString *url;
+@property (nonatomic, strong) NSString *intro;
+@property (nonatomic, strong) NSArray <CPHomeListModel *>*menuList;
+
+@end

CAIPU/Main/Home(菜谱大全)/Models/CPHomeThemeModel.m

@@ -0,0 +1,15 @@
+//
+//  CPHomeThemeModel.m
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/13.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "CPHomeThemeModel.h"
+
+@implementation CPHomeThemeModel
++ (NSDictionary *)modelCustomPropertyMapper {
+    return @{@"Id" : @"id"};
+}
+@end

CAIPU/Main/Home(菜谱大全)/Views/CPHomeHeaderView.m

@@ -88,8 +88,8 @@
         for (CPBannerModel *model in array) {
             [self.bannerArray addObject:model];
         }
-        CPBannerModel *model = self.bannerArray[0];
-        [self.titleButton setTitle:model.title forState:UIControlStateNormal];
+//        CPBannerModel *model = self.bannerArray[0];
+//        [self.titleButton setTitle:model.title forState:UIControlStateNormal];
         [self.bannerView reloadData];
     }];
 }

CAIPU/Main/Home(菜谱大全)/Views/CPThemeCollectionCell.h

@@ -7,16 +7,27 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "CPHomeThemeModel.h"
+#import "CPHomeListModel.h"
+
+@protocol CPThemeCollectionCellDelegate<NSObject>
+
+- (void)CPThemeCollectionCellClickAll:(CPHomeThemeModel *)model;
+- (void)CPThemeCollectionCellDidClickItemAtIndex:(NSInteger)index model:(CPHomeListModel *)model;
 
-@interface CPThemeCollectionCell : UICollectionViewCell
 
 @end
 
+@interface CPThemeCollectionCell : UICollectionViewCell
+@property (nonatomic, strong) CPHomeThemeModel *themeModel;
+@property (nonatomic, weak) id <CPThemeCollectionCellDelegate> delegate;
+@end
+
 
 
 #pragma mark --============cell=========
 
 @interface CPThemeItem : UICollectionViewCell
-
+@property (nonatomic, strong) CPHomeListModel *listModel;
 
 @end

CAIPU/Main/Home(菜谱大全)/Views/CPThemeCollectionCell.m

@@ -13,6 +13,7 @@
 @property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UICollectionView *collectionView;
 @property (nonatomic, strong) UILabel *allButton;
+@property (nonatomic, strong) NSArray *dataArr;
 
 @end
 
@@ -62,22 +63,34 @@
 }
 
 
+- (void)setThemeModel:(CPHomeThemeModel *)themeModel {
+    _themeModel = themeModel;
+    self.titleLabel.text = themeModel.title;
+    self.dataArr = themeModel.menuList.mutableCopy;
+    [self.collectionView reloadData];
+}
+
+
 #pragma mark -----------------
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
-    return 10;
+    return self.dataArr.count;
 }
 
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
     CPThemeItem *item = [collectionView dequeueReusableCellWithReuseIdentifier:@"CPThemeItem" forIndexPath:indexPath];
-    
+    CPHomeListModel *listModel = self.dataArr[indexPath.row];
+    item.listModel = listModel;
     return item;
 }
 
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
-   
+    if (self.delegate && [self.delegate respondsToSelector:@selector(CPThemeCollectionCellDidClickItemAtIndex:model:)]) {
+        CPHomeListModel *model = self.dataArr[indexPath.row];
+        [self.delegate CPThemeCollectionCellDidClickItemAtIndex:indexPath.row model:model];
+    }
 }
 
 @end
@@ -119,6 +132,12 @@
     }];
 }
 
+- (void)setListModel:(CPHomeListModel *)listModel {
+    _listModel = listModel;
+    [self.imageView sd_setImageWithURL:[NSURL URLWithString:listModel.url] placeholderImage:Placehold_Img];
+    self.titleLabel.text = listModel.title;
+}
+
 - (UIImageView *)imageView {
     if (!_imageView) {
         _imageView = [[UIImageView alloc] init];

CAIPU/Main/Tools(工具)/CPCommonTool.h

@@ -0,0 +1,15 @@
+//
+//  CPCommonTool.h
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/13.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CPCommonTool : NSObject
+//时间戳转多久前
++ (NSString *)getDateWith:(NSString *)ctime;
+
+@end

CAIPU/Main/Tools(工具)/CPCommonTool.m

@@ -0,0 +1,115 @@
+//
+//  CPCommonTool.m
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/13.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "CPCommonTool.h"
+
+@implementation CPCommonTool
+
++ (NSString *)getDateWith:(NSString *)ctime {
+    
+    
+    
+    NSTimeInterval time=[ctime doubleValue];
+    
+    
+    NSDate * detaildate=[NSDate dateWithTimeIntervalSince1970:time];
+    
+    
+    NSString *currentDateStr = [self dateToNSString:detaildate];
+    
+    
+    return currentDateStr;
+    
+}
+
++(NSString*)dateToNSString:(NSDate*)date
+
+{
+
+    NSTimeInterval late = [date timeIntervalSince1970]*1;
+    
+    NSString * timeString = nil;
+    
+    NSDate * dat = [NSDate dateWithTimeIntervalSinceNow:0];
+    
+    NSTimeInterval now = [dat timeIntervalSince1970]*1;
+    
+    NSTimeInterval cha = now - late;
+    if (cha/3600 < 1) {
+        
+        timeString = [NSString stringWithFormat:@"%f", cha/60];
+        
+        timeString = [timeString substringToIndex:timeString.length-7];
+        
+        int num= [timeString intValue];
+        
+        if (num <= 1) {
+            
+            timeString = [NSString stringWithFormat:@"刚刚"];
+            
+        }else{
+            
+            timeString = [NSString stringWithFormat:@"%@分钟前", timeString];
+            
+        }
+        
+    }
+    
+    if (cha/3600 > 1 && cha/86400 < 1) {
+        
+        timeString = [NSString stringWithFormat:@"%f", cha/3600];
+        
+        timeString = [timeString substringToIndex:timeString.length-7];
+        
+        timeString = [NSString stringWithFormat:@"%@小时前", timeString];
+        
+    }
+    
+    if (cha/86400 > 1)
+        
+    {
+        
+        timeString = [NSString stringWithFormat:@"%f", cha/86400];
+        
+        timeString = [timeString substringToIndex:timeString.length-7];
+        
+        int num = [timeString intValue];
+        
+        if (num < 2) {
+            
+            timeString = [NSString stringWithFormat:@"昨天"];
+            
+        }else if(num == 2){
+            
+            timeString = [NSString stringWithFormat:@"前天"];
+            
+        }else if (num > 2 && num <7){
+            
+            timeString = [NSString stringWithFormat:@"%@天前", timeString];
+            
+        }
+        else if (num >= 7 && num <= 10) {
+        
+            timeString = [NSString stringWithFormat:@"1周前"];
+        
+        }
+        else if(num >= 7){
+            
+            timeString = [NSString stringWithFormat:@"%@天前", timeString];
+            
+        }
+        
+    }
+    
+    
+    
+    return timeString;
+}
+
+
+@end