调整 nib 加载。

Author: liangdahong

UITableViewDynamicLayoutCacheHeight.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name         = 'UITableViewDynamicLayoutCacheHeight'
-s.version      = '5.1.2'
+s.version      = '5.1.3'
 s.summary      = '🖖 Template auto layout cell for automatically UITableViewCell UITableViewHeaderFooterView calculating and cache height framework.'
 s.homepage     = 'https://github.com/liangdahong/UITableViewDynamicLayoutCacheHeight'
 s.license      = 'MIT'

UITableViewDynamicLayoutCacheHeight/Classes/Private/UITableView+BMPrivate.h

@@ -22,6 +22,9 @@
 
 #import <UIKit/UIKit.h>
 
+// 兼容 Swift
+#define kSwiftClassNibName(clasName) ([clasName rangeOfString:@"."].location != NSNotFound ? [clasName componentsSeparatedByString:@"."].lastObject : clasName)
+
 /// 内部使用到的分类。
 @interface UITableView (BMPrivate)
 

UITableViewDynamicLayoutCacheHeight/Classes/UITableView+BMDynamicLayout.m

@@ -26,6 +26,7 @@
 #import "UITableViewHeaderFooterView+BMDynamicLayout.h"
 #import "UITableViewCell+BMDynamicLayout.h"
 #import "UITableViewDynamicLayoutCacheHeight.h"
