修复bug #87 #88 #89，release 1.6.9

QuintGao · Nov 8, 2021 · 83ceb29 · 83ceb29
1 parent e6c01a0
commit 83ceb29
Show file tree

Hide file tree

Showing 23 changed files with 102 additions and 80 deletions.
diff --git a/GKPageScrollView.podspec b/GKPageScrollView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'GKPageScrollView'
-  s.version             = '1.6.8'
+  s.version             = '1.6.9'
   s.summary             = 'iOS UIScrollView嵌套滑动分页视图'
   s.homepage            = 'https://github.com/QuintGao/GKPageScrollView'
   s.license             = { :type => "MIT", :file => "LICENSE" }

diff --git a/GKPageSmoothView.podspec b/GKPageSmoothView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'GKPageSmoothView'
-  s.version             = '1.6.8'
+  s.version             = '1.6.9'
   s.summary             = 'iOS UIScrollView嵌套滑动分页视图'
   s.homepage            = 'https://github.com/QuintGao/GKPageScrollView'
   s.license             = { :type => "MIT", :file => "LICENSE" }

diff --git a/ObjcExample/ObjcExample/Demo/Base/GKBaseListViewController.m b/ObjcExample/ObjcExample/Demo/Base/GKBaseListViewController.m
@@ -74,7 +74,9 @@ - (void)viewDidLoad {
     }
 
     if (self.listType != GKBaseListType_WKWebView) {
+        __weak __typeof(self) weakSelf = self;
         self.currentScrollView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+            __strong __typeof(weakSelf) self = weakSelf;
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kRefreshDuration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [self loadMoreData];
             });
