new version

CAIPU.xcodeproj/project.pbxproj

@@ -14,6 +14,11 @@
 		497B1BE720523E2500EBB024 /* CPFeedBackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 497B1BE620523E2500EBB024 /* CPFeedBackController.m */; };
 		497B1BEB205259B400EBB024 /* CPAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 497B1BE9205259B400EBB024 /* CPAboutViewController.m */; };
 		497B1BEC205259B400EBB024 /* CPAboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 497B1BEA205259B400EBB024 /* CPAboutViewController.xib */; };
+		497B1C302056503E00EBB024 /* SortDictManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 497B1C2E2056503D00EBB024 /* SortDictManager.m */; };
+		49EF90C32071CADC008B7187 /* CPThemeCollectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF90C22071CADC008B7187 /* CPThemeCollectionCell.m */; };
+		49EF90CE2071F8A5008B7187 /* CPHealthViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF90CD2071F8A5008B7187 /* CPHealthViewController.m */; };
+		49EF90D12071FA62008B7187 /* CPFindViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF90D02071FA62008B7187 /* CPFindViewController.m */; };
+		49EF90D42071FD59008B7187 /* CPPhotoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 49EF90D32071FD59008B7187 /* CPPhotoCell.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 */; };
@@ -98,6 +103,16 @@
 		497B1BE8205259B400EBB024 /* CPAboutViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPAboutViewController.h; sourceTree = "<group>"; };
 		497B1BE9205259B400EBB024 /* CPAboutViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPAboutViewController.m; sourceTree = "<group>"; };
 		497B1BEA205259B400EBB024 /* CPAboutViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CPAboutViewController.xib; sourceTree = "<group>"; };
+		497B1C2E2056503D00EBB024 /* SortDictManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SortDictManager.m; sourceTree = "<group>"; };
+		497B1C2F2056503E00EBB024 /* SortDictManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SortDictManager.h; sourceTree = "<group>"; };
+		49EF90C12071CADC008B7187 /* CPThemeCollectionCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPThemeCollectionCell.h; sourceTree = "<group>"; };
+		49EF90C22071CADC008B7187 /* CPThemeCollectionCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPThemeCollectionCell.m; sourceTree = "<group>"; };
+		49EF90CC2071F8A5008B7187 /* CPHealthViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPHealthViewController.h; sourceTree = "<group>"; };
+		49EF90CD2071F8A5008B7187 /* CPHealthViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPHealthViewController.m; sourceTree = "<group>"; };
+		49EF90CF2071FA62008B7187 /* CPFindViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPFindViewController.h; sourceTree = "<group>"; };
+		49EF90D02071FA62008B7187 /* CPFindViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPFindViewController.m; sourceTree = "<group>"; };
+		49EF90D22071FD59008B7187 /* CPPhotoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPPhotoCell.h; sourceTree = "<group>"; };
+		49EF90D32071FD59008B7187 /* CPPhotoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPPhotoCell.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>"; };
@@ -245,6 +260,74 @@
 			path = PlaceholderTextView;
 			sourceTree = "<group>";
 		};
+		49EF90C42071F753008B7187 /* Find(发现) */ = {
+			isa = PBXGroup;
+			children = (
+				49EF90CA2071F791008B7187 /* Model */,
+				49EF90C82071F788008B7187 /* View */,
+				49EF90C62071F77C008B7187 /* Controller */,
+			);
+			path = "Find(发现)";
+			sourceTree = "<group>";
+		};
+		49EF90C52071F76F008B7187 /* Health(健康) */ = {
+			isa = PBXGroup;
+			children = (
+				49EF90CB2071F794008B7187 /* Model */,
+				49EF90C92071F78B008B7187 /* View */,
+				49EF90C72071F780008B7187 /* Controller */,
+			);
+			path = "Health(健康)";
+			sourceTree = "<group>";
+		};
+		49EF90C62071F77C008B7187 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				49EF90CF2071FA62008B7187 /* CPFindViewController.h */,
+				49EF90D02071FA62008B7187 /* CPFindViewController.m */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		49EF90C72071F780008B7187 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				49EF90CC2071F8A5008B7187 /* CPHealthViewController.h */,
+				49EF90CD2071F8A5008B7187 /* CPHealthViewController.m */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		49EF90C82071F788008B7187 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				49EF90D22071FD59008B7187 /* CPPhotoCell.h */,
+				49EF90D32071FD59008B7187 /* CPPhotoCell.m */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		49EF90C92071F78B008B7187 /* View */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		49EF90CA2071F791008B7187 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		49EF90CB2071F794008B7187 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		C47D02702011EF5D00E5C025 /* NewPagedFlowView */ = {
 			isa = PBXGroup;
 			children = (
@@ -350,6 +433,8 @@
 				C4EC00B3200EF43B00A3225A /* Category(类别) */,
 				C4EC00B4200EF43B00A3225A /* Classification(分类) */,
 				C4EC00B8200EF43B00A3225A /* Home(菜谱大全) */,
+				49EF90C42071F753008B7187 /* Find(发现) */,
+				49EF90C52071F76F008B7187 /* Health(健康) */,
 				C4EC00BC200EF43B00A3225A /* More(更多) */,
 				C4EC00C0200EF43B00A3225A /* Tools(工具) */,
 			);
@@ -465,6 +550,8 @@
 			children = (
 				C4B7E2962011BFA60046C0EC /* CPChoiceCollectionViewCell.h */,
 				C4B7E2972011BFA60046C0EC /* CPChoiceCollectionViewCell.m */,
+				49EF90C12071CADC008B7187 /* CPThemeCollectionCell.h */,
+				49EF90C22071CADC008B7187 /* CPThemeCollectionCell.m */,
 				C47D02772011F2C000E5C025 /* CPHomeHeaderView.h */,
 				C47D02782011F2C000E5C025 /* CPHomeHeaderView.m */,
 				C47D027A2011F64800E5C025 /* CPHotButton.h */,
@@ -528,6 +615,8 @@
 		C4EC00C0200EF43B00A3225A /* Tools(工具) */ = {
 			isa = PBXGroup;
 			children = (
+				497B1C2F2056503E00EBB024 /* SortDictManager.h */,
+				497B1C2E2056503D00EBB024 /* SortDictManager.m */,
 				C4F5116820106F8D0012111E /* CPHTTP.h */,
 				C4F5116920106F8D0012111E /* CPHTTP.m */,
 			);
@@ -719,6 +808,7 @@
 				"${SRCROOT}/Pods/Target Support Files/Pods-CAIPU/Pods-CAIPU-resources.sh",
 				"${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle",
 				"${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle",
+				"${PODS_ROOT}/PYPhotoBrowser/PYPhotoBrowser/PYPhotosView.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -753,6 +843,7 @@
 			files = (
 				C4EC0090200EE17800A3225A /* main.m in Sources */,
 				C47D02922013198900E5C025 /* CPSegmentControl.m in Sources */,
+				497B1C302056503E00EBB024 /* SortDictManager.m in Sources */,
 				C45708072015D17300F60FEE /* CPBannerModel.m in Sources */,
 				C47ACA77201078BD005DA04C /* CPClassifyLeftTableViewCell.m in Sources */,
 				C4B4106B2020453E00C95284 /* CPHotModel.m in Sources */,
@@ -772,8 +863,10 @@
 				C4F51158201034080012111E /* CPClassificationViewController.m in Sources */,
 				C4B4226E2022BE3B00C95284 /* CPDetailTableViewCell.m in Sources */,
 				C428739A2028081300502005 /* CPStepTableView.m in Sources */,
+				49EF90CE2071F8A5008B7187 /* CPHealthViewController.m in Sources */,
 				C47D02792011F2C000E5C025 /* CPHomeHeaderView.m in Sources */,
 				C444ED522017100F0082AA5C /* CPHomeListModel.m in Sources */,
+				49EF90C32071CADC008B7187 /* CPThemeCollectionCell.m in Sources */,
 				497B1BE420523E0100EBB024 /* PlaceholderTextView.m in Sources */,
 				C47D027C2011F64800E5C025 /* CPHotButton.m in Sources */,
 				C4B422622021653100C95284 /* CPIngredientModel.m in Sources */,
@@ -789,11 +882,13 @@
 				C4B422682022A6FD00C95284 /* CPPerceptionView.m in Sources */,
 				C47ACA7D20108984005DA04C /* CPClassifyRightCollectionViewCell.m in Sources */,
 				497B1BD720512E6300EBB024 /* CPMyHistoryController.m in Sources */,
+				49EF90D42071FD59008B7187 /* CPPhotoCell.m in Sources */,
 				C4F5116A20106F8D0012111E /* CPHTTP.m in Sources */,
 				C42873A02028086E00502005 /* CPStepTableViewCell.m in Sources */,
 				C47D02762011EF5D00E5C025 /* PGIndexBannerSubiew.m in Sources */,
 				C47ACA7A2010875F005DA04C /* CPClassifyRightView.m in Sources */,
 				C4F5115E201036680012111E /* CPNavgationController.m in Sources */,
+				49EF90D12071FA62008B7187 /* CPFindViewController.m in Sources */,
 				497B1BEB205259B400EBB024 /* CPAboutViewController.m in Sources */,
 				C4B7E2952011A1820046C0EC /* CPSearchViewController.m in Sources */,
 				C4F5116D2010726D0012111E /* CPClassifyLeftView.m in Sources */,
@@ -964,6 +1059,8 @@
 			baseConfigurationReference = 83372F69E447D8645B21F903 /* Pods-CAIPU.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = HNC9PH2VZ6;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/CAIPU/CPPrefixHeader.pch";
@@ -972,6 +1069,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kuxuan.CAIPU;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -981,6 +1080,8 @@
 			baseConfigurationReference = 5D7DDE3161671277618A2624 /* Pods-CAIPU.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = HNC9PH2VZ6;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/CAIPU/CPPrefixHeader.pch";
@@ -989,6 +1090,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kuxuan.CAIPU;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

CAIPU/AppDelegate.m

@@ -8,6 +8,9 @@
 
 #import "AppDelegate.h"
 #import "CPTabBarController.h"
+#import "UMMobClick/MobClick.h"
+#import <Bugly/Bugly.h>
+
 @interface AppDelegate ()
 
 @end
@@ -17,6 +20,9 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
+    [self setBugly];
+    [self setUMAnalisis];
+    
     [self setupWindow];
     return YES;
 }
@@ -28,8 +34,17 @@
     [self.window makeKeyAndVisible];
 }
 
-- (void)creatDataBase {
-    
+
+
+- (void)setBugly {
+    [Bugly startWithAppId:BUGLY_ID];
+}
+
+-(void)setUMAnalisis
+{
+    UMConfigInstance.appKey = UMAPP_KEY;
+    UMConfigInstance.channelId = @"App Store";
+    [MobClick startWithConfigure:UMConfigInstance];
 }
 
 

CAIPU/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,43 +1,51 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "20@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "20@3x-1.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "29@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "29@3x-1.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "40@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "40@3x-1.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "60@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "60@3x-1.png",
       "scale" : "3x"
     },
     {
@@ -86,8 +94,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "1024.png",
       "scale" : "1x"
     }
   ],

CAIPU/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -0,0 +1,75 @@
+{
+  "images" : [
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "2436h",
+      "filename" : "1125.png",
+      "minimum-system-version" : "11.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "1242.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "667h",
+      "filename" : "750.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "640copy.png",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "filename" : "320.png",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "640.png",
+      "unassigned" : true
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAIPU/Assets.xcassets/Mine/white_back.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "white_back.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "white_back@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "white_back@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAIPU/CPHeader.h

@@ -9,7 +9,12 @@
 #ifndef CPHeader_h
 #define CPHeader_h
 
-#define BrowserKey @"BrowserKey"
+//#define BrowserKey @"BrowserKey"
+//友盟key
+#define UMAPP_KEY @"5aa64327a40fa379700001dd"
+//bugly  id
+#define BUGLY_ID @"50d6f2e32a"
+#define SIGN_KEY @"b693013c19222873eece0526b7b85da2"  //加密秘钥
 
 //定义屏幕的宽度
 #define SCREEN_WIDTH ([UIScreen mainScreen].bounds.size.width<[UIScreen mainScreen].bounds.size.height?[UIScreen mainScreen].bounds.size.width:[UIScreen mainScreen].bounds.size.height)

CAIPU/CPPrefixHeader.pch

@@ -23,9 +23,10 @@
 #import "CPRequestViewModel.h"
 #import "YYText.h"
 #import "LKDBHelper.h"
+#import "SDAutoLayout.h"
   
 
-static NSString * const URL = @"http://182.92.118.1:3320/api";               //测试
-//static NSString * const URL = @"http://api.money.quyaqu.com/api";
+//static NSString * const URL = @"http://182.92.118.1:3320/api";               //测试
+static NSString * const URL = @"https://apicaipu.726p.com/api";
 
 #endif /* CPPrefixHeader_pch */

CAIPU/Info.plist

@@ -2,13 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>菜谱申请访问您的相册</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>菜谱申请加入您的相册</string>
 	<key>CFBundleDisplayName</key>
 	<string>菜谱</string>
 	<key>CFBundleExecutable</key>
@@ -22,11 +21,16 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -46,5 +50,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>

CAIPU/Main/Base(基类)/CPNavgationController.m

@@ -61,7 +61,7 @@
     self.navigationBar.translucent = NO;
     
     //设置navigationBar的颜色
-    self.navigationBar.barTintColor = [UIColor backgroudColor];
+    self.navigationBar.barTintColor = [UIColor whiteColor];
     
     //解决边缘右滑手势失效
     self.interactivePopGestureRecognizer.delegate = self;

CAIPU/Main/Base(基类)/CPTabBarController.m

@@ -12,6 +12,7 @@
 #import "CPHomeViewController.h"
 #import "CPClassificationViewController.h"
 #import "CPMoreViewController.h"
+#import "CPFindViewController.h"
 
 @interface CPTabBarController ()
 
@@ -29,7 +30,7 @@
 -(void)setcontrollers
 {
     CPNavgationController *mainNavigationController = [self navigationControllerWithClassName:@"CPHomeViewController" title:@"菜谱大全" imageName:@"tab_main"];
-    CPNavgationController *classificationNavigationController = [self navigationControllerWithClassName:@"CPClassificationViewController" title:@"分类" imageName:@"tab_classify"];
+    CPNavgationController *classificationNavigationController = [self navigationControllerWithClassName:@"CPFindViewController" title:@"发下" imageName:@"tab_classify"];
     CPNavgationController *moreNavigationController = [self navigationControllerWithClassName:@"CPMoreViewController" title:@"更多" imageName:@"tab_more"];
   
     

CAIPU/Main/Category(类别)/UIColor+CPColor.h

@@ -26,6 +26,8 @@
 
 +(instancetype)detailTitleColor;
 
++(instancetype)imageBgColor;
+
 +(instancetype)CPColorWithHex:(uint32_t)hex;
 
 +(instancetype)CPColorWithHex:(uint32_t)hex alpha:(CGFloat)alpha;

CAIPU/Main/Category(类别)/UIColor+CPColor.m

@@ -43,6 +43,13 @@
 {
     return [self CPColorWithHex:0x999999];
 }
+
+//0xf0f0f0
++(instancetype)imageBgColor
+{
+    return [self CPColorWithHex:0xf0f0f0];
+}
+
 +(instancetype)CPColorWithHex:(uint32_t)hex
 {
     uint8_t r = (hex & 0xff0000) >> 16;

CAIPU/Main/Classification(分类)/Controllers/CPClassificationViewController.m

@@ -30,6 +30,7 @@
 
 @implementation CPClassificationViewController
 
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -40,6 +41,7 @@
 
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
     self.segmentControl.hidden = NO;
 }
 

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

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

CAIPU/Main/Find(发现)/Controller/CPFindViewController.h

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

CAIPU/Main/Find(发现)/Controller/CPFindViewController.m

@@ -0,0 +1,156 @@
+//
+//  CPFindViewController.m
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/2.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "CPFindViewController.h"
+#import "CPPhotoCell.h"
+#import "UITableView+FDTemplateLayoutCell.h"
+
+@interface CPFindViewController ()<UITableViewDelegate,UITableViewDataSource>
+@property (nonatomic, strong) UITableView *tableView;
+@end
+
+@implementation CPFindViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self creatContentView];
+}
+
+- (void)creatContentView {
+    self.tableView.fd_debugLogEnabled = YES;
+    [self.tableView registerClass:[CPPhotoCell class] forCellReuseIdentifier:@"CPPhotoCell"];
+    [self.view addSubview:self.tableView];
+    
+    if (@available(iOS 11.0, *)) {
+        self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;//UIScrollView也适用
+    }else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+}
+
+
+
+#pragma mark ============ UITableView Delegate &&  DataSource ==========
+
+- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (indexPath.section == 0) {
+        if (indexPath.row == 0) {
+            //            cell.separatorInset = UIEdgeInsetsMake(0, cell.bounds.size.width, 0, 0);
+        }
+    }
+}
+
+
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return 1;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    CPPhotoCell *cell = [tableView dequeueReusableCellWithIdentifier:@"CPPhotoCell"];
+    [self configureCell:cell atIndexPath:indexPath];
+    
+    return cell;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    // 获取cell高度
+    return [self cellHeightForIndexPath:indexPath cellContentViewWidth:SCREEN_WIDTH tableView:self.tableView];
+}
+
+
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    
+}
+
+- (void)configureCell:(CPPhotoCell *)cell atIndexPath:(NSIndexPath *)indexPath {
+    cell.fd_enforceFrameLayout = NO;
+    // 1. 创建图片链接数组
+    NSMutableArray *thumbnailImageUrls = [NSMutableArray array];
+    // 添加图片(缩略图)链接
+    [thumbnailImageUrls addObject:@"http://ww3.sinaimg.cn/thumbnail/006ka0Iygw1f6bqm7zukpj30g60kzdi2.jpg"];
+    [thumbnailImageUrls addObject:@"http://ww1.sinaimg.cn/thumbnail/61b69811gw1f6bqb1bfd2j20b4095dfy.jpg"];
+    [thumbnailImageUrls addObject:@"http://ww1.sinaimg.cn/thumbnail/54477ddfgw1f6bqkbanqoj20ku0rsn4d.jpg"];
+    [thumbnailImageUrls addObject:@"http://ww4.sinaimg.cn/thumbnail/006ka0Iygw1f6b8gpwr2tj30bc0bqmyz.jpg"];
+    [thumbnailImageUrls addObject:@"http://ww2.sinaimg.cn/thumbnail/9c2b5f31jw1f6bqtinmpyj20dw0ae76e.jpg"];
+    [thumbnailImageUrls addObject:@"http://ww1.sinaimg.cn/thumbnail/536e7093jw1f6bqdj3lpjj20va134ana.jpg"];
+    [thumbnailImageUrls addObject:@"http://ww1.sinaimg.cn/thumbnail/75b1a75fjw1f6bqn35ij6j20ck0g8jtf.jpg"];
+    [thumbnailImageUrls addObject:@"http://ww4.sinaimg.cn/bmiddle/406ef017jw1ec40av2nscj20ip4p0b29.jpg"];
+    [thumbnailImageUrls addObject:@"http://ww1.sinaimg.cn/thumbnail/86afb21egw1f6bq3lq0itj20gg0c2myt.jpg"];
+    
+    // 1.2 创建图片原图链接数组
+    NSMutableArray *originalImageUrls = [NSMutableArray array];
+    // 添加图片(原图)链接
+    [originalImageUrls addObject:@"http://ww3.sinaimg.cn/large/006ka0Iygw1f6bqm7zukpj30g60kzdi2.jpg"];
+    [originalImageUrls addObject:@"http://ww1.sinaimg.cn/large/61b69811gw1f6bqb1bfd2j20b4095dfy.jpg"];
+    [originalImageUrls addObject:@"http://ww1.sinaimg.cn/large/54477ddfgw1f6bqkbanqoj20ku0rsn4d.jpg"];
+    [originalImageUrls addObject:@"http://ww4.sinaimg.cn/large/006ka0Iygw1f6b8gpwr2tj30bc0bqmyz.jpg"];
+    [originalImageUrls addObject:@"http://ww2.sinaimg.cn/large/9c2b5f31jw1f6bqtinmpyj20dw0ae76e.jpg"];
+    [originalImageUrls addObject:@"http://ww1.sinaimg.cn/large/536e7093jw1f6bqdj3lpjj20va134ana.jpg"];
+    [originalImageUrls addObject:@"http://ww1.sinaimg.cn/large/75b1a75fjw1f6bqn35ij6j20ck0g8jtf.jpg"];
+    [originalImageUrls addObject:@"http://ww4.sinaimg.cn/bmiddle/406ef017jw1ec40av2nscj20ip4p0b29.jpg"];
+    [originalImageUrls addObject:@"http://ww1.sinaimg.cn/large/86afb21egw1f6bq3lq0itj20gg0c2myt.jpg"];
+    
+    [cell setThumbnailImageUrls:thumbnailImageUrls originalImageUrls:originalImageUrls];
+}
+
+
+- (UITableView *)tableView {
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-TabbarHeight) style:UITableViewStyleGrouped];
+//        _tableView.estimatedRowHeight = 0;
+        _tableView.estimatedSectionHeaderHeight = 0;
+        _tableView.estimatedSectionFooterHeight = 0;
+        _tableView.sectionFooterHeight = 0;
+        _tableView.sectionHeaderHeight = 0;
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
+        _tableView.backgroundColor = [UIColor backgroudColor];
+        _tableView.bounces = YES;
+        _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+        }];
+        
+        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+        }];
+        _tableView.mj_footer = footer;
+        
+        
+        
+    }
+    return _tableView;
+}
+
+
+#pragma mark ------- layzer ---------
+
+
+
+
+- (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/Find(发现)/View/CPPhotoCell.h

@@ -0,0 +1,16 @@
+//
+//  CPPhotoCell.h
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/2.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CPPhotoCell : UITableViewCell
++ (instancetype)cellWithTableView:(UITableView *)tableView;
+
+@property (nonatomic, strong) NSArray *photos;
+- (void)setThumbnailImageUrls:(NSArray *)thumbnailImageUrls originalImageUrls:(NSArray *)originalImageUrls;
+@end

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

@@ -0,0 +1,199 @@
+//
+//  CPPhotoCell.m
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/2.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "CPPhotoCell.h"
+#import "PYPhotosView.h"
+#import "PYPhotoBrowseView.h"
+
+@interface CPPhotoCell ()
+@property (nonatomic, strong) PYPhotosView *photosView;
+@property (nonatomic, strong) UIImageView *icon;
+@property (nonatomic, strong) UILabel *nickLabel;
+@property (nonatomic, strong) UILabel *timeLabel;
+@property (nonatomic, strong) UIButton *likeBtn;
+@end
+
+@implementation CPPhotoCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+
++ (instancetype)cellWithTableView:(UITableView *)tableView {
+    static NSString *cellID = nil;
+    cellID = NSStringFromClass([self class]);
+    CPPhotoCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+    if (!cell) {
+        cell = [[CPPhotoCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+    }
+    return cell;
+    
+}
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        self.backgroundColor = [UIColor whiteColor];
+        [self initUI];
+    }
+    return self;
+}
+
+- (void)initUI {
+    [self.contentView addSubview:self.icon];
+    [self.contentView addSubview:self.nickLabel];
+    [self.contentView addSubview:self.timeLabel];
+    [self.contentView addSubview:self.photosView];
+    [self.contentView addSubview:self.likeBtn];
+    
+    [self.icon mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(10);
+        make.top.mas_equalTo(15).priorityHigh();;
+        make.width.height.mas_equalTo(40);
+    }];
+    self.icon.layer.cornerRadius = 20;
+    
+    [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.icon.mas_right).mas_offset(8);
+        make.centerY.mas_equalTo(self.icon.mas_centerY);
+    }];
+    
+    [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-10);
+        make.centerY.mas_equalTo(self.icon.mas_centerY);
+    }];
+    
+    [self.photosView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.icon.mas_bottom).mas_offset(10).priorityHigh();;
+        make.left.mas_equalTo(10);
+        make.right.mas_equalTo(-10);
+        make.height.mas_equalTo(0);
+    }];
+    
+    [self.likeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_equalTo(-10);
+        make.top.mas_equalTo(self.photosView.mas_bottom).mas_offset(20).priorityHigh();;
+        make.height.mas_equalTo(30);
+        make.width.mas_equalTo(100);
+    }];
+    
+    [self setupAutoHeightWithBottomView:self.likeBtn bottomMargin:20];
+}
+
+
+
+- (void)setThumbnailImageUrls:(NSArray *)thumbnailImageUrls originalImageUrls:(NSArray *)originalImageUrls {
+   
+    
+    [self setUpPhotoHeightWithOriginalImageUrls:originalImageUrls];
+    // 设置缩略图数组
+//    self.photosView.thumbnailUrls = thumbnailImageUrls;
+    // 设置原图地址
+    self.photosView.originalUrls = originalImageUrls;
+    // 设置分页指示类型
+    self.photosView.pageType = PYPhotosViewPageTypeLabel;
+    
+    CGSize size = [self.photosView sizeWithPhotoCount:thumbnailImageUrls.count photosState:PYPhotosViewStateDidCompose];
+    [self.photosView mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(size.height);
+    }];
+}
+
+
+- (void)setUpPhotoHeightWithOriginalImageUrls:(NSArray *)originalImageUrls {
+    CGFloat Width = SCREEN_WIDTH-20;
+    CGFloat margin = self.photosView.photoMargin;
+    switch (originalImageUrls.count) {
+        case 1:
+            self.photosView.photoWidth = Width;
+            self.photosView.photoHeight = Width*9/16;
+            break;
+        case 2:
+        case 4:
+            self.photosView.photoWidth = (Width-margin)/2;
+            self.photosView.photoHeight = (Width-margin)/2;
+            
+            break;
+        case 3:
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+            self.photosView.photoWidth = (Width-margin*2)/3;
+            self.photosView.photoHeight = (Width-margin*2)/3;
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+#pragma mark -------- layzer ---------
+- (UIImageView *)icon {
+    if (!_icon) {
+        _icon = [[UIImageView alloc] init];
+        _icon.backgroundColor = [UIColor imageBgColor];
+        _icon.clipsToBounds = YES;
+    }
+    return _icon;
+}
+
+- (UILabel *)nickLabel {
+    if (!_nickLabel) {
+        _nickLabel = [[UILabel alloc] init];
+        _nickLabel.textColor = [UIColor titleColor];
+        _nickLabel.font = [UIFont systemFontOfSize:15];
+        _nickLabel.text = @"印度阿三";
+        _nickLabel.preferredMaxLayoutWidth = 180;
+    }
+    return _nickLabel;
+}
+
+- (UILabel *)timeLabel {
+    if (!_timeLabel) {
+        _timeLabel = [[UILabel alloc] init];
+        _timeLabel.textColor = [UIColor middleTitleColor];
+        _timeLabel.textAlignment = NSTextAlignmentRight;
+        _timeLabel.font = [UIFont systemFontOfSize:13];
+        _timeLabel.text = @"一分钟前";
+        _timeLabel.preferredMaxLayoutWidth = 80;
+    }
+    return _timeLabel;
+}
+
+- (PYPhotosView *)photosView {
+    if (!_photosView) {
+        _photosView = [PYPhotosView photosView];
+        _photosView.showDuration = 0.25;
+        _photosView.hiddenDuration = 0.25;
+    }
+    return _photosView;
+}
+
+- (UIButton *)likeBtn {
+    if (!_likeBtn) {
+        _likeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_likeBtn setTitle:@"喜欢" forState:UIControlStateNormal];
+        [_likeBtn setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
+    }
+    return _likeBtn;
+}
+
+
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

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

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

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

@@ -0,0 +1,37 @@
+//
+//  CPHealthViewController.m
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/2.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "CPHealthViewController.h"
+
+@interface CPHealthViewController ()
+
+@end
+
+@implementation CPHealthViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+- (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/CPDetailViewController.m

@@ -25,6 +25,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    
     [self createNav];
     [self createView];
     [self requestData];
@@ -56,7 +57,7 @@
     [CPRequestViewModel requestDetail:self.menu_id data:^(NSArray *data) {
         self.detailModel = [CPDetailModel yy_modelWithJSON:data];
         self.collectionModel = [CPCollectionModel yy_modelWithJSON:data];
-        
+        self.title = self.detailModel.title;
         [self showData];
         [self saveDetailModel];
     }];
@@ -114,6 +115,7 @@
     }else {
         BOOL collection = [self.collectionModel saveToDB];
         if (collection) {
+            [self collectionRequest];
             sender.selected = YES;
             sender.backgroundColor = [UIColor btnGrayColor];
         }
@@ -124,11 +126,19 @@
             [CPCollectionModel deleteWithWhere:sql];
         }
     }
-    
-    
-    
 }
 
