vvusu · vvusu · Aug 16, 2017 · Aug 16, 2017
diff --git a/LNRefresh.xcodeproj/project.pbxproj b/LNRefresh.xcodeproj/project.pbxproj
@@ -24,8 +24,6 @@
 /* Begin PBXBuildFile section */
 		AF1F98FD1F1C63590074E638 /* LNRefresh.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF29B5781F0C900300348F99 /* LNRefresh.framework */; settings = {ATTRIBUTES = (Required, ); }; };
 		AF1F99001F1CAA660074E638 /* DemoVC.m in Sources */ = {isa = PBXBuildFile; fileRef = AF1F98FF1F1CAA660074E638 /* DemoVC.m */; };
-		AF1F99181F20779E0074E638 /* LNHeaderDIYAnimator.m in Sources */ = {isa = PBXBuildFile; fileRef = AF1F99131F20779E0074E638 /* LNHeaderDIYAnimator.m */; };
-		AF1F991A1F20779E0074E638 /* YLoadingPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = AF1F99171F20779E0074E638 /* YLoadingPanel.m */; };
 		AF1F991E1F2077D80074E638 /* LNHeaderAnimator+Analysis.m in Sources */ = {isa = PBXBuildFile; fileRef = AF1F991D1F2077D80074E638 /* LNHeaderAnimator+Analysis.m */; };
 		AF29B5891F0C900300348F99 /* LNRefresh.h in Headers */ = {isa = PBXBuildFile; fileRef = AF29B57B1F0C900300348F99 /* LNRefresh.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AF29B5C41F0CC04600348F99 /* NSObject+LNRefresh.h in Headers */ = {isa = PBXBuildFile; fileRef = AF29B5C21F0CC04600348F99 /* NSObject+LNRefresh.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -34,6 +32,10 @@
 		AF6450E81F32C0B700DB8520 /* LNRefreshConst.m in Sources */ = {isa = PBXBuildFile; fileRef = AF6450E61F32C0B700DB8520 /* LNRefreshConst.m */; };
 		AFA03C581F272DAA00896ED8 /* lnrefresh.json in Resources */ = {isa = PBXBuildFile; fileRef = AFA03C571F272DAA00896ED8 /* lnrefresh.json */; };
 		AFA03C621F27546500896ED8 /* LNRefresh.bundle in Resources */ = {isa = PBXBuildFile; fileRef = AFA03C611F27546500896ED8 /* LNRefresh.bundle */; };
+		AFA7D5681F4423FE00FAFA50 /* LNHeaderDIYAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = AFA7D5641F4423FE00FAFA50 /* LNHeaderDIYAnimator.h */; };
+		AFA7D5691F4423FE00FAFA50 /* LNHeaderDIYAnimator.m in Sources */ = {isa = PBXBuildFile; fileRef = AFA7D5651F4423FE00FAFA50 /* LNHeaderDIYAnimator.m */; };
+		AFA7D56A1F4423FE00FAFA50 /* YLoadingPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = AFA7D5661F4423FE00FAFA50 /* YLoadingPanel.h */; };
+		AFA7D56B1F4423FE00FAFA50 /* YLoadingPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = AFA7D5671F4423FE00FAFA50 /* YLoadingPanel.m */; };
 		AFC94B491F1470C800D635BC /* LNRefreshComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = AFC94B471F1470C800D635BC /* LNRefreshComponent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AFC94B4A1F1470C800D635BC /* LNRefreshComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = AFC94B481F1470C800D635BC /* LNRefreshComponent.m */; };
 		AFC94B741F14CB5700D635BC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = AFC94B731F14CB5700D635BC /* main.m */; };
