Revert "优化代理方法"

lianchen · lianchen · commit ae906a51ac84 · 2019-07-01T19:25:34.000+08:00
This reverts commit 629fb57.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Example/.DS_Store b/Example/.DS_Store
diff --git a/Example/Demo/TestViewController2.m b/Example/Demo/TestViewController2.m
@@ -47,7 +47,7 @@ - (instancetype)initWithOverallRefresh:(BOOL)isOverall;
 
 - (void)dealloc
 {
-//    NSLog(@"TestViewController2销毁");
+    NSLog(@"TestViewController2销毁");
 }
 
 
diff --git a/Example/Demo/TestViewController3.m b/Example/Demo/TestViewController3.m
@@ -68,7 +68,6 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     TestViewController2 *vc = [[TestViewController2 alloc] init];
-    vc.title = @"示例2:内部刷新";
     [self.navigationController pushViewController:vc animated:YES];
     
 }
diff --git a/Example/Demo/ViewController.m b/Example/Demo/ViewController.m
@@ -24,7 +24,7 @@ @implementation ViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setupExample];
-    NSLog(@"初始化完成");
+    NSLog(@"完成");
 }
 
 - (void)setupExample
@@ -51,11 +51,9 @@ - (void)btnDidClick:(UIButton *)btn
 {
     if (btn.tag == 1) {
         TestViewController2 *vc = [[TestViewController2 alloc] initWithOverallRefresh:YES];
-        vc.title = @"示例1:整体刷新";
         [self.navigationController pushViewController:vc animated:YES];
     }else if (btn.tag == 2) {
         TestViewController2 *vc = [[TestViewController2 alloc] init];
-        vc.title = @"示例2:内部刷新";
         [self.navigationController pushViewController:vc animated:YES];
     }
 }
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -7,14 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		9DA53F1720AE69FE00DA0D0E /* LCHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DA53F1620AE69FE00DA0D0E /* LCHeadView.m */; };
-		9DA53F1A20AE6A9000DA0D0E /* LCTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DA53F1820AE6A9000DA0D0E /* LCTitleView.m */; };
-		9DA53F1E20AE6AC200DA0D0E /* LCPageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DA53F1C20AE6AC200DA0D0E /* LCPageView.m */; };
 		C857065020ADAF9E00397593 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C857064F20ADAF9E00397593 /* AppDelegate.m */; };
 		C857065620ADAF9E00397593 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C857065420ADAF9E00397593 /* Main.storyboard */; };
 		C857065820ADAF9F00397593 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C857065720ADAF9F00397593 /* Assets.xcassets */; };
 		C857065B20ADAF9F00397593 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C857065920ADAF9F00397593 /* LaunchScreen.storyboard */; };
 		C857065E20ADAF9F00397593 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C857065D20ADAF9F00397593 /* main.m */; };
+		C857068520ADB08A00397593 /* LCTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = C857067820ADB08900397593 /* LCTitleView.m */; };
+		C857068620ADB08A00397593 /* LCPageView.m in Sources */ = {isa = PBXBuildFile; fileRef = C857067920ADB08900397593 /* LCPageView.m */; };
 		C857068720ADB08A00397593 /* UIViewController+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = C857067A20ADB08900397593 /* UIViewController+Category.m */; };
 		C857068820ADB08A00397593 /* LCPageViewStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = C857067B20ADB08900397593 /* LCPageViewStyle.m */; };
 		C857068920ADB08A00397593 /* MainScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = C857067D20ADB08A00397593 /* MainScrollView.m */; };