+//只做计数+1
+- (void)collectionRequest {
+    NSString *urlString = [NSString stringWithFormat:@"%@/features/addCollection",URL];
+    [CPHTTP post:urlString params:@{@"menu_id":self.collectionModel.Id} success:^(id json) {
+        
+    } failure:^(NSError *error) {
+        
+    }];
+}
+
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

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

@@ -12,10 +12,14 @@
 #import "CPChoiceCollectionViewCell.h"
 #import "CPHomeListModel.h"
 #import "CPDetailViewController.h"
+#import "CPThemeCollectionCell.h"
 
 static NSString *const homeIdentifier = @"homeIdentifier";
+static NSString *const themeIdentifier = @"themeIdentifier";
 
-@interface CPHomeViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,CPHomeHeaderViewDelegate>
+@interface CPHomeViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,CPHomeHeaderViewDelegate>{
+    NSInteger _page;
+}
 
 @property (nonatomic,strong)UIButton *searchButton;
 
@@ -23,6 +27,8 @@ static NSString *const homeIdentifier = @"homeIdentifier";
 
 @property (nonatomic,strong)NSMutableArray *dataSource;
 
+@property (nonatomic, strong) UICollectionReusableView *headerView;
+
 @end
 
 @implementation CPHomeViewController
@@ -31,13 +37,16 @@ static NSString *const homeIdentifier = @"homeIdentifier";
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = [UIColor whiteColor];
+//    self.navigationController.navigationBar.barTintColor = [UIColor whiteColor];
+    _page = 0;
     [self createNav];
     [self createView];
