兼容旧版本 xcode

gsdios · gsdios · commit f656767fd720 · 2016-01-10T15:53:16.000+08:00
diff --git a/SDAutoLayout 测试 Demo.xcodeproj/xcuserdata/aier.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SDAutoLayout 测试 Demo.xcodeproj/xcuserdata/aier.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -137,7 +137,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "170"
             endingLineNumber = "170"
-            landmarkName = "-updateLatout"
+            landmarkName = "-updateLayout"
             landmarkType = "4">
             <Locations>
                <Location
diff --git a/SDAutoLayout 测试 Demo/DemoVC/DemoVC2/DemoVC2.m b/SDAutoLayout 测试 Demo/DemoVC/DemoVC2/DemoVC2.m
@@ -38,7 +38,7 @@ - (void)viewDidLoad
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         self.view0.sd_layout.bottomSpaceToView(self.view, 100);
-        [self.view layoutSubviews];
+        [self.view0 updateLayout];
     });
 }
 
diff --git a/SDAutoLayout 测试 Demo/SDAutoLayout/UITableView+SDAutoTableViewCellHeight.h b/SDAutoLayout 测试 Demo/SDAutoLayout/UITableView+SDAutoTableViewCellHeight.h
@@ -63,7 +63,7 @@
 // >>>>>>>>>>>>>> 多cell情景下调用以下方法(详细用法见demo7) >>>>>>>>>>>>>>>>>
 
 /** cellClassArray 为所有cell的类组成的数组，详细用法见demo7 */
-- (void)startAutoCellHeightWithCellClasses:(NSArray<Class> *)cellClassArray contentViewWidth:(CGFloat)contentViewWidth;
+- (void)startAutoCellHeightWithCellClasses:(NSArray *)cellClassArray contentViewWidth:(CGFloat)contentViewWidth;
 
 /** 返回计算出的cell高度;model为cell的数据模型实例;keyPath为cell的数据模型属性的属性名字符串（即kvc原理中的key） */
 - (CGFloat)cellHeightForIndexPath:(NSIndexPath *)indexPath model:(id)model keyPath:(NSString *)keyPath cellClass:(Class)cellClass;
diff --git a/SDAutoLayout 测试 Demo/SDAutoLayout/UITableView+SDAutoTableViewCellHeight.m b/SDAutoLayout 测试 Demo/SDAutoLayout/UITableView+SDAutoTableViewCellHeight.m
@@ -49,11 +49,11 @@ - (instancetype)initWithCellClass:(Class)cellClass
     return self;
 }
 
-- (instancetype)initWithCellClasses:(NSArray<Class> *)cellClassArray
+- (instancetype)initWithCellClasses:(NSArray *)cellClassArray
 {
     if (self = [super init]) {
         _modelTableview = [UITableView new];
-        [cellClassArray enumerateObjectsUsingBlock:^(Class  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        [cellClassArray enumerateObjectsUsingBlock:^(Class obj, NSUInteger idx, BOOL *stop) {
             [self registerCellWithCellClass:obj];
         }];
         _cacheDictionary = [NSMutableDictionary new];
@@ -209,7 +209,7 @@ - (void)startAutoCellHeightWithCellClass:(Class)cellClass contentViewWidth:(CGFl
     self.cellAutoHeightManager.contentViewWidth = contentViewWidth;
 }
 
-- (void)startAutoCellHeightWithCellClasses:(NSArray<Class> *)cellClassArray contentViewWidth:(CGFloat)contentViewWidth
+- (void)startAutoCellHeightWithCellClasses:(NSArray *)cellClassArray contentViewWidth:(CGFloat)contentViewWidth
 {
     if (!self.cellAutoHeightManager) {
         self.cellAutoHeightManager = [[SDCellAutoHeightManager alloc] initWithCellClasses:cellClassArray];
diff --git a/SDAutoLayout 测试 Demo/SDAutoLayout/UIView+SDAutoLayout.m b/SDAutoLayout 测试 Demo/SDAutoLayout/UIView+SDAutoLayout.m
@@ -659,12 +659,12 @@ - (void)sd_autolayout
     
     if (self.sd_equalWidthSubviews.count) {
         __block CGFloat totalMargin = 0;
-        [self.sd_equalWidthSubviews enumerateObjectsUsingBlock:^(UIView * _Nonnull view, NSUInteger idx, BOOL * _Nonnull stop) {
+        [self.sd_equalWidthSubviews enumerateObjectsUsingBlock:^(UIView *view, NSUInteger idx, BOOL *stop) {
             SDAutoLayoutModel *model = view.sd_layout;
             totalMargin += ([model.left.value floatValue] + [model.right.value floatValue]);
         }];
         CGFloat averageWidth = (self.width - totalMargin) / self.sd_equalWidthSubviews.count;
-        [self.sd_equalWidthSubviews enumerateObjectsUsingBlock:^(UIView * _Nonnull view, NSUInteger idx, BOOL * _Nonnull stop) {
+        [self.sd_equalWidthSubviews enumerateObjectsUsingBlock:^(UIView *view, NSUInteger idx, BOOL *stop) {
             view.width = averageWidth;
             view.fixedWith = @(averageWidth);
         }];

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ - (void)viewDidLoad`
`38`	`38`
`39`	`39`	`dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{`
`40`	`40`	`self.view0.sd_layout.bottomSpaceToView(self.view, 100);`
`41`		`- [self.view layoutSubviews];`
	`41`	`+ [self.view0 updateLayout];`
`42`	`42`	`});`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,11 @@ - (instancetype)initWithCellClass:(Class)cellClass`
`49`	`49`	`return self;`
`50`	`50`	`}`
`51`	`51`
`52`		`-- (instancetype)initWithCellClasses:(NSArray<Class> *)cellClassArray`
	`52`	`+- (instancetype)initWithCellClasses:(NSArray *)cellClassArray`
`53`	`53`	`{`
`54`	`54`	`if (self = [super init]) {`
`55`	`55`	`_modelTableview = [UITableView new];`
`56`		`- [cellClassArray enumerateObjectsUsingBlock:^(Class _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {`
	`56`	`+ [cellClassArray enumerateObjectsUsingBlock:^(Class obj, NSUInteger idx, BOOL *stop) {`
`57`	`57`	`[self registerCellWithCellClass:obj];`
`58`	`58`	`}];`
`59`	`59`	`_cacheDictionary = [NSMutableDictionary new];`
`@@ -209,7 +209,7 @@ - (void)startAutoCellHeightWithCellClass:(Class)cellClass contentViewWidth:(CGFl`
`209`	`209`	`self.cellAutoHeightManager.contentViewWidth = contentViewWidth;`
`210`	`210`	`}`
`211`	`211`
`212`		`-- (void)startAutoCellHeightWithCellClasses:(NSArray<Class> *)cellClassArray contentViewWidth:(CGFloat)contentViewWidth`
	`212`	`+- (void)startAutoCellHeightWithCellClasses:(NSArray *)cellClassArray contentViewWidth:(CGFloat)contentViewWidth`
`213`	`213`	`{`
`214`	`214`	`if (!self.cellAutoHeightManager) {`
`215`	`215`	`self.cellAutoHeightManager = [[SDCellAutoHeightManager alloc] initWithCellClasses:cellClassArray];`