@@ -26,13 +25,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		9DA53F1520AE69FE00DA0D0E /* LCHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCHeadView.h; sourceTree = "<group>"; };
-		9DA53F1620AE69FE00DA0D0E /* LCHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LCHeadView.m; sourceTree = "<group>"; };
-		9DA53F1820AE6A9000DA0D0E /* LCTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCTitleView.m; sourceTree = "<group>"; };
-		9DA53F1920AE6A9000DA0D0E /* LCTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCTitleView.h; sourceTree = "<group>"; };
-		9DA53F1B20AE6AAE00DA0D0E /* LCPageContentViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCPageContentViewProtocol.h; sourceTree = "<group>"; };
-		9DA53F1C20AE6AC200DA0D0E /* LCPageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCPageView.m; sourceTree = "<group>"; };
-		9DA53F1D20AE6AC200DA0D0E /* LCPageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCPageView.h; sourceTree = "<group>"; };
 		C857064B20ADAF9E00397593 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C857064E20ADAF9E00397593 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		C857064F20ADAF9E00397593 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -41,9 +33,14 @@
 		C857065A20ADAF9F00397593 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		C857065C20ADAF9F00397593 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C857065D20ADAF9F00397593 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		C857067820ADB08900397593 /* LCTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCTitleView.m; sourceTree = "<group>"; };
+		C857067920ADB08900397593 /* LCPageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCPageView.m; sourceTree = "<group>"; };
 		C857067A20ADB08900397593 /* UIViewController+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+Category.m"; sourceTree = "<group>"; };
 		C857067B20ADB08900397593 /* LCPageViewStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCPageViewStyle.m; sourceTree = "<group>"; };
+		C857067C20ADB08900397593 /* LCTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCTitleView.h; sourceTree = "<group>"; };
 		C857067D20ADB08A00397593 /* MainScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainScrollView.m; sourceTree = "<group>"; };
+		C857067E20ADB08A00397593 /* LCPageContentViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCPageContentViewProtocol.h; sourceTree = "<group>"; };
+		C857067F20ADB08A00397593 /* LCPageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCPageView.h; sourceTree = "<group>"; };
 		C857068020ADB08A00397593 /* UIScrollView+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+Category.h"; sourceTree = "<group>"; };
 		C857068120ADB08A00397593 /* UIScrollView+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+Category.m"; sourceTree = "<group>"; };
 		C857068220ADB08A00397593 /* UIViewController+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Category.h"; sourceTree = "<group>"; };
@@ -105,21 +102,19 @@
 		C857066420ADB04500397593 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				9DA53F1D20AE6AC200DA0D0E /* LCPageView.h */,
-				9DA53F1C20AE6AC200DA0D0E /* LCPageView.m */,
-				9DA53F1920AE6A9000DA0D0E /* LCTitleView.h */,
-				9DA53F1820AE6A9000DA0D0E /* LCTitleView.m */,
-				9DA53F1520AE69FE00DA0D0E /* LCHeadView.h */,
-				9DA53F1620AE69FE00DA0D0E /* LCHeadView.m */,
+				C857067E20ADB08A00397593 /* LCPageContentViewProtocol.h */,
+				C857067F20ADB08A00397593 /* LCPageView.h */,
+				C857067920ADB08900397593 /* LCPageView.m */,
 				C857068320ADB08A00397593 /* LCPageViewStyle.h */,
 				C857067B20ADB08900397593 /* LCPageViewStyle.m */,
+				C857067C20ADB08900397593 /* LCTitleView.h */,
+				C857067820ADB08900397593 /* LCTitleView.m */,
 				C857068420ADB08A00397593 /* MainScrollView.h */,
 				C857067D20ADB08A00397593 /* MainScrollView.m */,
 				C857068020ADB08A00397593 /* UIScrollView+Category.h */,
 				C857068120ADB08A00397593 /* UIScrollView+Category.m */,
 				C857068220ADB08A00397593 /* UIViewController+Category.h */,
 				C857067A20ADB08900397593 /* UIViewController+Category.m */,
-				9DA53F1B20AE6AAE00DA0D0E /* LCPageContentViewProtocol.h */,
 			);
 			name = Source;
 			path = ../../Source;
@@ -211,16 +206,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				C857069A20ADB22400397593 /* TestTitleView.m in Sources */,
-				9DA53F1720AE69FE00DA0D0E /* LCHeadView.m in Sources */,
+				C857068520ADB08A00397593 /* LCTitleView.m in Sources */,
 				C857069920ADB22400397593 /* TestViewController2.m in Sources */,
 				C857068A20ADB08A00397593 /* UIScrollView+Category.m in Sources */,
 				C857068920ADB08A00397593 /* MainScrollView.m in Sources */,
-				9DA53F1A20AE6A9000DA0D0E /* LCTitleView.m in Sources */,
 				C857065E20ADAF9F00397593 /* main.m in Sources */,
 				C857069720ADB22400397593 /* ViewController.m in Sources */,
 				C857069620ADB22400397593 /* TestViewController3.m in Sources */,
 				C857068820ADB08A00397593 /* LCPageViewStyle.m in Sources */,
-				9DA53F1E20AE6AC200DA0D0E /* LCPageView.m in Sources */,
+				C857068620ADB08A00397593 /* LCPageView.m in Sources */,
 				C857068720ADB08A00397593 /* UIViewController+Category.m in Sources */,
 				C857065020ADAF9E00397593 /* AppDelegate.m in Sources */,
 			);
diff --git a/Source/LCHeadView.m b/Source/LCHeadView.m
@@ -10,5 +10,12 @@
 
 @implementation LCHeadView
 
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
 
 @end