-    [self requestData:@(0)];
+    [self requestData:@(_page)];
 }
 
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
 }
 
 - (void)viewWillDisappear:(BOOL)animated{
@@ -51,9 +60,11 @@ static NSString *const homeIdentifier = @"homeIdentifier";
     [searchButton setImage:[UIImage imageNamed:@"home_search"] forState:UIControlStateNormal];
     [searchButton setTitle:@"菜名、菜系、口味" forState:UIControlStateNormal];
     [searchButton setTitleColor:[UIColor detailTitleColor] forState:UIControlStateNormal];
-    [searchButton setBackgroundColor:[UIColor CPColorWithHex:0xffffff]];
+    [searchButton setBackgroundColor:[UIColor backgroudColor]];
     searchButton.cornerRadius = 3;
     searchButton.titleLabel.font = FONT_SYS(14);
+    searchButton.imageEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0);
+    searchButton.titleEdgeInsets = UIEdgeInsetsMake(0, 12, 0, 0);
     searchButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
     [searchButton addTarget:self action:@selector(searchAction) forControlEvents:UIControlEventTouchUpInside];
     self.navigationItem.titleView = searchButton;
@@ -62,25 +73,53 @@ static NSString *const homeIdentifier = @"homeIdentifier";
 - (void)createView{
     
     UICollectionViewFlowLayout *flowLayout = [[UICollectionViewFlowLayout alloc]init];
-    flowLayout.itemSize = CGSizeMake((SCREEN_WIDTH - 30) / 2, 220*SCREEN_MUTI);
-    flowLayout.minimumLineSpacing = 0;
-    flowLayout.minimumInteritemSpacing = 0;
+//    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 whiteColor];
+    collectionView.backgroundColor = [UIColor backgroudColor];
     [collectionView registerClass:[CPChoiceCollectionViewCell class] forCellWithReuseIdentifier:homeIdentifier];
+    [collectionView registerClass:[CPThemeCollectionCell class] forCellWithReuseIdentifier:themeIdentifier];
+    
     [collectionView registerClass:[UICollectionReusableView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"header"];
     collectionView.delegate = self;
     collectionView.dataSource = self;
+    
+    MJRefreshNormalHeader *header = [[MJRefreshNormalHeader alloc] init];
+    [header setRefreshingTarget:self refreshingAction:@selector(loadNewData)];
+    collectionView.mj_header = header;
+    
+    //上拉加载
+    MJRefreshAutoNormalFooter *footer=[[MJRefreshAutoNormalFooter alloc]init];
+    [footer setRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
+    collectionView.mj_footer = footer;
     [self.view addSubview:collectionView];
 }
 
+- (void)loadNewData {
+    [self.dataSource removeAllObjects];
+    _page = 0;
+    [self requestData:@(_page)];
+}
+
+- (void)loadMoreData {
+    _page++;
+    [self requestData:@(_page)];
+}
+
 - (void)requestData:(NSNumber *)page{
     [CPRequestViewModel requestHomeTime:page Data:^(NSArray *data) {
         NSArray *array = [NSArray yy_modelArrayWithClass:[CPHomeListModel class] json:data];
         for (CPHomeListModel *model in array) {
             [self.dataSource addObject:model];
         }
+        if (array.count == 0) {
+            MJRefreshAutoNormalFooter *footer=(MJRefreshAutoNormalFooter *)self.collectionView.mj_footer;
+            [footer setTitle:@"到底了~" forState:MJRefreshStateIdle];
+        }
+        [self.collectionView.mj_header endRefreshing];
+        [self.collectionView.mj_footer endRefreshing];
         [self.collectionView reloadData];
     }];
 }
@@ -92,13 +131,51 @@ static NSString *const homeIdentifier = @"homeIdentifier";
     [self.navigationController pushViewController:search animated:YES];
 }
 
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
+    return 2;
+}
+
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
+    if (section == 0) {
+        return 3;
+    }
     return self.dataSource.count;
 }
 
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
+    if (indexPath.section == 0) {
+        return CGSizeMake(SCREEN_WIDTH, 80+85*SCREEN_MUTI);
+    }else {
+        return CGSizeMake((SCREEN_WIDTH - 30) / 2, 220*SCREEN_MUTI);
+    }
+}
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section {
+    if (section == 0) {
+        return 5;
+    }else {
+        return 10;
+    }
+}
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section {
+    if (section == 0) {
+        return 5;
+    }else {
+        return 5;
+    }
+}
+
+
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
+    
+    if (indexPath.section == 0) {
+        CPThemeCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:themeIdentifier forIndexPath:indexPath];
+        return cell;
+    }
+    
     CPHomeListModel *model = self.dataSource[indexPath.row];
     CPChoiceCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:homeIdentifier forIndexPath:indexPath];
     cell.listModel = model;