@@ -77,10 +79,6 @@
 /* Begin PBXFileReference section */
 		AF1F98FE1F1CAA660074E638 /* DemoVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoVC.h; sourceTree = "<group>"; };
 		AF1F98FF1F1CAA660074E638 /* DemoVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemoVC.m; sourceTree = "<group>"; };
-		AF1F99121F20779E0074E638 /* LNHeaderDIYAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNHeaderDIYAnimator.h; sourceTree = "<group>"; };
-		AF1F99131F20779E0074E638 /* LNHeaderDIYAnimator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNHeaderDIYAnimator.m; sourceTree = "<group>"; };
-		AF1F99161F20779E0074E638 /* YLoadingPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YLoadingPanel.h; sourceTree = "<group>"; };
-		AF1F99171F20779E0074E638 /* YLoadingPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YLoadingPanel.m; sourceTree = "<group>"; };
 		AF1F991C1F2077D80074E638 /* LNHeaderAnimator+Analysis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "LNHeaderAnimator+Analysis.h"; sourceTree = "<group>"; };
 		AF1F991D1F2077D80074E638 /* LNHeaderAnimator+Analysis.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "LNHeaderAnimator+Analysis.m"; sourceTree = "<group>"; };
 		AF29B5781F0C900300348F99 /* LNRefresh.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LNRefresh.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -96,6 +94,10 @@
 		AFA03C5D1F2734C000896ED8 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Main.strings"; sourceTree = "<group>"; };
 		AFA03C5E1F2734C100896ED8 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
 		AFA03C611F27546500896ED8 /* LNRefresh.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = LNRefresh.bundle; sourceTree = "<group>"; };
+		AFA7D5641F4423FE00FAFA50 /* LNHeaderDIYAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNHeaderDIYAnimator.h; sourceTree = "<group>"; };
+		AFA7D5651F4423FE00FAFA50 /* LNHeaderDIYAnimator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNHeaderDIYAnimator.m; sourceTree = "<group>"; };
+		AFA7D5661F4423FE00FAFA50 /* YLoadingPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YLoadingPanel.h; sourceTree = "<group>"; };
+		AFA7D5671F4423FE00FAFA50 /* YLoadingPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YLoadingPanel.m; sourceTree = "<group>"; };
 		AFC94B471F1470C800D635BC /* LNRefreshComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNRefreshComponent.h; sourceTree = "<group>"; };
 		AFC94B481F1470C800D635BC /* LNRefreshComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNRefreshComponent.m; sourceTree = "<group>"; };
 		AFC94B701F14CB5600D635BC /* LNRefreshDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LNRefreshDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -151,17 +153,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		AF1F99111F20779E0074E638 /* LNHeaderDIYAnimator */ = {
-			isa = PBXGroup;
-			children = (
-				AF1F99161F20779E0074E638 /* YLoadingPanel.h */,
-				AF1F99171F20779E0074E638 /* YLoadingPanel.m */,
-				AF1F99121F20779E0074E638 /* LNHeaderDIYAnimator.h */,
-				AF1F99131F20779E0074E638 /* LNHeaderDIYAnimator.m */,
-			);
-			path = LNHeaderDIYAnimator;
-			sourceTree = "<group>";
-		};
 		AF1F991B1F2077D80074E638 /* LNRefreshAnalysis */ = {
 			isa = PBXGroup;
 			children = (
@@ -204,6 +195,7 @@
 		AF29B5B71F0C9CCD00348F99 /* LNRefresh */ = {
 			isa = PBXGroup;
 			children = (
+				AFA7D5631F4423FE00FAFA50 /* LNHeaderDIYAnimator */,
 				AFC94B471F1470C800D635BC /* LNRefreshComponent.h */,
 				AFC94B481F1470C800D635BC /* LNRefreshComponent.m */,
 				AFC94BA31F14D0BE00D635BC /* LNRefreshAnimator.h */,
@@ -226,11 +218,21 @@
 			path = LNRefresh;
 			sourceTree = "<group>";
 		};
+		AFA7D5631F4423FE00FAFA50 /* LNHeaderDIYAnimator */ = {
+			isa = PBXGroup;
+			children = (
+				AFA7D5641F4423FE00FAFA50 /* LNHeaderDIYAnimator.h */,
+				AFA7D5651F4423FE00FAFA50 /* LNHeaderDIYAnimator.m */,
+				AFA7D5661F4423FE00FAFA50 /* YLoadingPanel.h */,
+				AFA7D5671F4423FE00FAFA50 /* YLoadingPanel.m */,
+			);
+			path = LNHeaderDIYAnimator;
+			sourceTree = "<group>";
+		};
 		AFC94B711F14CB5700D635BC /* LNRefreshDemo */ = {
 			isa = PBXGroup;
 			children = (
 				AF1F991B1F2077D80074E638 /* LNRefreshAnalysis */,
-				AF1F99111F20779E0074E638 /* LNHeaderDIYAnimator */,
 				AFC94BB61F16397600D635BC /* HomeVC.h */,
 				AFC94BB71F16397600D635BC /* HomeVC.m */,
 				AF1F98FE1F1CAA660074E638 /* DemoVC.h */,
@@ -272,7 +274,9 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AFA7D56A1F4423FE00FAFA50 /* YLoadingPanel.h in Headers */,
 				AF29B5891F0C900300348F99 /* LNRefresh.h in Headers */,
+				AFA7D5681F4423FE00FAFA50 /* LNHeaderDIYAnimator.h in Headers */,
 				AF6450E71F32C0B700DB8520 /* LNRefreshConst.h in Headers */,
 				AFEDEA141F220315003EBEA8 /* LNRefreshHandler.h in Headers */,
 				AFC94BA51F14D0BE00D635BC /* LNRefreshAnimator.h in Headers */,
@@ -441,6 +445,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AFA7D56B1F4423FE00FAFA50 /* YLoadingPanel.m in Sources */,
+				AFA7D5691F4423FE00FAFA50 /* LNHeaderDIYAnimator.m in Sources */,
 				AFC94BBC1F17209D00D635BC /* LNHeaderAnimator.m in Sources */,
 				AFC94BC01F1720B300D635BC /* LNFooterAnimator.m in Sources */,
 				AF29B5C51F0CC04600348F99 /* NSObject+LNRefresh.m in Sources */,
@@ -457,8 +463,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AF1F99181F20779E0074E638 /* LNHeaderDIYAnimator.m in Sources */,
-				AF1F991A1F20779E0074E638 /* YLoadingPanel.m in Sources */,
 				AFC94BB81F16397600D635BC /* HomeVC.m in Sources */,
 				AF1F991E1F2077D80074E638 /* LNHeaderAnimator+Analysis.m in Sources */,
 				AFC94B771F14CB5700D635BC /* AppDelegate.m in Sources */,

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/vvusu.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/vvusu.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...LNHeaderDIYAnimator/LNHeaderDIYAnimator.h → ...LNHeaderDIYAnimator/LNHeaderDIYAnimator.h b/...LNHeaderDIYAnimator/LNHeaderDIYAnimator.h → ...LNHeaderDIYAnimator/LNHeaderDIYAnimator.h
diff --git a/...LNHeaderDIYAnimator/LNHeaderDIYAnimator.m → ...LNHeaderDIYAnimator/LNHeaderDIYAnimator.m b/...LNHeaderDIYAnimator/LNHeaderDIYAnimator.m → ...LNHeaderDIYAnimator/LNHeaderDIYAnimator.m
diff --git a/...hDemo/LNHeaderDIYAnimator/YLoadingPanel.h → ...fresh/LNHeaderDIYAnimator/YLoadingPanel.h b/...hDemo/LNHeaderDIYAnimator/YLoadingPanel.h → ...fresh/LNHeaderDIYAnimator/YLoadingPanel.h
diff --git a/...hDemo/LNHeaderDIYAnimator/YLoadingPanel.m → ...fresh/LNHeaderDIYAnimator/YLoadingPanel.m b/...hDemo/LNHeaderDIYAnimator/YLoadingPanel.m → ...fresh/LNHeaderDIYAnimator/YLoadingPanel.m
diff --git a/LNRefresh/LNRefresh/NSObject+LNRefresh.h b/LNRefresh/LNRefresh/NSObject+LNRefresh.h
@@ -39,17 +39,81 @@
 @property (nonatomic, strong) LNRefreshHeader *ln_header;
 @property (nonatomic, strong) LNRefreshFooter *ln_footer;
 
+/**
+ 添加下拉刷新
+
+ @param block LNRefreshComponentBlock
+ @return LNRefreshHeader
+ */
 - (LNRefreshHeader *)addPullToRefresh:(LNRefreshComponentBlock)block;
+
+/**
+ 添加DIY下拉刷新
+
+ @param block LNRefreshComponentBlock
+ @return LNRefreshHeader
+ */
+- (LNRefreshHeader *)addPullToRefreshTypeDIY:(LNRefreshComponentBlock)block;
+
+/**
+ 加载自定义动画下拉刷新
+
+ @param animater 自定义动画 LNHeaderAnimator类
+ @param block LNRefreshComponentBlock
+ @return LNRefreshHeader
+ */
 - (LNRefreshHeader *)addPullToRefresh:(LNHeaderAnimator *)animater block:(LNRefreshComponentBlock)block;
+
+/**
+ 添加加载更多
+
+ @param block block
+ @return LNRefreshFooter
+ */
 - (LNRefreshFooter *)addInfiniteScrolling:(LNRefreshComponentBlock)block;
+
+/**
+ 添加自定义动画加载更多
+
+ @param animater 自定义动画 LNFooterAnimator类
+ @param block LNRefreshComponentBlock
+ @return LNRefreshFooter
+ */
 - (LNRefreshFooter *)addInfiniteScrolling:(LNFooterAnimator *)animater block:(LNRefreshComponentBlock)block;
 
+/**
+ 开始下拉刷新
+ */
 - (void)startRefreshing;
+
+/**
+ 结束下拉刷新
+ */
 - (void)endRefreshing;
+
+/**
+ 移除头部刷新控件
+ */
 - (void)removeRefreshHeader;
+
+/**
+ 移除尾部加载控件
+ */
 - (void)removeRefreshFooter;
+
+/**
+ 结束加载更多
+ */
 - (void)endLoadingMore;
+
+/**
+ 重置没有更多数据
+ */
 - (void)resetNoMoreData;
+
+/**
+ 提示没有更多数据
+ */
 - (void)noticeNoMoreData;
 @end
 
diff --git a/LNRefresh/LNRefresh/NSObject+LNRefresh.m b/LNRefresh/LNRefresh/NSObject+LNRefresh.m
@@ -171,6 +171,7 @@ - (CGFloat)ln_contentH {
 #import "LNRefreshFooter.h"
 #import "LNHeaderAnimator.h"
 #import "LNFooterAnimator.h"
+#import "LNHeaderDIYAnimator.h"
 #import <objc/runtime.h>
 
 static const char LNRefreshHeaderKey = '\0';
@@ -199,6 +200,11 @@ - (LNRefreshHeader *)addPullToRefresh:(LNRefreshComponentBlock)block {
     return [self addPullToRefresh:[[LNHeaderAnimator alloc] init] block:block];
 }
 
+//WSCN
+- (LNRefreshHeader *)addPullToRefreshTypeDIY:(LNRefreshComponentBlock)block {
+    return [self addPullToRefresh:[LNHeaderDIYAnimator createAnimator] block:block];
+}
+
 - (LNRefreshHeader *)addPullToRefresh:(LNHeaderAnimator *)animater block:(LNRefreshComponentBlock)block {
     if (!self.ln_header) {
         LNRefreshHeader *header = [LNRefreshHeader initWithFrame:CGRectZero animator:animater block:block];

diff --git a/LNRefreshDemo/DemoVC.m b/LNRefreshDemo/DemoVC.m
@@ -180,7 +180,7 @@ - (void)createTableView {
             [headerAnimator setImages:idleImages forState:LNRefreshState_Refreshing];
         }
     } else {  // 自定义刷新动画
-        [self.tableView addPullToRefresh:[LNHeaderDIYAnimator createAnimator] block:^{
+        [self.tableView addPullToRefreshTypeDIY:^{
             [wself pullToRefresh];
         }];
 //        self.tableView.ln_header.animator.trigger = 100;