⓵convert some constants (#define) to extern or static

const⓶Optimization of code format

Author: pifupro_iOS_admin

CollectionViewClassifyMenu.xcodeproj/xcuserdata/chenyilong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -52,11 +52,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/Controller/CYLClassifyMenuViewController.m"
-            timestampString = "452073075.243941"
+            timestampString = "452495015.486241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "256"
-            endingLineNumber = "256"
+            startingLineNumber = "257"
+            endingLineNumber = "257"
             landmarkName = "-judgeMoreBtnShowWhenShowTwoLine"
             landmarkType = "5">
          </BreakpointContent>
@@ -68,11 +68,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "CollectionViewClassifyMenu/Class/ClassifyMenu(&#x4e24;&#x7ea7;&#x53ef;&#x6298;&#x53e0;&#x83dc;&#x5355;)/Controller/CYLClassifyMenuViewController.m"
-            timestampString = "452073075.243941"
+            timestampString = "452495015.486241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "254"
-            endingLineNumber = "254"
+            startingLineNumber = "255"
+            endingLineNumber = "255"
             landmarkName = "-judgeMoreBtnShowWhenShowTwoLine"
             landmarkType = "5">
          </BreakpointContent>
@@ -84,11 +84,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "CollectionViewClassifyMenu/Class/ClassifyMenu(&#x4e24;&#x7ea7;&#x53ef;&#x6298;&#x53e0;&#x83dc;&#x5355;)/Controller/CYLClassifyMenuViewController.m"
-            timestampString = "452073075.243941"
+            timestampString = "452495015.486241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "434"
-            endingLineNumber = "434"
+            startingLineNumber = "435"
+            endingLineNumber = "435"
             landmarkName = "-showLineSwitchClicked:"
             landmarkType = "5">
             <Locations>
@@ -147,11 +147,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "CollectionViewClassifyMenu/Class/ClassifyMenu(&#x4e24;&#x7ea7;&#x53ef;&#x6298;&#x53e0;&#x83dc;&#x5355;)/Controller/CYLClassifyMenuViewController.m"
-            timestampString = "452073075.243941"
+            timestampString = "452495015.486241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "252"
-            endingLineNumber = "252"
+            startingLineNumber = "253"
+            endingLineNumber = "253"
             landmarkName = "-judgeMoreBtnShowWhenShowTwoLine"
             landmarkType = "5">
             <Locations>

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/Controller/CYLClassifyMenuViewController.m

@@ -6,19 +6,18 @@
 //  Copyright (c)  http://weibo.com/luohanchenyilong/ . All rights reserved.
 //  Single Choice Filter
 
-#define kControllerHeaderViewHeight                90
-#define kControllerHeaderToCollectionViewMargin    0
-#define kCollectionViewCellsHorizonMargin          12
-#define kCollectionViewCellHeight                  30
-#define kCollectionViewItemButtonImageToTextMargin 5
+static float const kControllerHeaderViewHeight                = 90.f;
+static float const kControllerHeaderToCollectionViewMargin    = 0;
+static float const kCollectionViewCellsHorizonMargin          = 12;
+static float const kCollectionViewCellHeight                  = 30;
+static float const kCollectionViewItemButtonImageToTextMargin = 5;
 
-#define kCollectionViewToLeftMargin                16
-#define kCollectionViewToTopMargin                 12
-#define kCollectionViewToRightMargin               16
-#define kCollectionViewToBottomtMargin             10
+static float const kCollectionViewToLeftMargin                = 16;
+static float const kCollectionViewToTopMargin                 = 12;
+static float const kCollectionViewToRightMargin               = 16;
+static float const kCollectionViewToBottomtMargin             = 10;
 
-#define kCellImageToLabelMargin                    10
-#define kCellBtnCenterToBorderMargin               19
+static float const kCellBtnCenterToBorderMargin               = 19;
 
 #import "CYLClassifyMenuViewController.h"
 #import "UICollectionViewLeftAlignedLayout.h"
@@ -29,6 +28,7 @@
 static NSString * const kCellIdentifier           = @"CellIdentifier";
 static NSString * const kHeaderViewCellIdentifier = @"HeaderViewCellIdentifier";
 typedef void(^ISLimitWidth)(BOOL yesORNo,id data);
+
 @interface CYLClassifyMenuViewController ()
 <
 UICollectionViewDataSource,
@@ -45,6 +45,7 @@ @interface CYLClassifyMenuViewController ()
 @property (nonatomic, strong) NSMutableArray   *expandSectionArray;
 @property (nonatomic, strong) UIScrollView     *bgScrollView;
 @property (nonatomic, strong) UILabel          *titleLabel;
+
 @end
 
 @implementation CYLClassifyMenuViewController

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/Controller/CYLMainViewController.m

@@ -7,17 +7,16 @@
 //  Created by https://github.com/ChenYilong on 15/4/26.
 //  Copyright (c)  http://weibo.com/luohanchenyilong/ . All rights reserved.
 //
-#define kMultipleFilterSettingModified @"kMultipleFilterSettingModified"
 
 #import "CYLMainViewController.h"
 #import "CYLMultipleFilterController.h"
 #import "AppDelegate.h"
 #import "CYLFilterParamsTool.h"
 
-
 @interface CYLMainViewController ()<FilterControllerDelegate>
+
 @property (nonatomic, strong) CYLMultipleFilterController *filterController;
-@property (nonatomic, strong) CYLFilterParamsTool *filterParamsTool;
+@property (nonatomic, strong) CYLFilterParamsTool         *filterParamsTool;
 
 @end
 
@@ -134,4 +133,5 @@ - (void)filterControllerDidCompleted:(FilterBaseController *)controller
         [alert dismissWithClickedButtonIndex:0 animated:YES];
     });
 }