@@ -147,7 +149,11 @@ - (void)loadMoreData {
 }
 
 - (void)addCellToScrollView {
-    [self.scrollView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
+    [self.scrollView.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        if ([obj isKindOfClass:UILabel.class]) {
+            [obj removeFromSuperview];
+        }
+    }];
 
     UIView *lastView = nil;
     for (NSInteger i = 0; i < self.count; i++) {
@@ -186,7 +192,9 @@ - (void)hideLoading {
 }
 
 - (void)addHeaderRefresh {
+    __weak __typeof(self) weakSelf = self;
     self.currentScrollView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+        __strong __typeof(weakSelf) self = weakSelf;
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kRefreshDuration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [self.currentScrollView.mj_header endRefreshing];
 

diff --git a/ObjcExample/ObjcExample/Demo/GKPageSmoothView/Smooth/GKSmoothViewController.m b/ObjcExample/ObjcExample/Demo/GKPageSmoothView/Smooth/GKSmoothViewController.m
@@ -84,7 +84,7 @@ - (NSInteger)numberOfListsInSmoothView:(GKPageSmoothView *)smoothView {
 //    listVC.delegate = self;
 //    listVC.index = index;
 //    return listVC;
-    GKBaseListViewController *listVC = [[GKBaseListViewController alloc] initWithListType:0];
+    GKBaseListViewController *listVC = [[GKBaseListViewController alloc] initWithListType:index];
     listVC.shouldLoadData = YES;
     return listVC;
 }

diff --git a/ObjcExample/ObjcExample/Demo/GKPageSmoothView/豆瓣/GKDBViewController.m b/ObjcExample/ObjcExample/Demo/GKPageSmoothView/豆瓣/GKDBViewController.m
@@ -67,11 +67,11 @@ - (NSInteger)numberOfListsInSmoothView:(GKPageSmoothView *)smoothView {
 }
 
 - (id<GKPageSmoothListViewDelegate>)smoothView:(GKPageSmoothView *)smoothView initListAtIndex:(NSInteger)index {
-//    GKDBListView *listView = [GKDBListView new];
-//    return listView;
-    GKBaseListViewController *listVC = [[GKBaseListViewController alloc] initWithListType:index];
-    listVC.shouldLoadData = YES;
-    return listVC;
+    GKDBListView *listView = [GKDBListView new];
+    return listView;
+//    GKBaseListViewController *listVC = [[GKBaseListViewController alloc] initWithListType:index];
+//    listVC.shouldLoadData = YES;
+//    return listVC;
 }
 
 #pragma mark - GKPageSmoothViewDelegate
@@ -213,7 +213,7 @@ - (JXCategorySubTitleView *)categoryView {
         lineView.indicatorColor = UIColor.blackColor;
         _categoryView.indicators = @[self.lineView];
 
-        _categoryView.contentScrollView = self.smoothView.listCollectionView;
+//        _categoryView.contentScrollView = self.smoothView.listCollectionView;
     }
     return _categoryView;
 }

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,18 +1,18 @@
 PODS:
-  - GKNavigationBar (1.6.0):
-    - GKNavigationBar/GestureHandle (= 1.6.0)
-    - GKNavigationBar/NavigationBar (= 1.6.0)
-  - GKNavigationBar/GestureHandle (1.6.0)
-  - GKNavigationBar/NavigationBar (1.6.0)
+  - GKNavigationBar (1.6.1):
+    - GKNavigationBar/GestureHandle (= 1.6.1)
+    - GKNavigationBar/NavigationBar (= 1.6.1)
+  - GKNavigationBar/GestureHandle (1.6.1)
+  - GKNavigationBar/NavigationBar (1.6.1)
   - GKNavigationBarSwift (1.3.1)
-  - GKPageScrollView (1.6.6):
-    - GKPageScrollView/Objc (= 1.6.6)
-  - GKPageScrollView/Objc (1.6.6)
-  - GKPageScrollView/Swift (1.6.6)
-  - GKPageSmoothView (1.6.6):
-    - GKPageSmoothView/Objc (= 1.6.6)
-  - GKPageSmoothView/Objc (1.6.6)
-  - GKPageSmoothView/Swift (1.6.6)
+  - GKPageScrollView (1.6.9):
+    - GKPageScrollView/Objc (= 1.6.9)
+  - GKPageScrollView/Objc (1.6.9)
+  - GKPageScrollView/Swift (1.6.9)
+  - GKPageSmoothView (1.6.9):
+    - GKPageSmoothView/Objc (= 1.6.9)
+  - GKPageSmoothView/Objc (1.6.9)
+  - GKPageSmoothView/Swift (1.6.9)
   - JXCategoryViewExt/Core (1.1.4)
   - JXCategoryViewExt/Indicator/AlignmentLine (1.1.4):
     - JXCategoryViewExt/Indicator/Line
@@ -68,10 +68,10 @@ EXTERNAL SOURCES:
     :path: "../GKPageScrollView"
 
 SPEC CHECKSUMS:
-  GKNavigationBar: 777b10cebaa1026d9aa392859c42e389895eb744
+  GKNavigationBar: 4b63ee7d9337d3c1b5057fa324730a083c828fda
   GKNavigationBarSwift: f3d1a977b4397f43bb7e5769c92609795090edb2
-  GKPageScrollView: af9750e3ac29cbceb3ec7dacfdb323b06a5f07fd
-  GKPageSmoothView: 2b2dbd4a71840fcab60ecee486cd6bab9003491a
+  GKPageScrollView: 8c3e8e9c35f1f4117bf94e5556b351917cb3df14
+  GKPageSmoothView: 8eae3929aa6e6a80b1dc93f4b539f890e63b5df1
   JXCategoryViewExt: 4fa0ec4d1c05e4a02c61c7c94f1059fbf06ceeca
   JXSegmentedView: eb1cad21f57c2543c00c3e08b8fd3c7ca54f5acd
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201

diff --git a/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKBaseAnimatedTransition.h b/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKBaseAnimatedTransition.h
diff --git a/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKBaseAnimatedTransition.m b/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKBaseAnimatedTransition.m
diff --git a/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKGestureHandleConfigure.h b/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKGestureHandleConfigure.h
diff --git a/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKGestureHandleConfigure.m b/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKGestureHandleConfigure.m
diff --git a/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKPushAnimatedTransition.m b/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/GKPushAnimatedTransition.m
diff --git a/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/UINavigationController+GKGestureHandle.m b/Pods/GKNavigationBar/GKNavigationBar/GestureHandle/UINavigationController+GKGestureHandle.m
diff --git a/Pods/GKNavigationBar/README.md b/Pods/GKNavigationBar/README.md
diff --git a/Pods/Local Podspecs/GKPageScrollView.podspec.json b/Pods/Local Podspecs/GKPageScrollView.podspec.json
diff --git a/Pods/Local Podspecs/GKPageSmoothView.podspec.json b/Pods/Local Podspecs/GKPageSmoothView.podspec.json
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Target Support Files/GKPageScrollView-Swift/GKPageScrollView-Swift-Info.plist b/Pods/Target Support Files/GKPageScrollView-Swift/GKPageScrollView-Swift-Info.plist
diff --git a/Pods/Target Support Files/GKPageSmoothView-Swift/GKPageSmoothView-Swift-Info.plist b/Pods/Target Support Files/GKPageSmoothView-Swift/GKPageSmoothView-Swift-Info.plist
diff --git a/README.md b/README.md
@@ -94,6 +94,9 @@ GKPageSmoothView是一个可延续滑动的UIScrollView嵌套滑动库
 
 ## 版本更新
 
+* 2021.11.08   1.6.9 - 1、修复低版本xcode报错问题 #87
+                       2、修复内存泄漏问题 #88
+                       3、修复cell高度无法自适应问题 #89
 * 2021.10.29   1.6.8 - GKSmoothView优化，修复吸顶后点击切换显示异常问题 #87
 * 2021.10.20   1.6.7 - GKSmoothView frame变化优化
 * 2021.10.15   1.6.6 - 优化更新，增加设置cell属性代理 #81

diff --git a/Sources/GKPageScrollView/GKPageScrollView.m b/Sources/GKPageScrollView/GKPageScrollView.m
@@ -88,7 +88,7 @@ - (void)initSubviews {
         self.mainTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     }
     if (@available(iOS 15.0, *)) {
-        self.mainTableView.sectionHeaderTopPadding = 0;
+        [self.mainTableView setValue:@(0) forKey:@"sectionHeaderTopPadding"];
     }
     [self addSubview:self.mainTableView];
     [self refreshHeaderView];

diff --git a/Sources/GKPageScrollViewSwift/GKPageScrollView.swift b/Sources/GKPageScrollViewSwift/GKPageScrollView.swift
@@ -231,7 +231,7 @@ open class GKPageScrollView: UIView {
             self.mainTableView.contentInsetAdjustmentBehavior = .never
         }
         if #available(iOS 15.0, *) {
-            self.mainTableView.sectionHeaderTopPadding = 0
+            self.mainTableView.setValue(0, forKey: "sectionHeaderTopPadding")
         }
         self.addSubview(mainTableView)
         self.refreshHeaderView()