@@ -107,20 +184,28 @@ static NSString *const homeIdentifier = @"homeIdentifier";
 
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
 {
-    UICollectionReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"header" forIndexPath:indexPath];
-    headerView.userInteractionEnabled = YES;
-    headerView.backgroundColor = [UIColor backgroudColor];
+    if (self.headerView) {
+        return self.headerView;
+    }
+    self.headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"header" forIndexPath:indexPath];
+    self.headerView .userInteractionEnabled = YES;
+    self.headerView .backgroundColor = [UIColor backgroudColor];
   
-    CPHomeHeaderView *header = [[CPHomeHeaderView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 300*SCREEN_MUTI)];
+    CPHomeHeaderView *header = [[CPHomeHeaderView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 260*SCREEN_MUTI)];
     header.delegate = self;
-    [headerView addSubview:header];
+    [self.headerView  addSubview:header];
     
-    return headerView;
+    return self.headerView ;
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
 {
-    return CGSizeMake(SCREEN_WIDTH, 300*SCREEN_MUTI);
+    if (section == 0) {
+        return CGSizeMake(SCREEN_WIDTH, 260*SCREEN_MUTI);
+    }else {
+        return CGSizeZero;
+    }
+    
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
@@ -132,7 +217,12 @@ static NSString *const homeIdentifier = @"homeIdentifier";
 
 -(UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
 {
-    return UIEdgeInsetsMake(0, 10, 0, 10);
+    if (section == 0) {
+        return UIEdgeInsetsMake(0, 0, 0, 0);
+    }else {
+        return UIEdgeInsetsMake(0, 10, 0, 10);
+    }
+    
 }
 
 #pragma mark ---------------------CPHomeHeaderViewDelegate---------------

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

@@ -26,6 +26,8 @@
     self.backgroundColor = [UIColor whiteColor];
     
     _showImageView = [[UIImageView alloc]init];
+    _showImageView.contentMode = UIViewContentModeScaleAspectFill;
+    _showImageView.clipsToBounds = YES;
     [self.contentView addSubview:_showImageView];
     
     _titleLabel = [[UILabel alloc]init];

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

@@ -39,7 +39,7 @@
 
 - (void)setupUI{
  
-    NewPagedFlowView *pageFlowView = [[NewPagedFlowView alloc] initWithFrame:CGRectMake(0, 10*SCREEN_MUTI, SCREEN_WIDTH,170*SCREEN_MUTI)];
+    NewPagedFlowView *pageFlowView = [[NewPagedFlowView alloc] initWithFrame:CGRectMake(0, 10*SCREEN_MUTI, SCREEN_WIDTH,150*SCREEN_MUTI)];
     self.bannerView = pageFlowView;
     pageFlowView.delegate = self;
     pageFlowView.dataSource = self;
@@ -48,29 +48,33 @@
     pageFlowView.orientation = NewPagedFlowViewOrientationHorizontal;
     pageFlowView.isOpenAutoScroll = YES;
     
-    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
-    self.titleButton = button;
-    button.frame = CGRectMake(SCREEN_WIDTH/2 - 160*SCREEN_MUTI, 130*SCREEN_MUTI, 320*SCREEN_MUTI, 40*SCREEN_MUTI);
-    [button setBackgroundImage:[UIImage imageNamed:@"home_banner_title"] forState:UIControlStateNormal];
-    [button setTitleColor:[UIColor CPColorWithHex:0xffffff] forState:UIControlStateNormal];
-    [pageFlowView addSubview:button];
+    //初始化pageControl
+    UIPageControl *pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(pageFlowView.frame), SCREEN_WIDTH, 20*SCREEN_MUTI)];
+    pageControl.backgroundColor = [UIColor whiteColor];
+    [pageControl setValue:[UIImage imageNamed:@"collection"] forKeyPath:@"_currentPageImage"];
+    [pageControl setValue:[UIImage imageNamed:@"collection"] forKeyPath:@"_pageImage"];
+    pageFlowView.pageControl = pageControl;
+    [self addSubview:pageControl];
+    
+    
+    
+//    UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+//    self.titleButton = button;
+//    button.frame = CGRectMake(0, 130*SCREEN_MUTI, SCREEN_WIDTH, 40*SCREEN_MUTI);
+//    [button setBackgroundImage:[UIImage imageNamed:@"home_banner_title"] forState:UIControlStateNormal];
+//    [button setTitleColor:[UIColor CPColorWithHex:0xffffff] forState:UIControlStateNormal];
+//    [pageFlowView addSubview:button];
    
     [self addSubview:pageFlowView];
     
     for (int i = 0; i < 6;i++) {
-        CPHotButton *hotButton = [[CPHotButton alloc]initWithFrame:CGRectMake(SCREEN_WIDTH/6*i, 190*SCREEN_MUTI, SCREEN_WIDTH/6, 76*SCREEN_MUTI)];
+        CPHotButton *hotButton = [[CPHotButton alloc]initWithFrame:CGRectMake(SCREEN_WIDTH/6*i, 180*SCREEN_MUTI, SCREEN_WIDTH/6, 76*SCREEN_MUTI)];
         hotButton.backgroundColor = [UIColor whiteColor];
         [hotButton addTarget:self action:@selector(buttonClick:) forControlEvents:UIControlEventTouchUpInside];
         hotButton.tag = TAG + i;
         [self addSubview:hotButton];
     }
     
-    UILabel *choiceLabel = [[UILabel alloc]initWithFrame:CGRectMake(0, 266*SCREEN_MUTI, SCREEN_WIDTH, 34*SCREEN_MUTI)];
-    choiceLabel.textColor = [UIColor middleTitleColor];
-    choiceLabel.text = @"精品好菜";
-    choiceLabel.textAlignment = NSTextAlignmentCenter;
-    choiceLabel.font = FONT_SYS(14);
-    [self addSubview:choiceLabel];
 }
 
 - (void)buttonClick:(CPHotButton *)hotBtn{
@@ -112,7 +116,7 @@
 
 #pragma mark NewPagedFlowView Delegate
 - (CGSize)sizeForPageInFlowView:(NewPagedFlowView *)flowView {
-    return CGSizeMake(320*SCREEN_MUTI, 170*SCREEN_MUTI);
+    return CGSizeMake(SCREEN_WIDTH, 170*SCREEN_MUTI);
 }
 
 - (void)didSelectCell:(UIView *)subView withSubViewIndex:(NSInteger)subIndex {

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

@@ -24,6 +24,8 @@
 
 - (void)setupUI{
     imageView = [[UIImageView alloc]init];
+    imageView.contentMode = UIViewContentModeScaleAspectFill;
+    imageView.clipsToBounds = YES;
     [self.contentView addSubview:imageView];
     
     titleLabel = [[UILabel alloc]init];

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

@@ -42,6 +42,16 @@
     footer.stateLabel.hidden = YES;
 }
 
+
+- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
+        [cell setSeparatorInset:UIEdgeInsetsMake(0, 10, 0, 10)];
+        tableView.separatorColor = [UIColor btnGrayColor];
+        
+    }
+}
+
+
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     return self.dataSource.count;
 }
@@ -64,6 +74,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     CPSearchResultModel *model = self.dataSource[indexPath.row];
     self.resultClickBlock(model);
