@@ -11,40 +11,20 @@ import ObjectiveC
1111
1212extension UIScrollView {
1313
14- override open func willMove( toSuperview newSuperview: UIView ? ) {
15- super. willMove ( toSuperview: newSuperview)
16- // print("table willMove toSuperview \(newSuperview)")
17- if newSuperview == nil {
18- self . gtmHeader? . observerOpen = false
19- self . gtmFooter? . observerOpen = false
20-
21- self . gtmHeader = nil
22- self . gtmFooter = nil
23- }
24- }
25-
26- private var gtmHeader : GTMRefreshHeader ? {
14+ internal var gtmHeader : GTMRefreshHeader ? {
2715 get {
2816 return objc_getAssociatedObject ( self , & GTMRefreshConstant. associatedObjectGtmHeader) as? GTMRefreshHeader
2917 }
3018 set {
31- if newValue == nil {
32- objc_removeAssociatedObjects ( gtmHeader)
33- } else {
34- objc_setAssociatedObject ( self , & GTMRefreshConstant. associatedObjectGtmHeader, newValue, objc_AssociationPolicy. OBJC_ASSOCIATION_RETAIN_NONATOMIC)
35- }
19+ objc_setAssociatedObject ( self , & GTMRefreshConstant. associatedObjectGtmHeader, newValue, objc_AssociationPolicy. OBJC_ASSOCIATION_RETAIN_NONATOMIC)
3620 }
3721 }
38- private var gtmFooter : GTMLoadMoreFooter ? {
22+ internal var gtmFooter : GTMLoadMoreFooter ? {
3923 get {
4024 return objc_getAssociatedObject ( self , & GTMRefreshConstant. associatedObjectGtmFooter) as? GTMLoadMoreFooter
4125 }
4226 set {
43- if newValue == nil {
44- objc_removeAssociatedObjects ( gtmFooter)
45- } else {
46- objc_setAssociatedObject ( self , & GTMRefreshConstant. associatedObjectGtmFooter, newValue, objc_AssociationPolicy. OBJC_ASSOCIATION_RETAIN_NONATOMIC)
47- }
27+ objc_setAssociatedObject ( self , & GTMRefreshConstant. associatedObjectGtmFooter, newValue, objc_AssociationPolicy. OBJC_ASSOCIATION_RETAIN_NONATOMIC)
4828 }
4929 }
5030
@@ -54,7 +34,7 @@ extension UIScrollView {
5434 /// - refreshHeader: 下拉刷新动效View必须继承GTMRefreshHeader并且要实现SubGTMRefreshHeaderProtocol，不传值的时候默认使用 DefaultGTMRefreshHeader
5535 /// - refreshBlock: 刷新数据Block
5636 @discardableResult
57- final public func gtm_addRefreshHeaderView( refreshHeader: GTMRefreshHeader ? = DefaultGTMRefreshHeader ( ) , delegate : GTMRefreshHeaderDelegate ? ) -> UIScrollView {
37+ final public func gtm_addRefreshHeaderView( refreshHeader: GTMRefreshHeader ? = DefaultGTMRefreshHeader ( ) , refreshBlock : @escaping ( ) -> Void ) -> UIScrollView {
5838 guard refreshHeader is SubGTMRefreshHeaderProtocol else {
5939 fatalError ( " refreshHeader must implement SubGTMRefreshHeaderProtocol " )
6040 }
@@ -65,49 +45,23 @@ extension UIScrollView {
6545 gtmHeader? . removeFromSuperview ( )
6646
6747 if let header: GTMRefreshHeader = refreshHeader {
68- // header.refreshBlock = refreshBlock
69- header. delegate = delegate
48+ header. refreshBlock = refreshBlock
7049 self . insertSubview ( header, at: 0 )
7150 self . gtmHeader = header
7251 }
7352 }
7453 return self
7554 }
7655
77- // 自定义header文字
78- final public func setupHeaderText( pullDownToRefreshText: String ? = nil ,
79- releaseToRefreshText: String ? = nil ,
80- refreshSuccessText: String ? = nil ,
81- refreshFailureText: String ? = nil ,
82- refreshingText: String ? = nil ) {
83- guard let defaultFooter = self . gtmHeader, defaultFooter is DefaultGTMRefreshHeader else {
84- return
85- }
86- let header = defaultFooter as! DefaultGTMRefreshHeader
87- if let txt = pullDownToRefreshText {
88- header. pullDownToRefresh = txt
89- }
90- if let txt = releaseToRefreshText {
91- header. releaseToRefresh = txt
92- }
93- if let txt = refreshSuccessText {
94- header. refreshSuccess = txt
95- }
96- if let txt = refreshFailureText {
97- header. refreshFailure = txt
98- }
99- if let txt = refreshingText {
100- header. refreshing = txt
101- }
102- }
56+
10357
10458 /// 添加上拉加载
10559 ///
10660 /// - Parameters:
10761 /// - loadMoreFooter: 上拉加载动效View必须继承GTMLoadMoreFooter，不传值的时候默认使用 DefaultGTMLoadMoreFooter
10862 /// - refreshBlock: 加载更多数据Block
10963 @discardableResult
110- final public func gtm_addLoadMoreFooterView( loadMoreFooter: GTMLoadMoreFooter ? = DefaultGTMLoadMoreFooter ( ) , delegate : GTMLoadMoreFooterDelegate ? ) -> UIScrollView {
64+ final public func gtm_addLoadMoreFooterView( loadMoreFooter: GTMLoadMoreFooter ? = DefaultGTMLoadMoreFooter ( ) , loadMoreBlock : @escaping ( ) -> Void ) -> UIScrollView {
11165
11266 guard loadMoreFooter is SubGTMLoadMoreFooterProtocol else {
11367 fatalError ( " loadMoreFooter must implement SubGTMLoadMoreFooterProtocol " )
@@ -120,39 +74,14 @@ extension UIScrollView {
12074 gtmFooter? . removeFromSuperview ( )
12175
12276 if let footer: GTMLoadMoreFooter = loadMoreFooter {
123- // footer.loadMoreBlock = loadMoreBlock
124- footer. delegate = delegate
77+ footer. loadMoreBlock = loadMoreBlock
12578 self . insertSubview ( footer, at: 0 )
12679 self . gtmFooter = footer
12780 }
12881 }
12982 return self
13083 }
13184
132- // 自定义footer文字
133- final public func setupFooterText( pullUpToRefreshText: String ? = nil ,
134- loaddingText: String ? = nil ,
135- noMoreDataText: String ? = nil ,
136- releaseLoadMoreText: String ? = nil ) {
137- guard let defaultFooter = self . gtmFooter, defaultFooter is DefaultGTMLoadMoreFooter else {
138- return
139- }
140- let footer = defaultFooter as! DefaultGTMLoadMoreFooter
141- if let txt = pullUpToRefreshText {
142- footer. pullUpToRefreshText = txt
143- footer. messageLabel. text = txt
144- }
145- if let txt = loaddingText {
146- footer. loaddingText = txt
147- }
148- if let txt = noMoreDataText {
149- footer. noMoreDataText = txt
150- }
151- if let txt = releaseLoadMoreText {
152- footer. releaseLoadMoreText = txt
153- }
154- }
155-
15685 final public func triggerRefreshing( ) {
15786 self . gtmHeader? . autoRefreshing ( )
15887 }
0 commit comments