diff --git a/Source/LCPageContentViewProtocol.h b/Source/LCPageContentViewProtocol.h
@@ -10,7 +10,6 @@
 
 @protocol LCPageContentViewProtocol <NSObject>
 
-#pragma mark - titleView 代理方法
 /// 即将开始拖拽
 - (void)lc_scrollViewWillBeginDragging:(UICollectionView *)collectionView;
 
diff --git a/Source/LCPageView.m b/Source/LCPageView.m
@@ -5,6 +5,9 @@
 //  Created by 复新会智 on 2018/5/9.
 //  Copyright © 2018年 复新会智. All rights reserved.
 //
+/// 标题的高度
+#define kPageViewTitleHeight 38
+
 
 //屏幕尺寸
 #define kScreenBounds [UIScreen mainScreen].bounds
diff --git a/Source/LCTitleView.m b/Source/LCTitleView.m
@@ -52,6 +52,10 @@ - (void)didMoveToSuperview
     UIView *superV = [self getLCPageViewWithCurrentView:self];
     if ([superV isKindOfClass:[LCPageView class]]) {
         [superV performSelector:@selector(setContentViewDelegate:) withObject:self];
+//        LCPageView *v = (LCPageView *)superV;
+//        id<LCPageContentViewProtocol> delegate = [v valueForKey:@"contentScrollDelegate"];
+//        delegate = self;
+//        v.contentScrollDelegate = self;
     }
 }
 
diff --git a/Source/MainScrollView.m b/Source/MainScrollView.m
@@ -20,5 +20,8 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
     return ([gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] &&
             [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]);
 }
-
+- (void)dealloc
+{
+//    NSLog(@"MainScrollView销毁");
+}
 @end
diff --git a/Source/UIScrollView+Category.h b/Source/UIScrollView+Category.h
@@ -10,6 +10,6 @@
 typedef void(^LCScrollHandle)(UIScrollView *);
 
 @interface UIScrollView (Category)
-/** 滚动回调 */
+/** 滚动代理 */
 @property(nonatomic, copy) LCScrollHandle scrollHandle;
 @end

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ - (instancetype)initWithOverallRefresh:(BOOL)isOverall;`
`47`	`47`
`48`	`48`	`- (void)dealloc`
`49`	`49`	`{`
`50`		`-// NSLog(@"TestViewController2销毁");`
	`50`	`+ NSLog(@"TestViewController2销毁");`
`51`	`51`	`}`
`52`	`52`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath`
`68`	`68`	`{`
`69`	`69`	`[tableView deselectRowAtIndexPath:indexPath animated:YES];`
`70`	`70`	`TestViewController2 *vc = [[TestViewController2 alloc] init];`
`71`		`- vc.title = @"示例2:内部刷新";`
`72`	`71`	`[self.navigationController pushViewController:vc animated:YES];`
`73`	`72`
`74`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ @implementation ViewController`
`24`	`24`	`- (void)viewDidLoad {`
`25`	`25`	`[super viewDidLoad];`
`26`	`26`	`[self setupExample];`
`27`		`- NSLog(@"初始化完成");`
	`27`	`+ NSLog(@"完成");`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`- (void)setupExample`
`@@ -51,11 +51,9 @@ - (void)btnDidClick:(UIButton *)btn`
`51`	`51`	`{`
`52`	`52`	`if (btn.tag == 1) {`
`53`	`53`	`TestViewController2 *vc = [[TestViewController2 alloc] initWithOverallRefresh:YES];`
`54`		`- vc.title = @"示例1:整体刷新";`
`55`	`54`	`[self.navigationController pushViewController:vc animated:YES];`
`56`	`55`	`}else if (btn.tag == 2) {`
`57`	`56`	`TestViewController2 *vc = [[TestViewController2 alloc] init];`
`58`		`- vc.title = @"示例2:内部刷新";`
`59`	`57`	`[self.navigationController pushViewController:vc animated:YES];`
`60`	`58`	`}`
`61`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ - (void)didMoveToSuperview`
`52`	`52`	`UIView *superV = [self getLCPageViewWithCurrentView:self];`
`53`	`53`	`if ([superV isKindOfClass:[LCPageView class]]) {`
`54`	`54`	`[superV performSelector:@selector(setContentViewDelegate:) withObject:self];`
	`55`	`+// LCPageView v = (LCPageView )superV;`
	`56`	`+// id<LCPageContentViewProtocol> delegate = [v valueForKey:@"contentScrollDelegate"];`
	`57`	`+// delegate = self;`
	`58`	`+// v.contentScrollDelegate = self;`
`55`	`59`	`}`
`56`	`60`	`}`
`57`	`61`