+    [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
 }
 
 - (void)refreshFooter:(MJRefreshAutoNormalFooter *)footer{
@@ -72,8 +83,15 @@
 }
 
 - (void)requestData{
-    [CPHTTP post:self.urlString params:@{@"value":self.value,@"time":@(self.page)} success:^(id json) {
+    [CPHTTP post:self.urlString params:@{@"value":self.value,@"page":@(self.page)} success:^(id json) {
         NSArray *array = [NSArray yy_modelArrayWithClass:[CPSearchResultModel class] json:json];
+        if (array.count == 0) {
+            [MBProgressHUD showMessage:@"无搜索结果"];
+        }
+        if (array.count == 0) {
+            MJRefreshAutoNormalFooter *footer=(MJRefreshAutoNormalFooter *)self.tableView.mj_footer;
+            [footer setTitle:@"到底了~" forState:MJRefreshStateIdle];
+        }
         if (self.page == 0) {
             [self.dataSource removeAllObjects];
         }
@@ -83,7 +101,7 @@
         [self.tableView.mj_footer endRefreshing];
         [self.tableView reloadData];
     } failure:^(NSError *error) {
-        
+        [MBProgressHUD showMessage:@"无搜索结果"];
     }];
 }
 
@@ -98,7 +116,7 @@
             self.urlString = [NSString stringWithFormat:@"%@/features/selectTag",URL];
             break;
         case CPSearchTypeSelectIngredients:
-            self.urlString = [NSString stringWithFormat:@"%@/features/selectTag",URL];
+            self.urlString = [NSString stringWithFormat:@"%@/features/selectIngredients",URL];
             break;
         default:
             break;

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

@@ -0,0 +1,22 @@
+//
+//  CPThemeCollectionCell.h
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/2.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CPThemeCollectionCell : UICollectionViewCell
+
+@end
+
+
+
+#pragma mark --============cell=========
+
+@interface CPThemeItem : UICollectionViewCell
+
+
+@end

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

@@ -0,0 +1,145 @@
+//
+//  CPThemeCollectionCell.m
+//  CAIPU
+//
+//  Created by 小花 on 2018/4/2.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "CPThemeCollectionCell.h"
+
+@interface CPThemeCollectionCell ()<UICollectionViewDelegate,UICollectionViewDataSource>
+
+@property (nonatomic, strong) UILabel *titleLabel;
+@property (nonatomic, strong) UICollectionView *collectionView;
+@property (nonatomic, strong) UILabel *allButton;
+
+@end
+
+@implementation CPThemeCollectionCell
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor whiteColor];
+        [self initUI];
+    }
+    return self;
+}
+
+- (void)initUI {
+    self.titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, 300*SCREEN_MUTI, 20)];
+    self.titleLabel.font = [UIFont boldSystemFontOfSize:17];
+    self.titleLabel.text = @"这是有个主题";
+    [self.contentView addSubview:self.titleLabel];
+    
+    self.allButton = [[UILabel alloc] initWithFrame:CGRectMake(SCREEN_WIDTH-60-10, 0, 60, 40)];
+    self.allButton.textColor = [UIColor detailTitleColor];
+    self.allButton.textAlignment = NSTextAlignmentRight;
+    self.allButton.userInteractionEnabled = YES;
+    self.allButton.font = [UIFont systemFontOfSize:14];
+    self.allButton.text = @"查看全部";
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(allAction)];
+    [self.allButton addGestureRecognizer:tap];
+    [self.contentView addSubview:self.allButton];
+    
+    UICollectionViewFlowLayout *flowLayout = [[UICollectionViewFlowLayout alloc]init];
+    flowLayout.itemSize = CGSizeMake((SCREEN_WIDTH - 20 -60 ) / 2, 115*SCREEN_MUTI);
+    flowLayout.minimumLineSpacing = 5;
+    flowLayout.minimumInteritemSpacing = 5;
+    UICollectionView *collectionView = [[UICollectionView alloc]initWithFrame:CGRectMake(10, 40, SCREEN_WIDTH-20, 125*SCREEN_MUTI) collectionViewLayout:flowLayout];
+    [collectionView registerClass:[CPThemeItem class] forCellWithReuseIdentifier:@"CPThemeItem"];
+    collectionView.delegate = self;
+    collectionView.dataSource = self;
+    collectionView.backgroundColor = [UIColor whiteColor];
+    self.collectionView = collectionView;
+    flowLayout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
+    [self.contentView addSubview:self.collectionView];
+}
+
+- (void)allAction {
+    
+}
+
+
+#pragma mark -----------------
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return 10;
+}
+
+- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    CPThemeItem *item = [collectionView dequeueReusableCellWithReuseIdentifier:@"CPThemeItem" forIndexPath:indexPath];
+    
+    return item;
+}
+
+
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+   
+}
+
+@end
+
+
+#pragma mark================cell=========
+
+@interface CPThemeItem ()
+
+@property (nonatomic, strong) UIImageView *imageView;
+@property (nonatomic, strong) UILabel *titleLabel;
+
+@end
+
+@implementation CPThemeItem
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self initUI];
+    }
+    return self;
+}
+
+- (void)initUI {
+   
+    [self.contentView addSubview:self.imageView];
+    [self.contentView addSubview:self.titleLabel];
+    
+    [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.mas_equalTo(0);
+        make.height.mas_equalTo(85*SCREEN_MUTI);
+    }];
+    
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.imageView.mas_bottom).mas_offset(10);
+        make.left.right.mas_equalTo(0);
+        make.height.mas_equalTo(20);
+    }];
+}
+
+- (UIImageView *)imageView {
+    if (!_imageView) {
+        _imageView = [[UIImageView alloc] init];
+        _imageView.backgroundColor = [UIColor imageBgColor];
+        _imageView.layer.cornerRadius = 4;
+        _imageView.clipsToBounds = YES;
+    }
+    return _imageView;
+}
+
+- (UILabel *)titleLabel {
+    if (!_titleLabel) {
+        _titleLabel = [[UILabel alloc] init];
+        _titleLabel.textColor = [UIColor middleTitleColor];
+        _titleLabel.font = [UIFont systemFontOfSize:14];
+        _titleLabel.text = @"大烤鸭";
+    }
+    return _titleLabel;
+}
+
+
+
+@end
+

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

@@ -24,11 +24,13 @@
 
 - (void)setupUI{
     _imageView = [[UIImageView alloc]init];
+    _imageView.contentMode = UIViewContentModeScaleAspectFill;
+    _imageView.clipsToBounds = YES;
     [self addSubview:_imageView];
     
     _titleLabel = [[UILabel alloc]init];
     _titleLabel.textColor = [UIColor titleColor];
-    _titleLabel.font = FONT_SYS(16);
+    _titleLabel.font = FONT_SYS(19);
     [self addSubview:_titleLabel];
     
     _detailLabel = [[UILabel alloc]init];
@@ -38,11 +40,13 @@
     
     _collectButton = [UIButton buttonWithType:UIButtonTypeCustom];
     _collectButton.backgroundColor = [UIColor CPColorWithHex:0xfa3d3d];
+    _collectButton.layer.cornerRadius = 3;
     [_collectButton addTarget:self action:@selector(collectAction) forControlEvents:UIControlEventTouchUpInside];
     [_collectButton setTitle:@"收藏" forState:UIControlStateNormal];
     [_collectButton setTitleColor:[UIColor CPColorWithHex:0xffffff] forState:UIControlStateNormal];
     [_collectButton setTitle:@"已收藏" forState:UIControlStateSelected];
     [_collectButton setTitleColor:[UIColor middleTitleColor] forState:UIControlStateSelected];
+    _collectButton.titleLabel.font = [UIFont systemFontOfSize:14];
     [self addSubview:_collectButton];
     
     UIView *lineView = [[UIView alloc]initWithFrame:CGRectMake(0, self.height - 6, SCREEN_WIDTH, 6)];

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

@@ -24,22 +24,24 @@
     nameLabel = [[UILabel alloc]init];
     nameLabel.textColor = [UIColor titleColor];
     nameLabel.font = FONT_SYS(15);
-    nameLabel.textAlignment = NSTextAlignmentLeft;
+    nameLabel.textAlignment = NSTextAlignmentCenter;
+    nameLabel.textColor = [UIColor middleTitleColor];
     [self.contentView addSubview:nameLabel];
     
     measureLabel = [[UILabel alloc]init];
     measureLabel.textColor = [UIColor titleColor];
     measureLabel.font = FONT_SYS(15);
     measureLabel.textAlignment = NSTextAlignmentLeft;
+    measureLabel.textColor = [UIColor middleTitleColor];
     [self.contentView addSubview:measureLabel];
     
     [nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView.mas_left).offset(84*SCREEN_MUTI);
+        make.centerX.equalTo(self.contentView.mas_left).offset(84*SCREEN_MUTI);
         make.top.equalTo(self.contentView.mas_top).offset(17);
     }];
     
     [measureLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView.mas_left).offset(240*SCREEN_MUTI);
+        make.centerX.equalTo(self.contentView.mas_left).offset(240*SCREEN_MUTI);
         make.top.equalTo(self.contentView.mas_top).offset(17);
     }];
     

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

@@ -46,7 +46,7 @@
 
 - (void)setPerception:(NSString *)perception{
     _perception = perception;
-    NSMutableAttributedString *attri = [[NSMutableAttributedString alloc] initWithString:perception attributes:@{NSFontAttributeName:FONT_SYS(14)}];
+    NSMutableAttributedString *attri = [[NSMutableAttributedString alloc] initWithString:perception attributes:@{NSFontAttributeName:FONT_SYS(14),NSForegroundColorAttributeName:[UIColor middleTitleColor]}];
     attri.yy_lineSpacing = 8;
     _perceptionLabel.attributedText = attri;
     YYTextLayout *layout = [YYTextLayout layoutWithContainerSize:CGSizeMake(SCREEN_WIDTH - 48*SCREEN_MUTI, MAXFLOAT) text:attri];

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

@@ -23,6 +23,8 @@
 
 - (void)setupUI{
     imageView = [[UIImageView alloc]init];
+    imageView.contentMode = UIViewContentModeScaleAspectFill;
+    imageView.clipsToBounds = YES;
     [self.contentView addSubview:imageView];
     
     titleLabel = [[UILabel alloc]init];

CAIPU/Main/More(更多)/Controllers/CPAboutViewController.m

@@ -37,7 +37,7 @@
 
 -(void)createNav{
     
-    [self addLeftBarButtonItemWithImageName:@"home_back" title:nil target:self selector:@selector(backAction)];
+    [self addLeftBarButtonItemWithImageName:@"white_back" title:nil target:self selector:@selector(backAction)];
 }
 
 -(void)backAction{

CAIPU/Main/More(更多)/Controllers/CPFeedBackController.m

@@ -25,7 +25,7 @@
 
 -(void)createNav{
     
-    [self addLeftBarButtonItemWithImageName:@"home_back" title:nil target:self selector:@selector(backAction)];
+    [self addLeftBarButtonItemWithImageName:@"white_back" title:nil target:self selector:@selector(backAction)];
 }
 
 -(void)backAction{
@@ -67,11 +67,13 @@
 - (void)feedbackAction {
     
     NSString *msg = self.textView.text;
-    NSString *urlString = [NSString stringWithFormat:@"%@/user/feedBack",URL];
+    NSString *urlString = [NSString stringWithFormat:@"%@/features/feedBack",URL];
     [CPHTTP post:urlString params:@{@"message":msg} success:^(id json) {
-        
+        [MBProgressHUD showSuccess:@"提交成功，感谢您的反馈~"];
+        self.textView.text = nil;
+        [self.navigationController popViewControllerAnimated:YES];
     } failure:^(NSError *error) {
-        
+        [MBProgressHUD showSuccess:@"提交失败"];
     }];
     
 }

CAIPU/Main/More(更多)/Controllers/CPHistoryCell.m

@@ -95,7 +95,7 @@
 - (UILabel *)tags {
     if (!_tags) {
         _tags = [[UILabel alloc] init];
-        _tags.numberOfLines = 4;
+        _tags.numberOfLines = 2;
         _tags.font = [UIFont systemFontOfSize:14];
         _tags.textColor = [UIColor CPColorWithHex:0x666666];
     }

CAIPU/Main/More(更多)/Controllers/CPMoreViewController.m

@@ -23,10 +23,18 @@ static NSString *const cellIdentifier = @"moreCell";
 
 @implementation CPMoreViewController
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.title = @"更多";
+    self.navigationController.navigationBar.barTintColor = [UIColor baseColor];
+    [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];
+    
     [self setupUI];
 }
 
@@ -40,6 +48,14 @@ static NSString *const cellIdentifier = @"moreCell";
     
 }
 
+- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
+        [cell setSeparatorInset:UIEdgeInsetsMake(0, 20, 0, 20)];
+        tableView.separatorColor = [UIColor btnGrayColor];
+        
+    }
+}
+
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     return self.dataSource.count;
 }