+
 @end

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/Other/Category/UIButton+CollectionCellStyle.h

@@ -9,7 +9,9 @@
 #import <UIKit/UIKit.h>
 
 @interface UIButton (CollectionCellStyle)
+
 - (void)generalStyle;
 - (void)homeStyle;
 - (void)redStyle;
+
 @end

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/Other/Category/UIButton+CollectionCellStyle.m

@@ -9,6 +9,7 @@
 #import "UIButton+CollectionCellStyle.h"
 
 @implementation UIButton (CollectionCellStyle)
+
 - (void)generalStyle {
     self.layer.cornerRadius = 5.0;
     self.backgroundColor = [UIColor whiteColor];
@@ -50,4 +51,5 @@ + (UIImage *)imageWithColor:(UIColor *)color {
 
     return image;
 }
+
 @end

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/View/CYLFilterHeaderView.h

@@ -6,21 +6,27 @@
 //  Copyright (c)  http://weibo.com/luohanchenyilong/  . All rights reserved.
 //
 #import <UIKit/UIKit.h>
+
 @class FilterHeaderView;
 @protocol FilterHeaderViewDelegate <NSObject>
+
 @required
 -(void)filterHeaderViewMoreBtnClicked:(id)sender;
+
 @end
 
 #import <UIKit/UIKit.h>
 #import "CYLIndexPathButton.h"
 #import "CYLRightImageButton.h"
 
-extern float CYLFilterHeaderViewHeigt;
+extern const float CYLFilterHeaderViewHeigt;
+
 @interface CYLFilterHeaderView : UICollectionReusableView
+
 @property (nonatomic, strong) CYLIndexPathButton       *titleButton;
 @property (nonatomic, strong) CYLRightImageButton      *moreButton;
 @property (nonatomic, weak  ) id<FilterHeaderViewDelegate> delegate;
+
 - (void)moreBtnClicked:(id)sender;
 
 @end

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/View/CYLFilterHeaderView.m

@@ -7,15 +7,18 @@
 //
 
 #import "CYLFilterHeaderView.h"
-#define kTitleButtonWidth 250.f
-#define kMoreButtonWidth  36*2
-#define kCureOfLineHight  0.5
-#define kCureOfLineOffX   16
 
-float CYLFilterHeaderViewHeigt = 38;
+static float const kTitleButtonWidth = 250.f;
+static float const kMoreButtonWidth  = 36*2;
+static float const kCureOfLineHight  = 0.5;
+static float const kCureOfLineOffX   = 16;
+
+float const CYLFilterHeaderViewHeigt = 38;
+
 @interface CYLFilterHeaderView()
 
 @end
+
 @implementation CYLFilterHeaderView
 
 - (id)initWithFrame:(CGRect)frame
@@ -71,4 +74,5 @@ - (void)moreBtnClicked:(id)sender {
         [self.delegate filterHeaderViewMoreBtnClicked:self.moreButton];
     }
 }
+
 @end

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/View/CYLIndexPathButton.h

@@ -9,6 +9,8 @@
 #import <UIKit/UIKit.h>
 
 @interface CYLIndexPathButton : UIButton
+
 @property (nonatomic, assign) NSInteger section;
 @property (nonatomic, assign) NSInteger row;
+
 @end

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/View/CYLIndexPathButton.m

@@ -9,6 +9,7 @@
 #import "CYLIndexPathButton.h"
 
 @implementation CYLIndexPathButton
+
 /**
  *  重写高亮状态，让高亮状态不改变样式
  *

CollectionViewClassifyMenu/Class/ClassifyMenu(两级可折叠菜单)/View/CYLRightImageButton.h

@@ -9,4 +9,5 @@
 #import <UIKit/UIKit.h>
 
 @interface CYLRightImageButton : UIButton
+
 @end