+#import "UITableView+BMPrivate.h"
 
 void tableViewDynamicLayoutLayoutIfNeeded(UIView *view);
 inline void tableViewDynamicLayoutLayoutIfNeeded(UIView *view) {
@@ -84,11 +85,7 @@ @implementation UITableView (BMDynamicLayout)
 
 - (UIView *)_cellViewWithCellClass:(Class)clas {
     NSString *cellClassName = NSStringFromClass(clas);
-    // 兼容 Swift
-    if ([cellClassName rangeOfString:@"."].location != NSNotFound) {
-        cellClassName = [cellClassName componentsSeparatedByString:@"."].lastObject;
-    }
-    
+
     NSMutableDictionary *dict = objc_getAssociatedObject(self, _cmd);
     if (!dict) {
         dict = @{}.mutableCopy;
@@ -101,10 +98,10 @@ - (UIView *)_cellViewWithCellClass:(Class)clas {
     }
 
     NSBundle *bundle = [NSBundle bundleForClass:clas];
-    NSString *path = [bundle pathForResource:cellClassName ofType:@"nib"];
+    NSString *path = [bundle pathForResource:kSwiftClassNibName(cellClassName) ofType:@"nib"];
     UITableViewCell *cell = nil;
     if (path.length > 0) {
-        NSArray <UITableViewCell *> *arr = [[UINib nibWithNibName:cellClassName bundle:bundle] instantiateWithOwner:nil options:nil];
+        NSArray <UITableViewCell *> *arr = [[UINib nibWithNibName:kSwiftClassNibName(cellClassName) bundle:bundle] instantiateWithOwner:nil options:nil];
         for (UITableViewCell *obj in arr) {
             if ([obj isMemberOfClass:clas]) {
                 cell = obj;
@@ -175,11 +172,7 @@ - (CGFloat)_heightWithCellClass:(Class)clas
 - (UIView *)_headerFooterViewWithHeaderFooterViewClass:(Class)clas
                                                    sel:(SEL)sel {
     NSString *headerFooterViewClassName = NSStringFromClass(clas);
-    // 兼容 Swift
-    if ([headerFooterViewClassName rangeOfString:@"."].location != NSNotFound) {
-        headerFooterViewClassName = [headerFooterViewClassName componentsSeparatedByString:@"."].lastObject;
-    }
-    
+
     NSMutableDictionary *dict = objc_getAssociatedObject(self, sel);
     if (!dict) {
         dict = @{}.mutableCopy;
@@ -192,10 +185,10 @@ - (UIView *)_headerFooterViewWithHeaderFooterViewClass:(Class)clas
     }
 
     NSBundle *bundle = [NSBundle bundleForClass:clas];
-    NSString *path = [bundle pathForResource:headerFooterViewClassName ofType:@"nib"];
+    NSString *path = [bundle pathForResource:kSwiftClassNibName(headerFooterViewClassName) ofType:@"nib"];
     UIView *headerView = nil;
     if (path.length > 0) {
-        NSArray <UITableViewHeaderFooterView *> *arr = [[UINib nibWithNibName:headerFooterViewClassName bundle:bundle] instantiateWithOwner:nil options:nil];
+        NSArray <UITableViewHeaderFooterView *> *arr = [[UINib nibWithNibName:kSwiftClassNibName(headerFooterViewClassName) bundle:bundle] instantiateWithOwner:nil options:nil];
         for (UITableViewHeaderFooterView *obj in arr) {
             if ([obj isMemberOfClass:clas]) {
                 headerView = obj;

UITableViewDynamicLayoutCacheHeight/Classes/UITableViewCell+BMDynamicLayout.m

@@ -22,6 +22,7 @@
 
 #import "UITableViewCell+BMDynamicLayout.h"
 #import <objc/runtime.h>
+#import "UITableView+BMPrivate.h"
 
 @implementation UITableViewCell (BMDynamicLayout)
 
@@ -41,18 +42,14 @@ + (instancetype)bm_tableViewCellFromNibWithTableView:(UITableView *)tableView {
         return cell;
     }
 
-    if ([selfClassName rangeOfString:@"."].location != NSNotFound) {
-        selfClassName = [selfClassName componentsSeparatedByString:@"."].lastObject;
-    }
-    
     NSBundle *bundle = [NSBundle bundleForClass:self.class];
-    NSString *path = [bundle pathForResource:selfClassName ofType:@"nib"];
+    NSString *path = [bundle pathForResource:kSwiftClassNibName(selfClassName) ofType:@"nib"];
     if (path.length == 0) {
         NSAssert(NO, @"你的 Cell 不是 IB 创建的");
         return nil;
     }
 
-    NSArray <UITableViewCell *> *arr = [[UINib nibWithNibName:selfClassName bundle:bundle] instantiateWithOwner:nil options:nil];
+    NSArray <UITableViewCell *> *arr = [[UINib nibWithNibName:kSwiftClassNibName(selfClassName) bundle:bundle] instantiateWithOwner:nil options:nil];
     for (UITableViewCell *obj in arr) {
         if ([obj isMemberOfClass:self.class]) {
             cell = obj;

UITableViewDynamicLayoutCacheHeight/Classes/UITableViewDynamicLayoutCacheHeight.h

@@ -21,7 +21,7 @@
 //    SOFTWARE.
 
 ////////////////
-///   v5.1.2
+///   v5.1.3
 ////////////////
 
 #ifndef UITableViewDynamicLayoutCacheHeight_h

UITableViewDynamicLayoutCacheHeight/Classes/UITableViewHeaderFooterView+BMDynamicLayout.m

@@ -22,6 +22,7 @@
 
 #import "UITableViewHeaderFooterView+BMDynamicLayout.h"
 #import <objc/runtime.h>
+#import "UITableView+BMPrivate.h"
 
 @implementation UITableViewHeaderFooterView (BMDynamicLayout)
 
@@ -40,18 +41,14 @@ + (instancetype)bm_tableViewHeaderFooterViewFromNibWithTableView:(UITableView *)
     if (headerFooterView) {
         return headerFooterView;
     }
-    // 兼容 Swift
-    if ([selfClassName rangeOfString:@"."].location != NSNotFound) {
-        selfClassName = [selfClassName componentsSeparatedByString:@"."].lastObject;
-    }
 
     NSBundle *bundle = [NSBundle bundleForClass:self.class];
-    NSString *path = [bundle pathForResource:selfClassName ofType:@"nib"];
+    NSString *path = [bundle pathForResource:kSwiftClassNibName(selfClassName) ofType:@"nib"];
     if (path.length == 0) {
         NSAssert(NO, @"你的 UITableViewHeaderFooterView 不是 IB 创建的");
         return nil;
     }
-    NSArray <UITableViewHeaderFooterView *> *arr = [[UINib nibWithNibName:selfClassName bundle:bundle] instantiateWithOwner:nil options:nil];
+    NSArray <UITableViewHeaderFooterView *> *arr = [[UINib nibWithNibName:kSwiftClassNibName(selfClassName) bundle:bundle] instantiateWithOwner:nil options:nil];
     for (UITableViewHeaderFooterView *obj in arr) {
         if ([obj isMemberOfClass:self.class]) {
             headerFooterView = obj;