@@ -67,6 +83,10 @@ static NSString *const cellIdentifier = @"moreCell";
     return 15;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 50;
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     if (indexPath.row == 0) {
         CPMyHistoryController *history = [[CPMyHistoryController alloc] init];

CAIPU/Main/More(更多)/Controllers/CPMyHistoryController.m

@@ -33,7 +33,7 @@
 
 -(void)createNav{
     
-    [self addLeftBarButtonItemWithImageName:@"home_back" title:nil target:self selector:@selector(backAction)];
+    [self addLeftBarButtonItemWithImageName:@"white_back" title:nil target:self selector:@selector(backAction)];
     [self.view addSubview:self.tableView];
 }
 

CAIPU/Main/Third(第三方)/NewPagedFlowView/PGIndexBannerSubiew.m

@@ -48,6 +48,8 @@
     if (_mainImageView == nil) {
         _mainImageView = [[UIImageView alloc] init];
         _mainImageView.userInteractionEnabled = YES;
+        _mainImageView.contentMode = UIViewContentModeScaleAspectFill;
+        _mainImageView.clipsToBounds = YES;
     }
     return _mainImageView;
 }

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

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "SortDictManager.h"
 
 @interface CPHTTP : NSObject
 

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

@@ -20,13 +20,17 @@
     NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
     NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
     [mgr.requestSerializer setValue:app_Version forHTTPHeaderField:@"version"];
-    NSDate *date = [NSDate date];
-    NSInteger time = [date timeIntervalSince1970];
-    NSString *timeStr = [NSString stringWithFormat:@"%ld",(long)time];
-    [mgr.requestSerializer setValue:timeStr forHTTPHeaderField:@"time"];
+//    NSDate *date = [NSDate date];
+//    NSInteger time = [date timeIntervalSince1970];
+//    NSString *timeStr = [NSString stringWithFormat:@"%ld",(long)time];
+//    [mgr.requestSerializer setValue:timeStr forHTTPHeaderField:@"time"];
+    
+    //1.加密请求参数
+   
+    NSDictionary *newParams = [SortDictManager SortDictFromDict:params];
     
     // 2.发送请求
-    [mgr POST:url parameters:params progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+    [mgr POST:url parameters:newParams progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         id responseDict =[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
         if ([responseDict[@"errno"] isEqual:@"200"]) {
             success([responseDict[@"rst"] valueForKey:@"data"]);
@@ -49,13 +53,16 @@
     mgr.requestSerializer = [AFHTTPRequestSerializer serializer];  // 解析为data
     mgr.responseSerializer=[AFHTTPResponseSerializer serializer];
     mgr.responseSerializer.acceptableContentTypes =[NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript",@"text/html",nil];
-    NSDate *date = [NSDate date];
-    NSInteger time = [date timeIntervalSince1970];
-    NSString *timeStr = [NSString stringWithFormat:@"%ld",(long)time];
-    [mgr.requestSerializer setValue:timeStr forHTTPHeaderField:@"time"];
+//    NSDate *date = [NSDate date];
+//    NSInteger time = [date timeIntervalSince1970];
+//    NSString *timeStr = [NSString stringWithFormat:@"%ld",(long)time];
+//    [mgr.requestSerializer setValue:timeStr forHTTPHeaderField:@"time"];
  
+    //1.加密请求参数
+    NSDictionary *newParams = [SortDictManager SortDictFromDict:params];
+    
     // 2.发送请求
-    [mgr GET:url parameters:params progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+    [mgr GET:url parameters:newParams progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         id responseDict =[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
         if ([responseDict[@"code"] isEqual:@0]) {
             if (!responseDict[@"data"]) {

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

@@ -0,0 +1,19 @@
+//
+//  SortDictManager.h
+//  字典排序
+//
+//  Created by 小花 on 2018/3/12.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface SortDictManager : NSObject
+
+//字典正序转字符串
++ (NSString *)getNeedSignStrFrom:(id)obj;
+//字典正序
++ (NSDictionary *)SortDictFromDict:(id)obj;
+//md5加密
++ (NSString *)md5:(NSString *)str;
+@end

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

@@ -0,0 +1,101 @@
+//
+//  SortDictManager.m
+//  字典排序
+//
+//  Created by 小花 on 2018/3/12.
+//  Copyright © 2018年 kuxuan. All rights reserved.
+//
+
+#import "SortDictManager.h"
+#import <CommonCrypto/CommonDigest.h>
+@implementation SortDictManager
+
++ (NSString *)getNeedSignStrFrom:(id)obj{
+    NSDictionary *dict = obj;
+    NSArray *arrPrimary = dict.allKeys;
+    
+    NSArray *arrKey = [arrPrimary sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2){
+        NSComparisonResult result = [obj1 compare:obj2];
+        return result == NSOrderedDescending;//NSOrderedAscending 倒序
+    }];
+    
+    NSString *str =@"";
+    
+    for (NSString *s in arrKey) {
+        id value = dict[s];
+        if([value isKindOfClass:[NSDictionary class]]) {
+            value = [self getNeedSignStrFrom:value];
+        }
+        if([str length] !=0) {
+            
+            str = [str stringByAppendingString:@","];
+            
+        }
+        
+        str = [str stringByAppendingFormat:@"%@:%@",s,value];
+        
+    }
+
+    
+    return str;
+}
+
+
++ (NSDictionary *)SortDictFromDict:(id)obj{
+    
+    NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithDictionary:obj];
+    
+    //当前时间戳
+    NSDate *date = [NSDate date];
+    NSInteger time = [date timeIntervalSince1970];
+    NSString *timeStr = [NSString stringWithFormat:@"%ld",(long)time];
+    [dict setObject:timeStr forKey:@"time"];
+    
+    NSArray *arrPrimary = dict.allKeys;
+    
+    NSArray *arrKey = [arrPrimary sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2){
+        NSComparisonResult result = [obj1 compare:obj2];
+        return result == NSOrderedDescending;//NSOrderedAscending 倒序
+    }];
+    
+    NSString *str =@"";
+    NSMutableDictionary *newDic = [NSMutableDictionary dictionary];
+    
+    for (NSString *key in arrKey) {
+        id value = dict[key];
+        if([value isKindOfClass:[NSDictionary class]]) {
+            value = [self getNeedSignStrFrom:value];
+        }
+        
+        if([str length] !=0) {
+            str = [str stringByAppendingString:@"&"];
+        }
+        str = [str stringByAppendingFormat:@"%@=%@",key,value];
+        
+        [newDic setObject:value forKey:key];
+    }
+    str = [str stringByAppendingString:SIGN_KEY];
+    
+    NSString *md5Str = [self md5:str];
+    [newDic setObject:md5Str forKey:@"sign"];
+    
+    
+    return newDic;
+}
+
++ (NSString *)md5:(NSString *)str
+{
+    const char *cStr = [str UTF8String];
+    unsigned char result[16];
+    CC_MD5(cStr, (CC_LONG)strlen(cStr), result);
+    return [NSString stringWithFormat:
+            @"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+            result[0], result[1], result[2], result[3],
+            result[4], result[5], result[6], result[7],
+            result[8], result[9], result[10], result[11],
+            result[12], result[13], result[14], result[15]
+            ];
+}
+
+
+@end

Podfile

@@ -15,5 +15,8 @@ pod 'UMengAnalytics'
 pod 'Bugly'
 pod 'YYText'
 pod 'LKDBHelper'
+pod 'PYPhotoBrowser'
+pod 'UITableView+FDTemplateLayoutCell', '~> 1.6'
+pod 'SDAutoLayout', '~> 2.2.0'
 
 end

Podfile.lock

@@ -15,6 +15,7 @@ PODS:
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
   - Bugly (2.5.0)
+  - DACircularProgress (2.3.1)
   - FMDB (2.7.2):
     - FMDB/standard (= 2.7.2)
   - FMDB/standard (2.7.2)
@@ -26,9 +27,15 @@ PODS:
   - Masonry (1.1.0)
   - MBProgressHUD (1.1.0)
   - MJRefresh (3.1.15.1)
+  - PYPhotoBrowser (1.2.5):
+    - DACircularProgress
+    - MBProgressHUD
+    - SDWebImage
+  - SDAutoLayout (2.2.0)
   - SDWebImage (3.7.3):
     - SDWebImage/Core (= 3.7.3)
   - SDWebImage/Core (3.7.3)
+  - UITableView+FDTemplateLayoutCell (1.6)
   - UMengAnalytics (4.2.4)
   - YYModel (1.0.4)
   - YYText (1.0.7)
@@ -42,7 +49,10 @@ DEPENDENCIES:
   - Masonry
   - MBProgressHUD
   - MJRefresh
+  - PYPhotoBrowser
+  - SDAutoLayout (~> 2.2.0)
   - SDWebImage (= 3.7.3)
+  - UITableView+FDTemplateLayoutCell (~> 1.6)
   - UMengAnalytics
   - YYModel
   - YYText
@@ -50,17 +60,21 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   Bugly: 3ca9f255c01025582df26f9222893b383c7e4b4e
+  DACircularProgress: 4dd437c0fc3da5161cb289e07ac449493d41db71
   FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa
   IQKeyboardManager: 077b7f691dfa9d69db9cff66f2bed68ebfc02d9b
   LKDBHelper: 9a276ba51f2e16263d46a9517e16cc9b03472664
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MJRefresh: 5f8552bc25ca8751c010f621c1098dbdaacbccd6
+  PYPhotoBrowser: 832154ec5e61c2c321d9be0e69af1fda8731e5ac
+  SDAutoLayout: c5509e77ae75735d9a39f7bc83dba6d3f75d49d8
   SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
+  UITableView+FDTemplateLayoutCell: 5c949b4a5059c404b442926c0e80f81d10a2d66f
   UMengAnalytics: ef8d45f94c0e5771dc364cf6a5731d9d3b101da2
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
 
-PODFILE CHECKSUM: a28fc03025dfb2b6d10f34d64fcc7e3ce724052c
+PODFILE CHECKSUM: 5ae5854d3a7482f0551fad3e59603512a343619e
 
 COCOAPODS: 1.3.1

Pods/DACircularProgress/DACircularProgress/DACircularProgressView.h

@@ -0,0 +1,28 @@
+//
+//  DACircularProgressView.h
+//  DACircularProgress
+//
+//  Created by Daniel Amitay on 2/6/12.
+//  Copyright (c) 2012 Daniel Amitay. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface DACircularProgressView : UIView
+
+@property(nonatomic, strong) UIColor *trackTintColor UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) UIColor *progressTintColor UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) UIColor *innerTintColor UI_APPEARANCE_SELECTOR;
+@property(nonatomic) NSInteger roundedCorners UI_APPEARANCE_SELECTOR; // Can not use BOOL with UI_APPEARANCE_SELECTOR :-(
+@property(nonatomic) CGFloat thicknessRatio UI_APPEARANCE_SELECTOR;
+@property(nonatomic) NSInteger clockwiseProgress UI_APPEARANCE_SELECTOR; // Can not use BOOL with UI_APPEARANCE_SELECTOR :-(
+@property(nonatomic) CGFloat progress;
+
+@property(nonatomic) CGFloat indeterminateDuration UI_APPEARANCE_SELECTOR;
+@property(nonatomic) NSInteger indeterminate UI_APPEARANCE_SELECTOR; // Can not use BOOL with UI_APPEARANCE_SELECTOR :-(
+
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated;
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated initialDelay:(CFTimeInterval)initialDelay;
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated initialDelay:(CFTimeInterval)initialDelay withDuration:(CFTimeInterval)duration;
+
+@end

Pods/DACircularProgress/DACircularProgress/DACircularProgressView.m

@@ -0,0 +1,321 @@
+//
+//  DACircularProgressView.m
+//  DACircularProgress
+//
+//  Created by Daniel Amitay on 2/6/12.
+//  Copyright (c) 2012 Daniel Amitay. All rights reserved.
+//
+
+#import "DACircularProgressView.h"
+
+#import <QuartzCore/QuartzCore.h>
+
+@interface DACircularProgressLayer : CALayer
+
+@property(nonatomic, strong) UIColor *trackTintColor;
+@property(nonatomic, strong) UIColor *progressTintColor;
+@property(nonatomic, strong) UIColor *innerTintColor;
+@property(nonatomic) NSInteger roundedCorners;
+@property(nonatomic) CGFloat thicknessRatio;
+@property(nonatomic) CGFloat progress;
+@property(nonatomic) NSInteger clockwiseProgress;
+
+@end
+
+@implementation DACircularProgressLayer
+
+@dynamic trackTintColor;
+@dynamic progressTintColor;
+@dynamic innerTintColor;
+@dynamic roundedCorners;
+@dynamic thicknessRatio;
+@dynamic progress;
+@dynamic clockwiseProgress;
+
++ (BOOL)needsDisplayForKey:(NSString *)key
+{
+    if ([key isEqualToString:@"progress"]) {
+        return YES;
+    } else {
+        return [super needsDisplayForKey:key];
+    }
+}
+
+- (void)drawInContext:(CGContextRef)context
+{
+    CGRect rect = self.bounds;
+    CGPoint centerPoint = CGPointMake(rect.size.width / 2.0f, rect.size.height / 2.0f);
+    CGFloat radius = MIN(rect.size.height, rect.size.width) / 2.0f;
+    
+    BOOL clockwise = (self.clockwiseProgress != 0);
+    
+    CGFloat progress = MIN(self.progress, 1.0f - FLT_EPSILON);
+    CGFloat radians = 0;
+    if (clockwise) {
+        radians = (float)((progress * 2.0f * M_PI) - M_PI_2);
+    } else {
+        radians = (float)(3 * M_PI_2 - (progress * 2.0f * M_PI));
+    }
+    
+    CGContextSetFillColorWithColor(context, self.trackTintColor.CGColor);
+    CGMutablePathRef trackPath = CGPathCreateMutable();
+    CGPathMoveToPoint(trackPath, NULL, centerPoint.x, centerPoint.y);
+    CGPathAddArc(trackPath, NULL, centerPoint.x, centerPoint.y, radius, (float)(2.0f * M_PI), 0.0f, TRUE);
+    CGPathCloseSubpath(trackPath);
+    CGContextAddPath(context, trackPath);
+    CGContextFillPath(context);
+    CGPathRelease(trackPath);
+    
+    if (progress > 0.0f) {
+        CGContextSetFillColorWithColor(context, self.progressTintColor.CGColor);
+        CGMutablePathRef progressPath = CGPathCreateMutable();
+        CGPathMoveToPoint(progressPath, NULL, centerPoint.x, centerPoint.y);
+        CGPathAddArc(progressPath, NULL, centerPoint.x, centerPoint.y, radius, (float)(3.0f * M_PI_2), radians, !clockwise);
+        CGPathCloseSubpath(progressPath);
+        CGContextAddPath(context, progressPath);
+        CGContextFillPath(context);
+        CGPathRelease(progressPath);
+    }
+    
+    if (progress > 0.0f && self.roundedCorners) {
+        CGFloat pathWidth = radius * self.thicknessRatio;
+        CGFloat xOffset = radius * (1.0f + ((1.0f - (self.thicknessRatio / 2.0f)) * cosf(radians)));
+        CGFloat yOffset = radius * (1.0f + ((1.0f - (self.thicknessRatio / 2.0f)) * sinf(radians)));
+        CGPoint endPoint = CGPointMake(xOffset, yOffset);
+        
+        CGRect startEllipseRect = (CGRect) {
+            .origin.x = centerPoint.x - pathWidth / 2.0f,
+            .origin.y = 0.0f,
+            .size.width = pathWidth,
+            .size.height = pathWidth
+        };
+        CGContextAddEllipseInRect(context, startEllipseRect);
+        CGContextFillPath(context);
+        
+        CGRect endEllipseRect = (CGRect) {
+            .origin.x = endPoint.x - pathWidth / 2.0f,
+            .origin.y = endPoint.y - pathWidth / 2.0f,
+            .size.width = pathWidth,
+            .size.height = pathWidth
+        };
+        CGContextAddEllipseInRect(context, endEllipseRect);
+        CGContextFillPath(context);
+    }
+
+    CGContextSetBlendMode(context, kCGBlendModeClear);
+    CGFloat innerRadius = radius * (1.0f - self.thicknessRatio);
+    CGRect clearRect = (CGRect) {
+        .origin.x = centerPoint.x - innerRadius,
+        .origin.y = centerPoint.y - innerRadius,
+        .size.width = innerRadius * 2.0f,
+        .size.height = innerRadius * 2.0f
+    };
+    CGContextAddEllipseInRect(context, clearRect);
+    CGContextFillPath(context);
+
+    if (self.innerTintColor) {
+        CGContextSetBlendMode(context, kCGBlendModeNormal);
+        CGContextSetFillColorWithColor(context, [self.innerTintColor CGColor]);
+        CGContextAddEllipseInRect(context, clearRect);
+        CGContextFillPath(context);
+    }
+}
+
+@end
+
+@interface DACircularProgressView ()
+
+@end
+
+@implementation DACircularProgressView
+
++ (void) initialize
+{
+    if (self == [DACircularProgressView class]) {
+        DACircularProgressView *circularProgressViewAppearance = [DACircularProgressView appearance];
+        [circularProgressViewAppearance setTrackTintColor:[[UIColor whiteColor] colorWithAlphaComponent:0.3f]];
+        [circularProgressViewAppearance setProgressTintColor:[UIColor whiteColor]];
+        [circularProgressViewAppearance setInnerTintColor:nil];
+        [circularProgressViewAppearance setBackgroundColor:[UIColor clearColor]];
+        [circularProgressViewAppearance setThicknessRatio:0.3f];
+        [circularProgressViewAppearance setRoundedCorners:NO];
+        [circularProgressViewAppearance setClockwiseProgress:YES];
+        
+        [circularProgressViewAppearance setIndeterminateDuration:2.0f];
+        [circularProgressViewAppearance setIndeterminate:NO];
+    }
+}
+
++ (Class)layerClass
+{
+    return [DACircularProgressLayer class];
+}
+
+- (DACircularProgressLayer *)circularProgressLayer
+{
+    return (DACircularProgressLayer *)self.layer;
+}
+
+- (id)init
+{
+    return [super initWithFrame:CGRectMake(0.0f, 0.0f, 40.0f, 40.0f)];
+}
+
+- (void)didMoveToWindow
+{
+    CGFloat windowContentsScale = self.window.screen.scale;
+    self.circularProgressLayer.contentsScale = windowContentsScale;
+    [self.circularProgressLayer setNeedsDisplay];
+}
+
+
+#pragma mark - Progress
+
+- (CGFloat)progress
+{
+    return self.circularProgressLayer.progress;
+}
+
+- (void)setProgress:(CGFloat)progress
+{
+    [self setProgress:progress animated:NO];
+}
+
+- (void)setProgress:(CGFloat)progress animated:(BOOL)animated
+{
+    [self setProgress:progress animated:animated initialDelay:0.0];
+}
+
+- (void)setProgress:(CGFloat)progress
+           animated:(BOOL)animated
+       initialDelay:(CFTimeInterval)initialDelay
+{
+    CGFloat pinnedProgress = MIN(MAX(progress, 0.0f), 1.0f);
+    [self setProgress:progress
+             animated:animated
+         initialDelay:initialDelay
+         withDuration:fabs(self.progress - pinnedProgress)];
+}
+
+- (void)setProgress:(CGFloat)progress
+           animated:(BOOL)animated
+       initialDelay:(CFTimeInterval)initialDelay
+       withDuration:(CFTimeInterval)duration
+{
+    [self.layer removeAnimationForKey:@"indeterminateAnimation"];
+    [self.circularProgressLayer removeAnimationForKey:@"progress"];
+    
+    CGFloat pinnedProgress = MIN(MAX(progress, 0.0f), 1.0f);
+    if (animated) {
+        CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"progress"];
+        animation.duration = duration;
+        animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+        animation.fillMode = kCAFillModeForwards;
+        animation.fromValue = [NSNumber numberWithFloat:self.progress];
+        animation.toValue = [NSNumber numberWithFloat:pinnedProgress];
+        animation.beginTime = CACurrentMediaTime() + initialDelay;
+        animation.delegate = self;
+        [self.circularProgressLayer addAnimation:animation forKey:@"progress"];
+    } else {
+        [self.circularProgressLayer setNeedsDisplay];
+        self.circularProgressLayer.progress = pinnedProgress;
+    }
+}
+
+- (void)animationDidStop:(CAAnimation *)animation finished:(BOOL)flag
+{
+   NSNumber *pinnedProgressNumber = [animation valueForKey:@"toValue"];
+   self.circularProgressLayer.progress = [pinnedProgressNumber floatValue];
+}
+
+
+#pragma mark - UIAppearance methods
+
+- (UIColor *)trackTintColor
+{
+    return self.circularProgressLayer.trackTintColor;
+}
+
+- (void)setTrackTintColor:(UIColor *)trackTintColor
+{
+    self.circularProgressLayer.trackTintColor = trackTintColor;
+    [self.circularProgressLayer setNeedsDisplay];
+}
+
+- (UIColor *)progressTintColor
+{
+    return self.circularProgressLayer.progressTintColor;
+}
+
+- (void)setProgressTintColor:(UIColor *)progressTintColor
+{
+    self.circularProgressLayer.progressTintColor = progressTintColor;
+    [self.circularProgressLayer setNeedsDisplay];
+}
+
+- (UIColor *)innerTintColor
+{
+    return self.circularProgressLayer.innerTintColor;
+}
+
+- (void)setInnerTintColor:(UIColor *)innerTintColor
+{
+    self.circularProgressLayer.innerTintColor = innerTintColor;
+    [self.circularProgressLayer setNeedsDisplay];
+}
+
+- (NSInteger)roundedCorners
+{
+    return self.roundedCorners;
+}
+
+- (void)setRoundedCorners:(NSInteger)roundedCorners
+{
+    self.circularProgressLayer.roundedCorners = roundedCorners;
+    [self.circularProgressLayer setNeedsDisplay];
+}
+
+- (CGFloat)thicknessRatio
+{
+    return self.circularProgressLayer.thicknessRatio;
+}
+
+- (void)setThicknessRatio:(CGFloat)thicknessRatio
+{
+    self.circularProgressLayer.thicknessRatio = MIN(MAX(thicknessRatio, 0.f), 1.f);
+    [self.circularProgressLayer setNeedsDisplay];
+}
+
+- (NSInteger)indeterminate
+{
+    CAAnimation *spinAnimation = [self.layer animationForKey:@"indeterminateAnimation"];
+    return (spinAnimation == nil ? 0 : 1);
+}
+
+- (void)setIndeterminate:(NSInteger)indeterminate
+{
+    if (indeterminate) {
+        if (!self.indeterminate) {
+            CABasicAnimation *spinAnimation = [CABasicAnimation animationWithKeyPath:@"transform.rotation"];
+            spinAnimation.byValue = [NSNumber numberWithDouble:indeterminate > 0 ? 2.0f*M_PI : -2.0f*M_PI];
+            spinAnimation.duration = self.indeterminateDuration;
+            spinAnimation.repeatCount = HUGE_VALF;
+            [self.layer addAnimation:spinAnimation forKey:@"indeterminateAnimation"];
+        }
+    } else {
+        [self.layer removeAnimationForKey:@"indeterminateAnimation"];
+    }
+}
+
+- (NSInteger)clockwiseProgress
+{
+    return self.circularProgressLayer.clockwiseProgress;
+}
+
+- (void)setClockwiseProgress:(NSInteger)clockwiseProgres
+{
+    self.circularProgressLayer.clockwiseProgress = clockwiseProgres;
+    [self.circularProgressLayer setNeedsDisplay];
+}
+
+@end

Pods/DACircularProgress/DACircularProgress/DALabeledCircularProgressView.h

@@ -0,0 +1,23 @@
+//
+//  DALabeledCircularProgressView.h
+//  DACircularProgressExample
+//
+//  Created by Josh Sklar on 4/8/14.
+//  Copyright (c) 2014 Shout Messenger. All rights reserved.
+//
+
+#import "DACircularProgressView.h"
+
+/**
+ @class DALabeledCircularProgressView
+ 
+ @brief Subclass of DACircularProgressView that adds a UILabel.
+ */
+@interface DALabeledCircularProgressView : DACircularProgressView
+
+/**
+ UILabel placed right on the DACircularProgressView.
+ */
+@property (strong, nonatomic) UILabel *progressLabel;
+
+@end

Pods/DACircularProgress/DACircularProgress/DALabeledCircularProgressView.m

@@ -0,0 +1,47 @@
+//
+//  DALabeledCircularProgressView.m
+//  DACircularProgressExample
+//
+//  Created by Josh Sklar on 4/8/14.
+//  Copyright (c) 2014 Shout Messenger. All rights reserved.
+//
+
+#import "DALabeledCircularProgressView.h"
+
+@implementation DALabeledCircularProgressView
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self initializeLabel];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        [self initializeLabel];
+    }
+    return self;
+}
+
+
+#pragma mark - Internal methods
+
+/**
+ Creates and initializes
+ -[DALabeledCircularProgressView progressLabel].
+ */
+- (void)initializeLabel
+{
+    self.progressLabel = [[UILabel alloc] initWithFrame:self.bounds];
+    self.progressLabel.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+    self.progressLabel.textAlignment = NSTextAlignmentCenter;
+    self.progressLabel.backgroundColor = [UIColor clearColor];
+    [self addSubview:self.progressLabel];
+}
+
+@end

Pods/DACircularProgress/LICENSE.md

@@ -0,0 +1,23 @@
+# License
+
+## MIT License
+
+Copyright (c) 2013 Daniel Amitay (http://danielamitay.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Pods/DACircularProgress/README.md

@@ -0,0 +1,77 @@
+## DACircularProgress
+
+`DACircularProgress` is a `UIView` subclass with circular `UIProgressView` properties.
+
+It was originally built to be an imitation of Facebook's photo progress indicator.
+
+View the included example project for a demonstration.
+
+![Screenshot](https://github.com/danielamitay/DACircularProgress/raw/master/screenshot.png)
+
+## Installation
+
+To use `DACircularProgress`:
+
+- Copy over the `DACircularProgress` folder to your project folder.
+- Make sure that your project includes `<QuartzCore.framework>`.
+- `#import "DACircularProgressView.h"`
+
+### Example Code
+
+```objective-c
+
+self.progressView = [[DACircularProgressView alloc] initWithFrame:CGRectMake(140.0f, 30.0f, 40.0f, 40.0f)];
+self.progressView.roundedCorners = YES;
+self.progressView.trackTintColor = [UIColor clearColor];
+[self.view addSubview:self.progressView];
+```
+
+- You can also use Interface Builder by adding a `UIView` element and setting its class to `DACircularProgress`
+
+## Notes
+
+### Compatibility
+
+iOS5.0+
+
+### Automatic Reference Counting (ARC) support
+
+`DACircularProgress` was made with ARC enabled by default.
+
+## Contact
+
+- [Personal website](http://danielamitay.com)
+- [GitHub](http://github.com/danielamitay)
+- [Twitter](http://twitter.com/danielamitay)
+- [LinkedIn](http://www.linkedin.com/in/danielamitay)
+- [Email](hello@danielamitay.com)
+
+If you use/enjoy `DACircularProgress`, let me know!
+
+## Credits
+
+`DACircularProgress` is brought to you by [Daniel Amitay](http://www.amitay.us) and [contributors to the project](https://github.com/danielamitay/DACircularProgress/contributors). A special thanks to [Cédric Luthi](https://github.com/0xced) for a significant amount of changes. If you have feature suggestions or bug reports, feel free to help out by sending pull requests or by [creating new issues](https://github.com/danielamitay/DACircularProgress/issues/new).
+
+## License
+
+### MIT License
+
+Copyright (c) 2013 Daniel Amitay (http://danielamitay.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Pods/Headers/Private/DACircularProgress/DACircularProgressView.h

@@ -0,0 +1 @@
+../../../DACircularProgress/DACircularProgress/DACircularProgressView.h

Pods/Headers/Private/DACircularProgress/DALabeledCircularProgressView.h

@@ -0,0 +1 @@
+../../../DACircularProgress/DACircularProgress/DALabeledCircularProgressView.h

Pods/Headers/Private/PYPhotoBrowser/MBProgressHUD+PYExtension.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Category/MBProgressHUD+PYExtension.h

Pods/Headers/Private/PYPhotoBrowser/PYPhoto.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Model/PYPhoto.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotoBrowseView.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/View/PYPhotoBrowseView.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotoBrowser.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/PYPhotoBrowser.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotoBrowserConst.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Other/PYPhotoBrowserConst.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotoCell.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/View/PYPhotoCell.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotoView.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/View/PYPhotoView.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotosNavigationController.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Controller/PYPhotosNavigationController.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotosPreviewController.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Controller/PYPhotosPreviewController.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotosReaderController.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Controller/PYPhotosReaderController.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotosView.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/View/PYPhotosView.h

Pods/Headers/Private/PYPhotoBrowser/PYPhotosViewController.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Controller/PYPhotosViewController.h

Pods/Headers/Private/PYPhotoBrowser/PYProgressView.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Other/PYProgressView.h

Pods/Headers/Private/PYPhotoBrowser/UIView+PYExtension.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Category/UIView+PYExtension.h

Pods/Headers/Private/SDAutoLayout/SDAutoLayout.h

@@ -0,0 +1 @@
+../../../SDAutoLayout/SDAutoLayoutDemo/SDAutoLayout/SDAutoLayout.h

Pods/Headers/Private/SDAutoLayout/UITableView+SDAutoTableViewCellHeight.h

@@ -0,0 +1 @@
+../../../SDAutoLayout/SDAutoLayoutDemo/SDAutoLayout/UITableView+SDAutoTableViewCellHeight.h

Pods/Headers/Private/SDAutoLayout/UIView+SDAutoLayout.h

@@ -0,0 +1 @@
+../../../SDAutoLayout/SDAutoLayoutDemo/SDAutoLayout/UIView+SDAutoLayout.h

Pods/Headers/Private/UITableView+FDTemplateLayoutCell/UITableView+FDIndexPathHeightCache.h

@@ -0,0 +1 @@
+../../../UITableView+FDTemplateLayoutCell/Classes/UITableView+FDIndexPathHeightCache.h

Pods/Headers/Private/UITableView+FDTemplateLayoutCell/UITableView+FDKeyedHeightCache.h

@@ -0,0 +1 @@
+../../../UITableView+FDTemplateLayoutCell/Classes/UITableView+FDKeyedHeightCache.h

Pods/Headers/Private/UITableView+FDTemplateLayoutCell/UITableView+FDTemplateLayoutCell.h

@@ -0,0 +1 @@
+../../../UITableView+FDTemplateLayoutCell/Classes/UITableView+FDTemplateLayoutCell.h

Pods/Headers/Private/UITableView+FDTemplateLayoutCell/UITableView+FDTemplateLayoutCellDebug.h

@@ -0,0 +1 @@
+../../../UITableView+FDTemplateLayoutCell/Classes/UITableView+FDTemplateLayoutCellDebug.h

Pods/Headers/Public/DACircularProgress/DACircularProgressView.h

@@ -0,0 +1 @@
+../../../DACircularProgress/DACircularProgress/DACircularProgressView.h

Pods/Headers/Public/DACircularProgress/DALabeledCircularProgressView.h

@@ -0,0 +1 @@
+../../../DACircularProgress/DACircularProgress/DALabeledCircularProgressView.h

Pods/Headers/Public/PYPhotoBrowser/MBProgressHUD+PYExtension.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Category/MBProgressHUD+PYExtension.h

Pods/Headers/Public/PYPhotoBrowser/PYPhoto.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Model/PYPhoto.h

Pods/Headers/Public/PYPhotoBrowser/PYPhotoBrowseView.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/View/PYPhotoBrowseView.h

Pods/Headers/Public/PYPhotoBrowser/PYPhotoBrowser.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/PYPhotoBrowser.h

Pods/Headers/Public/PYPhotoBrowser/PYPhotoBrowserConst.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/Other/PYPhotoBrowserConst.h

Pods/Headers/Public/PYPhotoBrowser/PYPhotoCell.h

@@ -0,0 +1 @@
+../../../PYPhotoBrowser/PYPhotoBrowser/View/PYPhotoCell.h