From d3a8e599929fce168831e563ccd7f982efaf4605 Mon Sep 17 00:00:00 2001 From: ZeroJ Date: Mon, 5 Sep 2016 12:38:42 +0800 Subject: [PATCH 1/8] readme --- LICENSE | 0 README.md | 3 +- ScrollPageView.podspec | 0 ScrollPageView/ContentView.swift | 0 ScrollPageView/ScrollPageView.swift | 0 ScrollPageView/ScrollSegmentView.swift | 0 ScrollPageView/SegmentStyle.swift | 0 .../project.pbxproj | 92 ++-- .../contents.xcworkspacedata | 0 .../xcdebugger/Breakpoints_v2.xcbkptlist | 0 .../xcschemes/ScrollViewController.xcscheme | 0 .../xcschemes/xcschememanagement.plist | 0 .../xcdebugger/Breakpoints_v2.xcbkptlist | 5 + .../xcschemes/ScrollViewController.xcscheme | 111 +++++ .../xcschemes/xcschememanagement.plist | 32 ++ .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../Contents.json | 0 .../channel_grid_circle@2x.png | Bin .../delete.imageset/Contents.json | 0 .../delete.imageset/delete.png | Bin .../Contents.json | 0 .../extraBtnBackgroundImage.imageset/plus.png | Bin .../fruit.imageset/Contents.json | 0 .../fruit.imageset/Snip20160420_15.png | Bin .../test.imageset/Contents.json | 0 .../test.imageset/Snip20160413_1.png | Bin .../Base.lproj/LaunchScreen.storyboard | 0 .../Base.lproj/Main.storyboard | 60 +-- ScrollViewController/ExtraView.swift | 0 ScrollViewController/ExtraView.xib | 0 ScrollViewController/Info.plist | 0 .../RefreshView/GifAnimator.swift | 283 ++++++++++++ .../RefreshView/NormalAnimator.swift | 212 +++++++++ .../RefreshView/NormalAnimator.xib | 67 +++ .../RefreshView/RefreshView.swift | 421 ++++++++++++++++++ .../UIScrollView+RefreshView.swift | 74 +++ .../ScrollPageView/ContentView.swift | 0 .../ScrollPageView/ScrollPageView.swift | 0 .../ScrollPageView/ScrollSegmentView.swift | 0 .../ScrollPageView/SegmentStyle.swift | 0 .../UIViewControllerExtension.swift | 0 .../SelectionCollectionViewCell.swift | 0 .../SelectionCollectionViewCell.xib | 0 ScrollViewController/SelectionView.swift | 0 ScrollViewController/Vc10Controller.swift | 0 ScrollViewController/Vc11Controller.swift | 274 ------------ ScrollViewController/other/AppDelegate.swift | 0 .../other/TestController.swift | 0 .../other/TestSelectedIndexController.swift | 0 .../other/ViewController.swift | 0 .../Vc9Controller.swift" | 0 .../Vc8Controller.swift" | 310 ------------- .../PageCollectionViewController.swift" | 47 ++ .../PageTableViewController.swift" | 63 +-- .../PageViewController.swift" | 23 + .../Vc7Controller.swift" | 153 ++++--- .../Vc5Controller.swift" | 0 .../Vc3Controller.swift" | 0 .../vc1Controller.swift" | 0 .../Vc6Controller.swift" | 0 .../Vc4Controller.swift" | 0 .../Vc2Controller.swift" | 0 ScrollViewControllerTests/Info.plist | 0 .../ScrollViewControllerTests.swift | 0 ScrollViewControllerUITests/Info.plist | 0 .../ScrollViewControllerUITests.swift | 0 67 files changed, 1444 insertions(+), 786 deletions(-) mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 ScrollPageView.podspec mode change 100644 => 100755 ScrollPageView/ContentView.swift mode change 100644 => 100755 ScrollPageView/ScrollPageView.swift mode change 100644 => 100755 ScrollPageView/ScrollSegmentView.swift mode change 100644 => 100755 ScrollPageView/SegmentStyle.swift mode change 100644 => 100755 ScrollViewController.xcodeproj/project.pbxproj mode change 100644 => 100755 ScrollViewController.xcodeproj/project.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist mode change 100644 => 100755 ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcschemes/ScrollViewController.xcscheme mode change 100644 => 100755 ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist create mode 100644 ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcschemes/ScrollViewController.xcscheme create mode 100644 ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcschemes/xcschememanagement.plist mode change 100644 => 100755 ScrollViewController/Assets.xcassets/AppIcon.appiconset/Contents.json mode change 100644 => 100755 ScrollViewController/Assets.xcassets/Contents.json mode change 100644 => 100755 ScrollViewController/Assets.xcassets/channel_grid_circle.imageset/Contents.json mode change 100644 => 100755 ScrollViewController/Assets.xcassets/channel_grid_circle.imageset/channel_grid_circle@2x.png mode change 100644 => 100755 ScrollViewController/Assets.xcassets/delete.imageset/Contents.json mode change 100644 => 100755 ScrollViewController/Assets.xcassets/delete.imageset/delete.png mode change 100644 => 100755 ScrollViewController/Assets.xcassets/extraBtnBackgroundImage.imageset/Contents.json mode change 100644 => 100755 ScrollViewController/Assets.xcassets/extraBtnBackgroundImage.imageset/plus.png mode change 100644 => 100755 ScrollViewController/Assets.xcassets/fruit.imageset/Contents.json mode change 100644 => 100755 ScrollViewController/Assets.xcassets/fruit.imageset/Snip20160420_15.png mode change 100644 => 100755 ScrollViewController/Assets.xcassets/test.imageset/Contents.json mode change 100644 => 100755 ScrollViewController/Assets.xcassets/test.imageset/Snip20160413_1.png mode change 100644 => 100755 ScrollViewController/Base.lproj/LaunchScreen.storyboard mode change 100644 => 100755 ScrollViewController/Base.lproj/Main.storyboard mode change 100644 => 100755 ScrollViewController/ExtraView.swift mode change 100644 => 100755 ScrollViewController/ExtraView.xib mode change 100644 => 100755 ScrollViewController/Info.plist create mode 100644 ScrollViewController/RefreshView/GifAnimator.swift create mode 100644 ScrollViewController/RefreshView/NormalAnimator.swift create mode 100644 ScrollViewController/RefreshView/NormalAnimator.xib create mode 100644 ScrollViewController/RefreshView/RefreshView.swift create mode 100644 ScrollViewController/RefreshView/UIScrollView+RefreshView.swift mode change 100644 => 100755 ScrollViewController/ScrollPageView/ContentView.swift mode change 100644 => 100755 ScrollViewController/ScrollPageView/ScrollPageView.swift mode change 100644 => 100755 ScrollViewController/ScrollPageView/ScrollSegmentView.swift mode change 100644 => 100755 ScrollViewController/ScrollPageView/SegmentStyle.swift mode change 100644 => 100755 ScrollViewController/ScrollPageView/UIViewControllerExtension.swift mode change 100644 => 100755 ScrollViewController/SelectionCollectionViewCell.swift mode change 100644 => 100755 ScrollViewController/SelectionCollectionViewCell.xib mode change 100644 => 100755 ScrollViewController/SelectionView.swift mode change 100644 => 100755 ScrollViewController/Vc10Controller.swift delete mode 100644 ScrollViewController/Vc11Controller.swift mode change 100644 => 100755 ScrollViewController/other/AppDelegate.swift mode change 100644 => 100755 ScrollViewController/other/TestController.swift rename "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/TestSelectedIndexController.swift" => ScrollViewController/other/TestSelectedIndexController.swift (100%) mode change 100644 => 100755 mode change 100644 => 100755 ScrollViewController/other/ViewController.swift mode change 100644 => 100755 "ScrollViewController/\345\217\257\344\273\245\345\234\250\345\210\235\345\247\213\345\214\226\346\210\226\350\200\205\350\277\224\345\233\236\351\241\265\351\235\242\347\232\204\346\227\266\345\200\231\350\256\276\347\275\256\345\275\223\345\211\215\351\241\265\344\270\272\345\205\266\344\273\226\351\241\265/Vc9Controller.swift" delete mode 100644 "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/Vc8Controller.swift" create mode 100644 "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageCollectionViewController.swift" rename "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/PageTableViewController.swift" => "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageTableViewController.swift" (57%) mode change 100644 => 100755 create mode 100644 "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageViewController.swift" rename "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\270\215\344\275\277\347\224\250TableView)/Vc7Controller.swift" => "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/Vc7Controller.swift" (67%) mode change 100644 => 100755 mode change 100644 => 100755 "ScrollViewController/\346\240\207\351\242\230\344\270\215\346\273\232\345\212\250+\351\201\256\347\233\226+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc5Controller.swift" mode change 100644 => 100755 "ScrollViewController/\346\273\232\345\212\250\346\235\241+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc3Controller.swift" mode change 100644 => 100755 "ScrollViewController/\347\274\251\346\224\276+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/vc1Controller.swift" mode change 100644 => 100755 "ScrollViewController/\350\207\252\345\256\232\344\271\211segmentView\345\222\214contentView\344\275\215\347\275\256\347\232\204\346\225\210\346\236\234)/Vc6Controller.swift" mode change 100644 => 100755 "ScrollViewController/\351\201\256\347\233\226+\347\274\251\346\224\276+\346\262\241\346\234\211\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc4Controller.swift" mode change 100644 => 100755 "ScrollViewController/\351\201\256\347\233\226+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc2Controller.swift" mode change 100644 => 100755 ScrollViewControllerTests/Info.plist mode change 100644 => 100755 ScrollViewControllerTests/ScrollViewControllerTests.swift mode change 100644 => 100755 ScrollViewControllerUITests/Info.plist mode change 100644 => 100755 ScrollViewControllerUITests/ScrollViewControllerUITests.swift diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 8332c01..7a0540a --- a/README.md +++ b/README.md @@ -242,8 +242,7 @@ pod 'ScrollPageView', '~> 0.1.4' scrollPageView.reloadChildVcsWithNewTitles(newTitles, andNewChildVcs: newChildVcs) -###如果您在使用过程中遇到问题, 请联系我 -####QQ:854136959 邮箱: 854136959@qq.com + ####如果对您有帮助,请随手给个star鼓励一下 ## License diff --git a/ScrollPageView.podspec b/ScrollPageView.podspec old mode 100644 new mode 100755 diff --git a/ScrollPageView/ContentView.swift b/ScrollPageView/ContentView.swift old mode 100644 new mode 100755 diff --git a/ScrollPageView/ScrollPageView.swift b/ScrollPageView/ScrollPageView.swift old mode 100644 new mode 100755 diff --git a/ScrollPageView/ScrollSegmentView.swift b/ScrollPageView/ScrollSegmentView.swift old mode 100644 new mode 100755 diff --git a/ScrollPageView/SegmentStyle.swift b/ScrollPageView/SegmentStyle.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController.xcodeproj/project.pbxproj b/ScrollViewController.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index f0c0eb7..880172f --- a/ScrollViewController.xcodeproj/project.pbxproj +++ b/ScrollViewController.xcodeproj/project.pbxproj @@ -7,6 +7,16 @@ objects = { /* Begin PBXBuildFile section */ + 4A1DDE071D76702C006F4C69 /* PageCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE041D76702C006F4C69 /* PageCollectionViewController.swift */; }; + 4A1DDE081D76702C006F4C69 /* PageTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE051D76702C006F4C69 /* PageTableViewController.swift */; }; + 4A1DDE091D76702C006F4C69 /* Vc7Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE061D76702C006F4C69 /* Vc7Controller.swift */; }; + 4A1DDE0B1D76706D006F4C69 /* TestSelectedIndexController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE0A1D76706D006F4C69 /* TestSelectedIndexController.swift */; }; + 4A1DDE0D1D7671B1006F4C69 /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE0C1D7671B1006F4C69 /* PageViewController.swift */; }; + 4A1DDE141D76722B006F4C69 /* GifAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE0F1D76722B006F4C69 /* GifAnimator.swift */; }; + 4A1DDE151D76722B006F4C69 /* NormalAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE101D76722B006F4C69 /* NormalAnimator.swift */; }; + 4A1DDE161D76722B006F4C69 /* NormalAnimator.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4A1DDE111D76722B006F4C69 /* NormalAnimator.xib */; }; + 4A1DDE171D76722B006F4C69 /* RefreshView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE121D76722B006F4C69 /* RefreshView.swift */; }; + 4A1DDE181D76722B006F4C69 /* UIScrollView+RefreshView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A1DDE131D76722B006F4C69 /* UIScrollView+RefreshView.swift */; }; 4B0C48511CD3000300B47FE3 /* Vc10Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0C48501CD3000300B47FE3 /* Vc10Controller.swift */; }; 4B0C48541CD31AB000B47FE3 /* SelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0C48531CD31AB000B47FE3 /* SelectionView.swift */; }; 4B0DD6FB1CB49EEC00439631 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B0DD6F91CB49EEC00439631 /* Main.storyboard */; }; @@ -23,15 +33,10 @@ 4B494B851CCF760A00B23680 /* ScrollSegmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B494B811CCF760A00B23680 /* ScrollSegmentView.swift */; }; 4B494B861CCF760A00B23680 /* SegmentStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B494B821CCF760A00B23680 /* SegmentStyle.swift */; }; 4B56CB9B1D06DB1F00D58BFA /* UIViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B56CB9A1D06DB1F00D58BFA /* UIViewControllerExtension.swift */; }; - 4BEB43491CFE817700F1B6F7 /* Vc11Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BEB43481CFE817700F1B6F7 /* Vc11Controller.swift */; }; 4BF37F131CCE5110005FBCDC /* Vc5Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37EF71CCE5110005FBCDC /* Vc5Controller.swift */; }; 4BF37F141CCE5110005FBCDC /* Vc3Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37EF91CCE5110005FBCDC /* Vc3Controller.swift */; }; 4BF37F151CCE5110005FBCDC /* Vc9Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37EFB1CCE5110005FBCDC /* Vc9Controller.swift */; }; 4BF37F161CCE5110005FBCDC /* vc1Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37EFD1CCE5110005FBCDC /* vc1Controller.swift */; }; - 4BF37F171CCE5110005FBCDC /* Vc7Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37EFF1CCE5110005FBCDC /* Vc7Controller.swift */; }; - 4BF37F181CCE5110005FBCDC /* PageTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37F011CCE5110005FBCDC /* PageTableViewController.swift */; }; - 4BF37F191CCE5110005FBCDC /* TestSelectedIndexController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37F021CCE5110005FBCDC /* TestSelectedIndexController.swift */; }; - 4BF37F1A1CCE5110005FBCDC /* Vc8Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37F031CCE5110005FBCDC /* Vc8Controller.swift */; }; 4BF37F1B1CCE5110005FBCDC /* Vc4Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37F051CCE5110005FBCDC /* Vc4Controller.swift */; }; 4BF37F1C1CCE5110005FBCDC /* Vc2Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37F071CCE5110005FBCDC /* Vc2Controller.swift */; }; 4BF37F1D1CCE5110005FBCDC /* Vc6Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF37F091CCE5110005FBCDC /* Vc6Controller.swift */; }; @@ -58,6 +63,16 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 4A1DDE041D76702C006F4C69 /* PageCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageCollectionViewController.swift; sourceTree = ""; }; + 4A1DDE051D76702C006F4C69 /* PageTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageTableViewController.swift; sourceTree = ""; }; + 4A1DDE061D76702C006F4C69 /* Vc7Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc7Controller.swift; sourceTree = ""; }; + 4A1DDE0A1D76706D006F4C69 /* TestSelectedIndexController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSelectedIndexController.swift; sourceTree = ""; }; + 4A1DDE0C1D7671B1006F4C69 /* PageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageViewController.swift; sourceTree = ""; }; + 4A1DDE0F1D76722B006F4C69 /* GifAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GifAnimator.swift; sourceTree = ""; }; + 4A1DDE101D76722B006F4C69 /* NormalAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NormalAnimator.swift; sourceTree = ""; }; + 4A1DDE111D76722B006F4C69 /* NormalAnimator.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NormalAnimator.xib; sourceTree = ""; }; + 4A1DDE121D76722B006F4C69 /* RefreshView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshView.swift; sourceTree = ""; }; + 4A1DDE131D76722B006F4C69 /* UIScrollView+RefreshView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIScrollView+RefreshView.swift"; sourceTree = ""; }; 4B0C48501CD3000300B47FE3 /* Vc10Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc10Controller.swift; sourceTree = ""; }; 4B0C48531CD31AB000B47FE3 /* SelectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectionView.swift; sourceTree = ""; }; 4B0DD6F21CB49EEC00439631 /* ScrollViewController.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScrollViewController.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -80,15 +95,10 @@ 4B494B811CCF760A00B23680 /* ScrollSegmentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollSegmentView.swift; sourceTree = ""; }; 4B494B821CCF760A00B23680 /* SegmentStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SegmentStyle.swift; sourceTree = ""; }; 4B56CB9A1D06DB1F00D58BFA /* UIViewControllerExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewControllerExtension.swift; sourceTree = ""; }; - 4BEB43481CFE817700F1B6F7 /* Vc11Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc11Controller.swift; sourceTree = ""; }; 4BF37EF71CCE5110005FBCDC /* Vc5Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc5Controller.swift; sourceTree = ""; }; 4BF37EF91CCE5110005FBCDC /* Vc3Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc3Controller.swift; sourceTree = ""; }; 4BF37EFB1CCE5110005FBCDC /* Vc9Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc9Controller.swift; sourceTree = ""; }; 4BF37EFD1CCE5110005FBCDC /* vc1Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = vc1Controller.swift; sourceTree = ""; }; - 4BF37EFF1CCE5110005FBCDC /* Vc7Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc7Controller.swift; sourceTree = ""; }; - 4BF37F011CCE5110005FBCDC /* PageTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageTableViewController.swift; sourceTree = ""; }; - 4BF37F021CCE5110005FBCDC /* TestSelectedIndexController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestSelectedIndexController.swift; sourceTree = ""; }; - 4BF37F031CCE5110005FBCDC /* Vc8Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc8Controller.swift; sourceTree = ""; }; 4BF37F051CCE5110005FBCDC /* Vc4Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc4Controller.swift; sourceTree = ""; }; 4BF37F071CCE5110005FBCDC /* Vc2Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc2Controller.swift; sourceTree = ""; }; 4BF37F091CCE5110005FBCDC /* Vc6Controller.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Vc6Controller.swift; sourceTree = ""; }; @@ -122,6 +132,29 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 4A1DDE031D76702C006F4C69 /* 有headView的效果(简书个人页面,使用TableView, collectionView) */ = { + isa = PBXGroup; + children = ( + 4A1DDE041D76702C006F4C69 /* PageCollectionViewController.swift */, + 4A1DDE051D76702C006F4C69 /* PageTableViewController.swift */, + 4A1DDE0C1D7671B1006F4C69 /* PageViewController.swift */, + 4A1DDE061D76702C006F4C69 /* Vc7Controller.swift */, + ); + path = "有headView的效果(简书个人页面,使用TableView, collectionView)"; + sourceTree = ""; + }; + 4A1DDE0E1D76722B006F4C69 /* RefreshView */ = { + isa = PBXGroup; + children = ( + 4A1DDE0F1D76722B006F4C69 /* GifAnimator.swift */, + 4A1DDE101D76722B006F4C69 /* NormalAnimator.swift */, + 4A1DDE111D76722B006F4C69 /* NormalAnimator.xib */, + 4A1DDE121D76722B006F4C69 /* RefreshView.swift */, + 4A1DDE131D76722B006F4C69 /* UIScrollView+RefreshView.swift */, + ); + path = RefreshView; + sourceTree = ""; + }; 4B0C48521CD3001300B47FE3 /* 类似网易新闻的动态修改tag和内容 */ = { isa = PBXGroup; children = ( @@ -230,24 +263,6 @@ path = "缩放+颜色渐变 效果"; sourceTree = ""; }; - 4BF37EFE1CCE5110005FBCDC /* 有headView的效果(简书个人页面,不使用TableView) */ = { - isa = PBXGroup; - children = ( - 4BF37EFF1CCE5110005FBCDC /* Vc7Controller.swift */, - ); - path = "有headView的效果(简书个人页面,不使用TableView)"; - sourceTree = ""; - }; - 4BF37F001CCE5110005FBCDC /* 有headView的效果(简书个人页面,使用TableView) */ = { - isa = PBXGroup; - children = ( - 4BF37F011CCE5110005FBCDC /* PageTableViewController.swift */, - 4BF37F021CCE5110005FBCDC /* TestSelectedIndexController.swift */, - 4BF37F031CCE5110005FBCDC /* Vc8Controller.swift */, - ); - path = "有headView的效果(简书个人页面,使用TableView)"; - sourceTree = ""; - }; 4BF37F041CCE5110005FBCDC /* 遮盖+缩放+没有颜色渐变 效果 */ = { isa = PBXGroup; children = ( @@ -277,6 +292,7 @@ children = ( 4BF37F0B1CCE5110005FBCDC /* AppDelegate.swift */, 4BF37F0C1CCE5110005FBCDC /* TestController.swift */, + 4A1DDE0A1D76706D006F4C69 /* TestSelectedIndexController.swift */, 4BF37F0D1CCE5110005FBCDC /* ViewController.swift */, ); path = other; @@ -285,6 +301,7 @@ 4BF37F251CCE52FA005FBCDC /* Example */ = { isa = PBXGroup; children = ( + 4A1DDE0E1D76722B006F4C69 /* RefreshView */, 4B494B7E1CCF760A00B23680 /* ScrollPageView */, 4BF37EFC1CCE5110005FBCDC /* 缩放+颜色渐变 效果 */, 4BF37F061CCE5110005FBCDC /* 遮盖+颜色渐变 效果 */, @@ -292,11 +309,9 @@ 4BF37F041CCE5110005FBCDC /* 遮盖+缩放+没有颜色渐变 效果 */, 4BF37EF61CCE5110005FBCDC /* 标题不滚动+遮盖+颜色渐变 效果 */, 4BF37F081CCE5110005FBCDC /* 自定义segmentView和contentView位置的效果) */, - 4BF37EFE1CCE5110005FBCDC /* 有headView的效果(简书个人页面,不使用TableView) */, - 4BF37F001CCE5110005FBCDC /* 有headView的效果(简书个人页面,使用TableView) */, + 4A1DDE031D76702C006F4C69 /* 有headView的效果(简书个人页面,使用TableView, collectionView) */, 4BF37EFA1CCE5110005FBCDC /* 可以在初始化或者返回页面的时候设置当前页为其他页 */, 4B0C48521CD3001300B47FE3 /* 类似网易新闻的动态修改tag和内容 */, - 4BEB43481CFE817700F1B6F7 /* Vc11Controller.swift */, ); name = Example; sourceTree = ""; @@ -411,6 +426,7 @@ 4B0F5B461CD6127300960670 /* ExtraView.xib in Resources */, 4B0DD6FB1CB49EEC00439631 /* Main.storyboard in Resources */, 4B0F5B481CD71E8300960670 /* Assets.xcassets in Resources */, + 4A1DDE161D76722B006F4C69 /* NormalAnimator.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -438,26 +454,30 @@ 4BF37F1E1CCE5110005FBCDC /* AppDelegate.swift in Sources */, 4B0F5B411CD5B3BF00960670 /* SelectionCollectionViewCell.swift in Sources */, 4B494B861CCF760A00B23680 /* SegmentStyle.swift in Sources */, - 4BF37F191CCE5110005FBCDC /* TestSelectedIndexController.swift in Sources */, 4BF37F161CCE5110005FBCDC /* vc1Controller.swift in Sources */, 4BF37F1B1CCE5110005FBCDC /* Vc4Controller.swift in Sources */, + 4A1DDE071D76702C006F4C69 /* PageCollectionViewController.swift in Sources */, + 4A1DDE091D76702C006F4C69 /* Vc7Controller.swift in Sources */, + 4A1DDE141D76722B006F4C69 /* GifAnimator.swift in Sources */, 4BF37F201CCE5110005FBCDC /* ViewController.swift in Sources */, 4BF37F141CCE5110005FBCDC /* Vc3Controller.swift in Sources */, 4B494B841CCF760A00B23680 /* ScrollPageView.swift in Sources */, + 4A1DDE151D76722B006F4C69 /* NormalAnimator.swift in Sources */, 4B494B851CCF760A00B23680 /* ScrollSegmentView.swift in Sources */, 4BF37F1D1CCE5110005FBCDC /* Vc6Controller.swift in Sources */, - 4BEB43491CFE817700F1B6F7 /* Vc11Controller.swift in Sources */, + 4A1DDE181D76722B006F4C69 /* UIScrollView+RefreshView.swift in Sources */, 4B0C48541CD31AB000B47FE3 /* SelectionView.swift in Sources */, 4B0F5B441CD6126200960670 /* ExtraView.swift in Sources */, - 4BF37F1A1CCE5110005FBCDC /* Vc8Controller.swift in Sources */, - 4BF37F181CCE5110005FBCDC /* PageTableViewController.swift in Sources */, 4BF37F1F1CCE5110005FBCDC /* TestController.swift in Sources */, + 4A1DDE0D1D7671B1006F4C69 /* PageViewController.swift in Sources */, 4BF37F151CCE5110005FBCDC /* Vc9Controller.swift in Sources */, + 4A1DDE0B1D76706D006F4C69 /* TestSelectedIndexController.swift in Sources */, 4B0C48511CD3000300B47FE3 /* Vc10Controller.swift in Sources */, 4B494B831CCF760A00B23680 /* ContentView.swift in Sources */, + 4A1DDE081D76702C006F4C69 /* PageTableViewController.swift in Sources */, 4B56CB9B1D06DB1F00D58BFA /* UIViewControllerExtension.swift in Sources */, + 4A1DDE171D76722B006F4C69 /* RefreshView.swift in Sources */, 4BF37F1C1CCE5110005FBCDC /* Vc2Controller.swift in Sources */, - 4BF37F171CCE5110005FBCDC /* Vc7Controller.swift in Sources */, 4BF37F131CCE5110005FBCDC /* Vc5Controller.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ScrollViewController.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ScrollViewController.xcodeproj/project.xcworkspace/contents.xcworkspacedata old mode 100644 new mode 100755 diff --git a/ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist old mode 100644 new mode 100755 diff --git a/ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcschemes/ScrollViewController.xcscheme b/ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcschemes/ScrollViewController.xcscheme old mode 100644 new mode 100755 diff --git a/ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcschemes/xcschememanagement.plist b/ScrollViewController.xcodeproj/xcuserdata/jasnig.xcuserdatad/xcschemes/xcschememanagement.plist old mode 100644 new mode 100755 diff --git a/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..fe2b454 --- /dev/null +++ b/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,5 @@ + + + diff --git a/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcschemes/ScrollViewController.xcscheme b/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcschemes/ScrollViewController.xcscheme new file mode 100644 index 0000000..3315c4f --- /dev/null +++ b/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcschemes/ScrollViewController.xcscheme @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcschemes/xcschememanagement.plist b/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..d4e828b --- /dev/null +++ b/ScrollViewController.xcodeproj/xcuserdata/zeroj.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,32 @@ + + + + + SchemeUserState + + ScrollViewController.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 4B0DD6F11CB49EEC00439631 + + primary + + + 4B0DD7051CB49EEC00439631 + + primary + + + 4B0DD7101CB49EEC00439631 + + primary + + + + + diff --git a/ScrollViewController/Assets.xcassets/AppIcon.appiconset/Contents.json b/ScrollViewController/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/Contents.json b/ScrollViewController/Assets.xcassets/Contents.json old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/channel_grid_circle.imageset/Contents.json b/ScrollViewController/Assets.xcassets/channel_grid_circle.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/channel_grid_circle.imageset/channel_grid_circle@2x.png b/ScrollViewController/Assets.xcassets/channel_grid_circle.imageset/channel_grid_circle@2x.png old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/delete.imageset/Contents.json b/ScrollViewController/Assets.xcassets/delete.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/delete.imageset/delete.png b/ScrollViewController/Assets.xcassets/delete.imageset/delete.png old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/extraBtnBackgroundImage.imageset/Contents.json b/ScrollViewController/Assets.xcassets/extraBtnBackgroundImage.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/extraBtnBackgroundImage.imageset/plus.png b/ScrollViewController/Assets.xcassets/extraBtnBackgroundImage.imageset/plus.png old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/fruit.imageset/Contents.json b/ScrollViewController/Assets.xcassets/fruit.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/fruit.imageset/Snip20160420_15.png b/ScrollViewController/Assets.xcassets/fruit.imageset/Snip20160420_15.png old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/test.imageset/Contents.json b/ScrollViewController/Assets.xcassets/test.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/ScrollViewController/Assets.xcassets/test.imageset/Snip20160413_1.png b/ScrollViewController/Assets.xcassets/test.imageset/Snip20160413_1.png old mode 100644 new mode 100755 diff --git a/ScrollViewController/Base.lproj/LaunchScreen.storyboard b/ScrollViewController/Base.lproj/LaunchScreen.storyboard old mode 100644 new mode 100755 diff --git a/ScrollViewController/Base.lproj/Main.storyboard b/ScrollViewController/Base.lproj/Main.storyboard old mode 100644 new mode 100755 index b245ae2..866a4b6 --- a/ScrollViewController/Base.lproj/Main.storyboard +++ b/ScrollViewController/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -103,7 +103,7 @@ - + @@ -119,39 +119,19 @@ - - - 如果对您有帮助,不妨给个star鼓励一下 github: https://github.com/jasnig -如果您在使用过程中发现问题,请联系qq:854136959或者发邮件到这个qq邮箱给我 - - - - - - + - - - - - - - - - - - - + @@ -162,7 +142,7 @@ - + @@ -176,23 +156,20 @@ - - - - - + + @@ -200,18 +177,15 @@ - - - + - @@ -413,24 +387,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/ScrollViewController/ExtraView.swift b/ScrollViewController/ExtraView.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/ExtraView.xib b/ScrollViewController/ExtraView.xib old mode 100644 new mode 100755 diff --git a/ScrollViewController/Info.plist b/ScrollViewController/Info.plist old mode 100644 new mode 100755 diff --git a/ScrollViewController/RefreshView/GifAnimator.swift b/ScrollViewController/RefreshView/GifAnimator.swift new file mode 100644 index 0000000..92f96e7 --- /dev/null +++ b/ScrollViewController/RefreshView/GifAnimator.swift @@ -0,0 +1,283 @@ +// +// GifAnimator.swift +// DouYuTVMutate +// +// Created by ZeroJ on 16/7/24. +// Copyright © 2016年 ZeroJ. All rights reserved. +// + +import UIKit + +class GifAnimator: UIView { + /// 为不同的state设置不同的图片 + /// 闭包需要返回一个元组: 图片数组和gif动画每一帧的执行时间 + /// 一般需要设置loading状态的图片(必须), 作为加载的gif + /// 和pullToRefresh状态的图片数组(可选择设置), 作为拖拽时的加载动画 + typealias SetImagesForStateClosure = (refreshState: RefreshViewState) -> (images:[UIImage], duration:Double)? + /// 为header或者footer的不同的state设置显示的文字 + typealias SetDescriptionClosure = (refreshState: RefreshViewState, refreshType: RefreshViewType) -> String + /// 设置显示上次刷新时间的显示格式 + typealias SetLastTimeClosure = (date: NSDate) -> String + + + // MARK: - private property + /// 显示上次刷新时间 可以外界隐藏和自定义字体颜色等 + private(set) lazy var lastTimeLabel: UILabel = { + let lastTimeLabel = UILabel() + lastTimeLabel.textColor = UIColor.lightGrayColor() + lastTimeLabel.backgroundColor = UIColor.clearColor() + lastTimeLabel.textAlignment = .Center + lastTimeLabel.font = UIFont.systemFontOfSize(14.0) + return lastTimeLabel + }() + + /// 显示描述状态的文字 可以外界隐藏和自定义字体颜色等 + private(set) lazy var descriptionLabel: UILabel = { + let descriptionLabel = UILabel() + descriptionLabel.textColor = UIColor.lightGrayColor() + descriptionLabel.backgroundColor = UIColor.clearColor() + descriptionLabel.textAlignment = .Center + descriptionLabel.font = UIFont.systemFontOfSize(14.0) + return descriptionLabel + }() + + /// gif图片 -> 外界不支持自定义 + private lazy var gifImageView: UIImageView = { + let gifImageView = UIImageView() + gifImageView.clipsToBounds = true + gifImageView.contentMode = .ScaleAspectFit + return gifImageView + }() + /// 缓存图片 + private var imagesDic = [RefreshViewState: (images:[UIImage], duration: Double)]() + + private var setupDesctiptionClosure: SetDescriptionClosure? + private var setupLastTimeClosure: SetLastTimeClosure? + /// 耗时操作 + private lazy var formatter: NSDateFormatter = { + let formatter = NSDateFormatter() + formatter.dateStyle = .ShortStyle + return formatter + }() + /// 耗时操作 + private lazy var calendar: NSCalendar = NSCalendar.currentCalendar() + private var setupImagesClosure: SetImagesForStateClosure? + + // MARK: - public property + + /// 是否刷新完成后自动隐藏 默认为false + /// 这个属性是协议定义的, 当写在class里面可以供外界修改, 如果写在extension里面只能是可读的 + var isAutomaticlyHidden: Bool = false + /// 这个key如果不指定或者为nil,将使用默认的key那么所有的未指定key的header和footer公用一个刷新时间 + var lastRefreshTimeKey: String? = nil + /// 图片和字体的间距 + var imageMagin = CGFloat(15.0) + + // MARK: - public helper + /// 为不同的state设置不同的图片 + /// 闭包需要返回一个元组: 图片数组和gif动画每一帧的执行时间 + /// 一般需要设置loading状态的图片(必须), 作为加载的gif + /// 和pullToRefresh状态的图片数组(可选择设置), 作为拖拽时的加载动画 + func setupImagesForRefreshstate(closure: SetImagesForStateClosure?) { + guard let imageClosure = closure else { return } + + imagesDic[.normal] = imageClosure(refreshState: .normal) + imagesDic[.pullToRefresh] = imageClosure(refreshState: .pullToRefresh) + imagesDic[.releaseToFresh] = imageClosure(refreshState: .releaseToFresh) + imagesDic[.loading] = imageClosure(refreshState: .loading) + + for (_, result) in imagesDic { + if result.images.count != 0 { + gifImageView.image = result.images.first + break + } + } + } + + + func setupDescriptionForState(closure: SetDescriptionClosure) { + setupDesctiptionClosure = closure + } + + func setupLastFreshTime(closure: SetLastTimeClosure) { + setupLastTimeClosure = closure + } + /// + class func gifAnimatorWithHeight(height: CGFloat) -> GifAnimator { + let gif = GifAnimator(frame: CGRect(x: 0, y: 0, width: UIScreen.mainScreen().bounds.width, height: height)) + return gif + } + // MARK: - life cycle + override init(frame: CGRect) { + super.init(frame: frame) + addSubview(gifImageView) + addSubview(lastTimeLabel) + addSubview(descriptionLabel) + + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func layoutSubviews() { + super.layoutSubviews() + gifImageView.frame = bounds + /// setting height and width + + if !descriptionLabel.hidden { + if lastTimeLabel.hidden { + descriptionLabel.sizeToFit() + descriptionLabel.center = center + gifImageView.frame.size.width = descriptionLabel.frame.minX - imageMagin + + } + else { + descriptionLabel.sizeToFit() + lastTimeLabel.sizeToFit() + descriptionLabel.frame.origin.y = bounds.height/2 - descriptionLabel.bounds.height + lastTimeLabel.frame.origin.y = descriptionLabel.frame.maxY + 8.0 + descriptionLabel.center.x = center.x + lastTimeLabel.center.x = center.x + + gifImageView.frame.size.width = min(descriptionLabel.frame.minX, lastTimeLabel.frame.minX) - imageMagin + + } + } + + } + +} +// MARK: - RefreshViewDelegate +extension GifAnimator: RefreshViewDelegate { + /// optional 两个可选的实现方法 + /// 允许在控件添加到scrollView之前的准备 + func refreshViewDidPrepare(refreshView: RefreshView, refreshType: RefreshViewType) { + if refreshType == .header { + descriptionLabel.text = "继续下拉刷新" + } + else { + descriptionLabel.text = "继续上拉刷新" + lastTimeLabel.hidden = true + } + setupLastTime() + } + + func refreshDidBegin(refreshView: RefreshView, refreshViewType: RefreshViewType) { + gifImageView.startAnimating() + } + + /// 刷新结束状态, 这个时候应该关闭自定义的(动画)刷新 + func refreshDidEnd(refreshView: RefreshView, refreshViewType: RefreshViewType) { + gifImageView.stopAnimating() + } + + /// 刷新状态变为新的状态, 这个时候可以自定义设置各个状态对应的属性 + func refreshDidChangeState(refreshView: RefreshView, fromState: RefreshViewState, toState: RefreshViewState, refreshViewType: RefreshViewType) { + + setupDescriptionForState(toState, type: refreshViewType) + switch toState { + case .loading: + if gifImageView.isAnimating() { + gifImageView.stopAnimating() + } + guard let result = imagesDic[.loading] , let image = result.images.first else { return } + if result.images.count == 1 { + gifImageView.image = image + } + else { + + gifImageView.animationImages = result.images + gifImageView.animationDuration = result.duration + } + + case .normal: + /// 设置时间 + setupLastTime() + + default: break + } + } + + /// 拖拽的进度, 可用于自定义实现拖拽过程中的动画 + func refreshDidChangeProgress(refreshView: RefreshView, progress: CGFloat, refreshViewType: RefreshViewType) { + if gifImageView.isAnimating() { + gifImageView.stopAnimating() + } + guard let result = imagesDic[.pullToRefresh] where result.images.count != 0 else { return } + if result.images.count == 1 { + gifImageView.image = result.images.first + } + var index = Int(CGFloat(result.images.count) * progress) + index = min(index, result.images.count - 1) + gifImageView.image = result.images[index] + + } +} +// MARK: - private helper +extension GifAnimator { + private func setupLastTime() { + if lastTimeLabel.hidden { return } + else { + guard let lastDate = lastRefreshTime else { + lastTimeLabel.text = "首次刷新" + return + } + + if let closure = setupLastTimeClosure { + lastTimeLabel.text = closure(date:lastDate) + setNeedsLayout() + } + else { + let lastComponent = calendar.components([.Day, .Year], fromDate: lastDate) + let currentComponent = calendar.components([.Day, .Year], fromDate: NSDate()) + var todayString = "" + if lastComponent.day == currentComponent.day { + formatter.dateFormat = "HH:mm" + todayString = "今天 " + + } + else if lastComponent.year == currentComponent.year { + formatter.dateFormat = "MM-dd HH:mm" + } + else { + formatter.dateFormat = "yyyy-MM-dd HH:mm" + } + let timeString = formatter.stringFromDate(lastDate) + lastTimeLabel.text = "上次刷新时间:" + todayString + timeString + setNeedsLayout() + } + } + } + + private func setupDescriptionForState(state: RefreshViewState, type: RefreshViewType) { + if descriptionLabel.hidden { return } + else { + if let closure = setupDesctiptionClosure { + descriptionLabel.text = closure(refreshState: state, refreshType: type) + setNeedsLayout() + + } + else { + switch state { + case .normal: + descriptionLabel.text = "正常状态" + case .loading: + descriptionLabel.text = "加载数据中..." + case .pullToRefresh: + if type == .header { + descriptionLabel.text = "继续下拉刷新" + } else { + descriptionLabel.text = "继续上拉刷新" + } + case .releaseToFresh: + descriptionLabel.text = "松开手刷新" + + } + setNeedsLayout() + + } + } + } + +} diff --git a/ScrollViewController/RefreshView/NormalAnimator.swift b/ScrollViewController/RefreshView/NormalAnimator.swift new file mode 100644 index 0000000..c142d52 --- /dev/null +++ b/ScrollViewController/RefreshView/NormalAnimator.swift @@ -0,0 +1,212 @@ +// +// NormalAnimator.swift +// PullToRefresh +// +// Created by ZeroJ on 16/7/20. +// Copyright © 2016年 ZeroJ. All rights reserved. +// + +import UIKit + +public class NormalAnimator: UIView { + /// 设置imageView + @IBOutlet private(set) weak var imageView: UIImageView! + @IBOutlet private(set) weak var indicatorView: UIActivityIndicatorView! + /// 设置state描述 + @IBOutlet private(set) weak var descroptionLabel: UILabel! + /// 上次刷新时间label footer 默认为hidden, 可设置hidden=false开启 + @IBOutlet private(set) weak var lastTimelabel: UILabel! + + + public typealias SetDescriptionClosure = (refreshState: RefreshViewState, refreshType: RefreshViewType) -> String + public typealias SetLastTimeClosure = (date: NSDate) -> String + + + /// 是否刷新完成后自动隐藏 默认为false + /// 这个属性是协议定义的, 当写在class里面可以供外界修改, 如果写在extension里面只能是可读的 + public var isAutomaticlyHidden: Bool = false + /// 这个key如果不指定或者为nil,将使用默认的key那么所有的未指定key的header和footer公用一个刷新时间 + public var lastRefreshTimeKey: String? = nil + + private var setupDesctiptionClosure: SetDescriptionClosure? + private var setupLastTimeClosure: SetLastTimeClosure? + /// 耗时 + private lazy var formatter: NSDateFormatter = { + let formatter = NSDateFormatter() + formatter.dateStyle = .ShortStyle + return formatter + }() + /// 耗时 + private lazy var calendar: NSCalendar = NSCalendar.currentCalendar() + + public class func normalAnimator() -> NormalAnimator { + let normalAnimator = NSBundle.mainBundle().loadNibNamed(String(NormalAnimator), owner: nil, options: nil).first as! NormalAnimator + + return normalAnimator + } + + + public func setupDescriptionForState(closure: SetDescriptionClosure) { + setupDesctiptionClosure = closure + } + + public func setupLastFreshTime(closure: SetLastTimeClosure) { + setupLastTimeClosure = closure + } + + override public func awakeFromNib() { + super.awakeFromNib() + indicatorView.hidden = true + indicatorView.hidesWhenStopped = true + } + + // public override func layoutSubviews() { + // super.layoutSubviews() + // print("layout--------------------------------------------") + // } +} + +extension NormalAnimator: RefreshViewDelegate { + + public func refreshViewDidPrepare(refreshView: RefreshView, refreshType: RefreshViewType) { + if refreshType == .header { + } else { + lastTimelabel.hidden = true + rotateArrowToUpAnimated(false) + } + setupLastTime() + + } + + public func refreshDidBegin(refreshView: RefreshView, refreshViewType: RefreshViewType) { + indicatorView.hidden = false + indicatorView.startAnimating() + } + public func refreshDidEnd(refreshView: RefreshView, refreshViewType: RefreshViewType) { + indicatorView.stopAnimating() + } + public func refreshDidChangeProgress(refreshView: RefreshView, progress: CGFloat, refreshViewType: RefreshViewType) { + // print(progress) + + } + + public func refreshDidChangeState(refreshView: RefreshView, fromState: RefreshViewState, toState: RefreshViewState, refreshViewType: RefreshViewType) { + print(toState) + + setupDescriptionForState(toState, type: refreshViewType) + switch toState { + case .loading: + imageView.hidden = true + case .normal: + + setupLastTime() + imageView.hidden = false + ///恢复 + if refreshViewType == .header { + rotateArrowToDownAnimated(false) + + } else { + rotateArrowToUpAnimated(false) + } + + case .pullToRefresh: + if refreshViewType == .header { + + if fromState == .releaseToFresh { + rotateArrowToDownAnimated(true) + } + + } else { + + if fromState == .releaseToFresh { + rotateArrowToUpAnimated(true) + } + } + imageView.hidden = false + + case .releaseToFresh: + + imageView.hidden = false + if refreshViewType == .header { + rotateArrowToUpAnimated(true) + } else { + rotateArrowToDownAnimated(true) + } + } + } + + private func rotateArrowToDownAnimated(animated: Bool) { + let time = animated ? 0.2 : 0.0 + UIView.animateWithDuration(time, animations: { + self.imageView.transform = CGAffineTransformIdentity + + }) + } + + private func rotateArrowToUpAnimated(animated: Bool) { + let time = animated ? 0.2 : 0.0 + UIView.animateWithDuration(time, animations: { + self.imageView.transform = CGAffineTransformMakeRotation(CGFloat(M_PI)) + + }) + } + + private func setupLastTime() { + if lastTimelabel.hidden { + lastTimelabel.text = "" + } else { + guard let lastDate = lastRefreshTime else { + lastTimelabel.text = "首次刷新" + return + } + + if let closure = setupLastTimeClosure { + lastTimelabel.text = closure(date:lastDate) + } else { + let lastComponent = calendar.components([.Day, .Year], fromDate: lastDate) + let currentComponent = calendar.components([.Day, .Year], fromDate: NSDate()) + var todayString = "" + if lastComponent.day == currentComponent.day { + formatter.dateFormat = "HH:mm" + todayString = "今天 " + + } + else if lastComponent.year == currentComponent.year { + formatter.dateFormat = "MM-dd HH:mm" + } + else { + formatter.dateFormat = "yyyy-MM-dd HH:mm" + } + let timeString = formatter.stringFromDate(lastDate) + lastTimelabel.text = "上次刷新时间:" + todayString + timeString + } + } + } + + private func setupDescriptionForState(state: RefreshViewState, type: RefreshViewType) { + if descroptionLabel.hidden { + descroptionLabel.text = "" + } else { + if let closure = setupDesctiptionClosure { + descroptionLabel.text = closure(refreshState: state, refreshType: type) + } else { + switch state { + case .normal: + descroptionLabel.text = "正常状态" + case .loading: + descroptionLabel.text = "加载数据中..." + case .pullToRefresh: + if type == .header { + descroptionLabel.text = "继续下拉刷新" + } else { + descroptionLabel.text = "继续上拉刷新" + } + case .releaseToFresh: + descroptionLabel.text = "松开手刷新" + + } + } + } + } + +} diff --git a/ScrollViewController/RefreshView/NormalAnimator.xib b/ScrollViewController/RefreshView/NormalAnimator.xib new file mode 100644 index 0000000..c13e0fc --- /dev/null +++ b/ScrollViewController/RefreshView/NormalAnimator.xib @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ScrollViewController/RefreshView/RefreshView.swift b/ScrollViewController/RefreshView/RefreshView.swift new file mode 100644 index 0000000..44031ca --- /dev/null +++ b/ScrollViewController/RefreshView/RefreshView.swift @@ -0,0 +1,421 @@ +// +// RefreshViewDelegate.swift +// PullToRefresh +// +// Created by ZeroJ on 16/7/20. +// Copyright © 2016年 ZeroJ. All rights reserved. +// + +import UIKit +public enum RefreshViewState { + /// 正在加载状态 + case loading + /// 正常状态 + case normal + /// 下拉状态 + case pullToRefresh + /// 松开手即进入刷新状态 + case releaseToFresh +} + + +public enum RefreshViewType { + case header, footer +} + +public protocol RefreshViewDelegate { + /// 你应该为每一个header或者footer设置一个不同的key来保存时间, 否则将公用同一个key使用相同的时间 + var lastRefreshTimeKey: String? { get } + /// 是否刷新完成后自动隐藏 默认为false + var isAutomaticlyHidden: Bool { get } + /// 上次刷新时间, 有默认赋值和返回 + var lastRefreshTime: NSDate? { get set } + /// repuired 三个必须实现的代理方法 + + /// 开始进入刷新(loading)状态, 这个时候应该开启自定义的(动画)刷新 + func refreshDidBegin(refreshView: RefreshView, refreshViewType: RefreshViewType) + + /// 刷新结束状态, 这个时候应该关闭自定义的(动画)刷新 + func refreshDidEnd(refreshView: RefreshView, refreshViewType: RefreshViewType) + + /// 刷新状态变为新的状态, 这个时候可以自定义设置各个状态对应的属性 + func refreshDidChangeState(refreshView: RefreshView, fromState: RefreshViewState, toState: RefreshViewState, refreshViewType: RefreshViewType) + + /// optional 两个可选的实现方法 + /// 允许在控件添加到scrollView之前的准备 + func refreshViewDidPrepare(refreshView: RefreshView, refreshType: RefreshViewType) + + /// 拖拽的进度, 可用于自定义实现拖拽过程中的动画 + func refreshDidChangeProgress(refreshView: RefreshView, progress: CGFloat, refreshViewType: RefreshViewType) + +} + +/// default doing +extension RefreshViewDelegate { + public func refreshViewDidPrepare(refreshView: RefreshView, refreshType: RefreshViewType) { } + public func refreshDidChangeProgress(refreshView: RefreshView, progress: CGFloat, refreshViewType: RefreshViewType) { } + public var isAutomaticlyHidden: Bool { return false } + + public var lastRefreshTime: NSDate? { + get { + return NSUserDefaults.standardUserDefaults().objectForKey(lastRefreshTimeKey ?? RefreshView.ConstantValue.commonRefreshTimeKey) as? NSDate + } + set { + NSUserDefaults.standardUserDefaults().setObject(newValue, forKey: lastRefreshTimeKey ?? RefreshView.ConstantValue.commonRefreshTimeKey) + NSUserDefaults.standardUserDefaults().synchronize() + } + } + + public var lastRefreshTimeKey: String? { + return nil + } +} + + +public class RefreshView: UIView { + /// KVO Constant + struct ConstantValue { + static var RefreshViewContext: UInt8 = 0 + static let ScrollViewContentOffsetPath = "contentOffset" + static let ScrollViewContentSizePath = "contentSize" + static let commonRefreshTimeKey = "ZJCommonRefreshTimeKey" + static let LastRefreshTimeKey = NSProcessInfo().globallyUniqueString + + } + /// + typealias RefreshHandler = Void -> Void + // MARK: - internal property + var canBegin = false { + didSet { + if canBegin == oldValue { return } + if canBegin { + startAnimation() + } else { + stopAnimation() + } + } + } + + // MARK: - private property + private var refreshViewState: RefreshViewState = .normal { + didSet { + if refreshViewState == .normal { + hidden = refreshAnimator.isAutomaticlyHidden + } + else { hidden = false } + + if refreshViewState != oldValue { + if refreshViewState == .loading { +// print(refreshAnimator.lastRefreshTimeKey) + refreshAnimator.lastRefreshTime = NSDate() + + } + refreshAnimator.refreshDidChangeState(self, fromState: oldValue, toState: refreshViewState, refreshViewType: refreshViewType) + + } + } + } + + /// action handler + private let refreshHandler: RefreshHandler + /// handler refresh !! must be UIView which conform to RefreshViewDelegate protocol + private var refreshAnimator: RefreshViewDelegate + /// header or footer + private var refreshViewType: RefreshViewType = .header + /// to distinguish if is refreshing + private var isRefreshing = false + /// to distinguish if dragging begins + private var isGestureBegin = false + private var offPartHeight = CGFloat(0) + private var beginAnimatingOffsetY: CGFloat = 0 + /// 标注结束的动画是否执行完成 + private var isAnimating = false + /// store it to reset scrollView' after animating + private var scrollViewOriginalValue:(bounces: Bool, contentInset: UIEdgeInsets, contentOffset: CGPoint) = (false, UIEdgeInsets(), CGPoint()) + /// superView + private weak var scrollView: UIScrollView? { + return self.superview as? UIScrollView + } + + //MARK: - life cycle + /// + init(frame: CGRect, refreshType: RefreshViewType, refreshAnimator: Animator, refreshHandler: RefreshHandler) { + self.refreshViewType = refreshType + self.refreshAnimator = refreshAnimator + self.refreshHandler = refreshHandler + super.init(frame: frame) + addSubview(refreshAnimator) + /// needed + autoresizingMask = .FlexibleWidth + addConstraint() + /// animator can prepare to do something + self.refreshAnimator.refreshViewDidPrepare(self, refreshType: self.refreshViewType) + /// + hidden = refreshAnimator.isAutomaticlyHidden + } + /// + private func addConstraint() { + guard let refreshAnimatorView = refreshAnimator as? UIView else { return } + let leading = NSLayoutConstraint(item: refreshAnimatorView, attribute: .Leading, relatedBy: .Equal, toItem: self, attribute: .Leading, multiplier: 1.0, constant: 0.0) + let top = NSLayoutConstraint(item: refreshAnimatorView, attribute: .Top, relatedBy: .Equal, toItem: self, attribute: .Top, multiplier: 1.0, constant: 0.0) + let trailing = NSLayoutConstraint(item: refreshAnimatorView, attribute: .Trailing, relatedBy: .Equal, toItem: self, attribute: .Trailing, multiplier: 1.0, constant: 0.0) + let bottom = NSLayoutConstraint(item: refreshAnimatorView, attribute: .Bottom, relatedBy: .Equal, toItem: self, attribute: .Bottom, multiplier: 1.0, constant: 0.0) + + refreshAnimatorView.translatesAutoresizingMaskIntoConstraints = false + addConstraints([leading, top, trailing, bottom]) + } + /// + required public init?(coder aDecoder: NSCoder) { + fatalError("there is no need to suport xib") + } + + deinit { + removeObserverOf(scrollView) + } + + override public func willMoveToSuperview(newSuperview: UIView?) { + super.willMoveToSuperview(newSuperview) + + removeObserverOf(scrollView) + + if let newScrollView = newSuperview as? UIScrollView { + /// can drag anytime + newScrollView.alwaysBounceVertical = true + addObserverOf(newScrollView) + scrollViewOriginalValue = (newScrollView.bounces, newScrollView.contentInset, newScrollView.contentOffset) + if refreshViewType == .footer {// reset frame + self.frame.origin.y = newScrollView.contentSize.height + } + } + } + +} + +extension RefreshView { + + private func startAnimation() { + guard let validScrollView = scrollView else { return } + validScrollView.bounces = false + isRefreshing = true + if hidden { hidden = false } + /// may update UI + dispatch_async(dispatch_get_main_queue(), {[weak self] in + guard let validSelf = self else { return } + + UIView.animateWithDuration(0.25, animations: { + if validSelf.refreshViewType == .header { + validScrollView.contentInset.top = validSelf.scrollViewOriginalValue.contentInset.top + validSelf.bounds.height + } else { + let offPartHeight = validScrollView.contentSize.height - validSelf.heightOfContentOnScreenOfScrollView(validScrollView) + /// contentSize改变的时候设置的self.y不同导致不同的结果 + /// 所有内容高度>屏幕上显示的内容高度 + let notSureBottom = validSelf.scrollViewOriginalValue.contentInset.bottom + validSelf.bounds.height + validScrollView.contentInset.bottom = offPartHeight>=0 ? notSureBottom : notSureBottom - offPartHeight // 加上 + + } + + }, completion: { (_) in + /// 这个时候才正式刷新 + validScrollView.bounces = true + validSelf.isGestureBegin = false + validSelf.refreshViewState = .loading + validSelf.refreshAnimator.refreshDidBegin(validSelf, refreshViewType: validSelf.refreshViewType) + validSelf.refreshHandler() + }) + + }) + + } + + private func stopAnimation() { + guard let validScrollView = scrollView else { return } + if !isRefreshing { return } + isRefreshing = false + isAnimating = true +// print("endAnimation --- \(scrollViewOriginalValue.contentInset.top)") + + dispatch_async(dispatch_get_main_queue(), {[weak self] in + guard let validSelf = self else { return } + + UIView.animateWithDuration(0.25, animations: { + if validSelf.refreshViewType == .header { + validScrollView.contentInset.top = validSelf.scrollViewOriginalValue.contentInset.top + } else { + + validScrollView.contentInset.bottom = validSelf.scrollViewOriginalValue.contentInset.bottom + } + + }, completion: { (_) in + + // refresh end + validScrollView.bounces = validSelf.scrollViewOriginalValue.bounces +// print("endAnimation --- \(self!.scrollView?.contentInset.top)") + validSelf.isAnimating = false + validSelf.refreshAnimator.refreshDidChangeProgress(validSelf, progress: 1.0, refreshViewType: validSelf.refreshViewType) + validSelf.refreshAnimator.refreshDidEnd(validSelf, refreshViewType: validSelf.refreshViewType) + validSelf.refreshViewState = .normal + }) + + }) + + } + +} + +// MARK: - KVO +extension RefreshView { + + override public func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer) { + if context == &ConstantValue.RefreshViewContext { + + if keyPath == ConstantValue.ScrollViewContentSizePath { + + guard let validScrollView = scrollView, + let oldSize = change?[NSKeyValueChangeOldKey]?.CGSizeValue(), + let newSize = change?[NSKeyValueChangeNewKey]?.CGSizeValue() + where oldSize != newSize && + refreshViewType == .footer + else { return } + + /// 设置刷新控件self的位置 + let contentOnScreenHeight = heightOfContentOnScreenOfScrollView(validScrollView) + /// 添加在屏幕"外面" + + self.frame.origin.y = max(newSize.height, contentOnScreenHeight) + // print("old--*\(oldSize.height)--------*\(newSize.height)") + + } + else if keyPath == ConstantValue.ScrollViewContentOffsetPath { + + if let validScrollView = scrollView where object as? UIScrollView == validScrollView { + + if refreshViewType == .header { + adjustHeaderWhenScrollViewIsScrolling(validScrollView) + } else { + adjustFooterWhenScrollViewIsScrolling(validScrollView) + } + } + } + else { + super.observeValueForKeyPath(keyPath, ofObject: object, change: change, context: context) + + } + + } else { + super.observeValueForKeyPath(keyPath, ofObject: object, change: change, context: context) + } + } + + private func adjustFooterWhenScrollViewIsScrolling(scrollView: UIScrollView) { + + if isRefreshing {/**正在刷新直接返回*/ return } + + scrollViewOriginalValue.contentInset = scrollView.contentInset + if scrollView.panGestureRecognizer.state == .Began {// 手势拖拽才能进入下拉状态 + isGestureBegin = true + /// 超出屏幕的内容高度 + offPartHeight = frame.origin.y - scrollView.bounds.height + beginAnimatingOffsetY = offPartHeight>0 ? offPartHeight : -scrollViewOriginalValue.contentInset.top + return + } + + if !isGestureBegin {/**没有拖拽直接返回*/ return } + + // 已经进入拖拽状态, 进行相关操作 + +// print("\(offPartHeight) -----* \(beginAnimatingOffsetY) --- *\(scrollView.contentOffset.y)") + if scrollView.contentOffset.y < beginAnimatingOffsetY {/**底部视图(隐藏)并且还没到显示的临界点*/ return } + let progress = (scrollView.contentOffset.y - beginAnimatingOffsetY) / self.bounds.height + + adjustRefreshViewWithProgress(progress, scrollView: scrollView) + + } + + private func adjustHeaderWhenScrollViewIsScrolling(scrollView: UIScrollView) { + if isRefreshing {/**正在刷新直接返回*/ + /// 需要处理这个时候滚动时sectionHeader悬停的问题 + /// 参照MJRefresh + var insetsTop: CGFloat = 0 + if scrollView.contentOffset.y > -scrollViewOriginalValue.contentInset.top { + insetsTop = scrollViewOriginalValue.contentInset.top + } else { + insetsTop = -scrollView.contentOffset.y + } + + insetsTop = min(scrollViewOriginalValue.contentInset.top + self.bounds.height, insetsTop) + scrollView.contentInset.top = insetsTop +// print("--------****** \(scrollView.contentInset.top)") + return + } + /// 不在刷新状态的时候都随时记录原始的contentInset + /// 刷新状态的时候不能记录为原始的 + if isAnimating {/**stop动画还未执行完成*/ return } + scrollViewOriginalValue.contentInset = scrollView.contentInset + + if scrollView.panGestureRecognizer.state == .Began {// 手势拖拽才能进入下拉状态 + isGestureBegin = true + return + } + + + if !isGestureBegin {/**没有拖拽直接返回*/ return } + + + // print("\(scrollView.contentOffset.y)------*\(-scrollViewOriginalValue.contentInset.top)") + if scrollView.contentOffset.y > -scrollViewOriginalValue.contentInset.top {/**头部视图(隐藏)并且还没到显示的临界点*/ return } + + // 已经进入拖拽状态, 进行相关操作 + let progress = (-scrollViewOriginalValue.contentInset.top - scrollView.contentOffset.y) / self.bounds.height + + adjustRefreshViewWithProgress(progress, scrollView: scrollView) + } + + private func adjustRefreshViewWithProgress(progress: CGFloat, scrollView: UIScrollView) { + +// print(progress) + + if scrollView.tracking { + + if progress >= 1.0 { + refreshViewState = .releaseToFresh + + } else if progress <= 0.0 { + refreshViewState = .normal + } else { + refreshViewState = .pullToRefresh + } + + } + else if refreshViewState == .releaseToFresh {// releaseToFreah 2 refresh + canBegin = true// begin refresh + } + else {// release + if progress <= 0.0 { + refreshViewState = .normal + } + + } + + var actualProgress = min(1.0, progress) + actualProgress = max(0.0, actualProgress) + refreshAnimator.refreshDidChangeProgress(self, progress: actualProgress, refreshViewType: refreshViewType) + } + + /// 显示在屏幕上的内容高度 + private func heightOfContentOnScreenOfScrollView(scrollView: UIScrollView) -> CGFloat { + return scrollView.bounds.height - scrollViewOriginalValue.contentInset.top - scrollViewOriginalValue.contentInset.bottom + } + + + private func addObserverOf(scrollView: UIScrollView?) { + scrollView?.addObserver(self, forKeyPath: ConstantValue.ScrollViewContentOffsetPath, options: .Initial, context: &ConstantValue.RefreshViewContext) + scrollView?.addObserver(self, forKeyPath: ConstantValue.ScrollViewContentSizePath, options: [.Old, .New], context: &ConstantValue.RefreshViewContext) + + } + + private func removeObserverOf(scrollView: UIScrollView?) { + scrollView?.removeObserver(self, forKeyPath: ConstantValue.ScrollViewContentOffsetPath, context: &ConstantValue.RefreshViewContext) + scrollView?.removeObserver(self, forKeyPath: ConstantValue.ScrollViewContentSizePath, context: &ConstantValue.RefreshViewContext) + + } +} diff --git a/ScrollViewController/RefreshView/UIScrollView+RefreshView.swift b/ScrollViewController/RefreshView/UIScrollView+RefreshView.swift new file mode 100644 index 0000000..ded23d1 --- /dev/null +++ b/ScrollViewController/RefreshView/UIScrollView+RefreshView.swift @@ -0,0 +1,74 @@ +// +// UIScrollView+RefreshView.swift +// PullToRefresh +// +// Created by ZeroJ on 16/7/20. +// Copyright © 2016年 ZeroJ. All rights reserved. +// + +import UIKit + +private var ZJHeaderKey: UInt8 = 0 +private var ZJFooterKey: UInt8 = 0 + +extension UIScrollView { + public typealias RefreshHandler = () -> Void + + private var zj_refreshHeader: RefreshView? { + set { + objc_setAssociatedObject(self, &ZJHeaderKey, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) + } + + get { + return objc_getAssociatedObject(self, &ZJHeaderKey) as? RefreshView + } + } + private var zj_refreshFooter: RefreshView? { + set { + objc_setAssociatedObject(self, &ZJFooterKey, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) + } + + get { + return objc_getAssociatedObject(self, &ZJFooterKey) as? RefreshView + } + } + + /// + public func zj_addRefreshHeader(headerAnimator: Animator, refreshHandler: RefreshHandler ) { + if let header = zj_refreshHeader { + header.removeFromSuperview() + } + /// + let frame = CGRect(x: 0.0, y: -headerAnimator.bounds.height, width: bounds.width, height: headerAnimator.bounds.height) + zj_refreshHeader = RefreshView(frame: frame, refreshType: .header, refreshAnimator: headerAnimator, refreshHandler: refreshHandler) + addSubview(zj_refreshHeader!) + + } + /// + public func zj_addRefreshFooter(footerAnimator: Animator, refreshHandler: RefreshHandler ) { + if let footer = zj_refreshFooter { + footer.removeFromSuperview() + } + /// this may not the final position + let frame = CGRect(x: 0.0, y: contentSize.height, width: bounds.width, height: footerAnimator.bounds.height) + zj_refreshFooter = RefreshView(frame: frame, refreshType: .footer, refreshAnimator: footerAnimator, refreshHandler: refreshHandler) + addSubview(zj_refreshFooter!) + } + /// 开启header刷新 + public func zj_startHeaderAnimation() { + zj_refreshHeader?.canBegin = true + } + /// 结束header刷新 + public func zj_stopHeaderAnimation() { + zj_refreshHeader?.canBegin = false + } + /// 开启footer刷新 + public func zj_startFooterAnimation() { + zj_refreshFooter?.canBegin = true + } + /// 结束footer刷新 + public func zj_stopFooterAnimation() { + zj_refreshFooter?.canBegin = false + } + +} \ No newline at end of file diff --git a/ScrollViewController/ScrollPageView/ContentView.swift b/ScrollViewController/ScrollPageView/ContentView.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/ScrollPageView/ScrollPageView.swift b/ScrollViewController/ScrollPageView/ScrollPageView.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/ScrollPageView/ScrollSegmentView.swift b/ScrollViewController/ScrollPageView/ScrollSegmentView.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/ScrollPageView/SegmentStyle.swift b/ScrollViewController/ScrollPageView/SegmentStyle.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/ScrollPageView/UIViewControllerExtension.swift b/ScrollViewController/ScrollPageView/UIViewControllerExtension.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/SelectionCollectionViewCell.swift b/ScrollViewController/SelectionCollectionViewCell.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/SelectionCollectionViewCell.xib b/ScrollViewController/SelectionCollectionViewCell.xib old mode 100644 new mode 100755 diff --git a/ScrollViewController/SelectionView.swift b/ScrollViewController/SelectionView.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/Vc10Controller.swift b/ScrollViewController/Vc10Controller.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/Vc11Controller.swift b/ScrollViewController/Vc11Controller.swift deleted file mode 100644 index 2fad557..0000000 --- a/ScrollViewController/Vc11Controller.swift +++ /dev/null @@ -1,274 +0,0 @@ -// -// Vc11Controller.swift -// ScrollViewController -// -// Created by jasnig on 16/6/1. -// Copyright © 2016年 ZeroJ. All rights reserved. -// github: https://github.com/jasnig -// 简书: http://www.jianshu.com/users/fb31a3d1ec30/latest_articles - -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -// - -import UIKit - -class Vc11Controller: UIViewController { - - var childVcs:[PageTableViewController] = [] - var currentChildVc: PageTableViewController! - var parentScrollIsScrolling = false - var parentOffSet: CGFloat = 0 - // 懒加载 topView - lazy var topView: ScrollSegmentView! = {[unowned self] in - - var style = SegmentStyle() - - // 颜色渐变 - style.gradualChangeTitleColor = true - // 遮盖 - style.showCover = true - // 遮盖颜色 - style.coverBackgroundColor = UIColor.whiteColor() - - // title正常状态颜色 使用RGB空间值 - style.normalTitleColor = UIColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1.0) - // title选中状态颜色 使用RGB空间值 - style.selectedTitleColor = UIColor(red: 235.0/255.0, green: 0.0/255.0, blue: 0.0/255.0, alpha: 1.0) - - let titles = ["国内头条", "国际要闻", "趣事", "囧图", "明星八卦", "爱车", "国防要事", "科技频道", "手机专页", "风景图", "段子"] - - let topView = ScrollSegmentView(frame: CGRect(x: CGFloat(0.0), y: naviBarHeight + headViewHeight, width: self.view.bounds.size.width, height: segmentViewHeight), segmentStyle: style, titles: titles) - - topView.titleBtnOnClick = {[unowned self] (label: UILabel, index: Int) in - self.contentView.setContentOffSet(CGPoint(x: self.contentView.bounds.size.width * CGFloat(index), y: 0), animated: true) - - } - topView.backgroundColor = UIColor.lightGrayColor() - return topView - - }() - - // 懒加载 contentView - lazy var contentView: ContentView! = {[unowned self] in - let contentView = ContentView(frame: self.view.bounds, childVcs: self.childVcs, parentViewController: self) - contentView.delegate = self // 必须实现代理方法 - return contentView - }() - - lazy var headerContainerView: UIView! = { - let headerContainerView = UIView(frame: CGRect(x: 0.0, y: 200.0, width: self.view.bounds.width, height: defaultOffSetY)) - headerContainerView.backgroundColor = UIColor.redColor() - headerContainerView.addSubview(self.headView) - headerContainerView.addSubview(self.topView) - return headerContainerView - }() - - - // 懒加载 headView - lazy var headView: UIButton! = { - let headView = UIButton(frame: CGRect(x: 0.0, y: naviBarHeight, width: self.view.bounds.size.width, height: headViewHeight)) - headView.setImage(UIImage(named: "fruit"), forState: .Normal) - // headView.image = UIImage(named: "fruit") - - return headView - }() - - - - /// 用来实时记录子控制器的tableView的滚动的offSetY - var offSetY: CGFloat = 0 - override func viewDidLoad() { - super.viewDidLoad() - title = "简书个人主页" - // 这个是必要的设置, 如果没有设置导致显示内容不正常, 请尝试设置这个属性 - automaticallyAdjustsScrollViewInsets = false - setChildVcs() - view.addSubview(contentView) - NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.didSelectIndex(_:)), name: ScrollPageViewDidShowThePageNotification, object: nil) - - } - - - func didSelectIndex(noti: NSNotification) { - let userInfo = noti.userInfo! - //注意键名是currentIndex - // 通知父控制器重新设置tableView的contentOffset.y - let currentIndex = userInfo["currentIndex"] as! Int - let childVc = childVcs[currentIndex] - currentChildVc = childVc - childVc.delegate?.setupTableViewOffSetYWhenViewWillAppear(childVc.tableView) - print(userInfo["currentIndex"]) - } - - deinit { - NSNotificationCenter.defaultCenter().removeObserver(self) - } - //1. 添加子控制器为PageTableViewController或者继承自他的Controller, - // 或者你可以参考PageTableViewController他里面的实现自行实现(可以使用UICollectionView)相关的代理和属性 并且设置delegate为self - - func setChildVcs() { - let vc1 = PageTableViewController() - - vc1.delegate = self - - let vc2 = Test1Controller() - vc2.delegate = self - - let vc3 = Test2Controller() - vc3.delegate = self - - let vc4 = Test3Controller() - vc4.delegate = self - - let vc5 = Test4Controller() - vc5.delegate = self - - let vc6 = Test5Controller() - vc6.delegate = self - - let vc7 = Test6Controller() - vc7.delegate = self - - let vc8 = Test7Controller() - vc8.delegate = self - - let vc9 = Test8Controller() - vc9.delegate = self - - let vc10 = Test9Controller() - vc10.delegate = self - - let vc11 = Test10Controller() - vc11.delegate = self - childVcs = [vc1, vc2, vc3,vc4, vc5, vc6, vc7, vc8, vc9, vc10, vc11] - - } - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - // Dispose of any resources that can be recreated. - } - - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { - // Get the new view controller using segue.destinationViewController. - // Pass the selected object to the new view controller. - } - */ - -} - - -// MARK:- PageTableViewDelegate - 监控子控制器中的tableview的滚动和更新相关的UI -extension Vc11Controller: PageTableViewDelegate { - - // 设置将要显示的tableview的contentOffset.y - func setupTableViewOffSetYWhenViewWillAppear(scrollView: UIScrollView) { - - defer { - offSetY = scrollView.contentOffset.y - } - print("\(offSetY) -------*\(scrollView.contentOffset.y)-----*") - if offSetY >= 0 && offSetY < headViewHeight {// 滚动 过程中切换页面 - scrollView.contentOffset.y = offSetY - return - } else { - if scrollView.contentOffset.y <= headViewHeight { - - scrollView.contentOffset.y = headViewHeight - return - } - return - - } - - - } - func setHeadContainerViewToCell() { - if headerContainerView.superview != currentChildVc.tableView.tableHeaderView { - //在这之前必须要保证headerContainerView的高度正确 - currentChildVc.tableView.tableHeaderView?.addSubview(headerContainerView) - } - headerContainerView.frame.origin.y = 0.0 - } - - func setHeadContainerViewToVcWithY(y: CGFloat) { - if headerContainerView.superview != view { - headerContainerView.frame.origin.y = y - - view.addSubview(headerContainerView) - } - - } - // 根据子控制器的scrolView的偏移量来调整UI - func scrollViewIsScrolling(scrollView: UIScrollView) { - offSetY = scrollView.contentOffset.y - - // print(offSetY) - if parentScrollIsScrolling { return } - - if offSetY > headViewHeight { - setHeadContainerViewToVcWithY(-headViewHeight) - } else { - setHeadContainerViewToCell() - } - - - } - -} - - -// MARK:- ContentViewDelegate -extension Vc11Controller: ContentViewDelegate { - var segmentView: ScrollSegmentView { - return topView - } - - - func contentViewDidBeginMove(scrollView: UIScrollView) { - parentOffSet = scrollView.contentOffset.x - print("begin==========") - if offSetY >= 0 && offSetY <= headViewHeight {// 滚动 过程中切换页面 - parentScrollIsScrolling = true - setHeadContainerViewToVcWithY(-offSetY) - } - } - // 用于第一页和最后一页反方向没有拖动的时候更新view - func contentViewDidEndDrag(scrollView: UIScrollView) { - - if parentOffSet == scrollView.contentOffset.x { - parentScrollIsScrolling = false - setHeadContainerViewToCell() - - } - } - - func contentViewDidEndDisPlay(scrollView: UIScrollView) { - print("end") - - parentScrollIsScrolling = false - setHeadContainerViewToCell() - } -} diff --git a/ScrollViewController/other/AppDelegate.swift b/ScrollViewController/other/AppDelegate.swift old mode 100644 new mode 100755 diff --git a/ScrollViewController/other/TestController.swift b/ScrollViewController/other/TestController.swift old mode 100644 new mode 100755 diff --git "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/TestSelectedIndexController.swift" b/ScrollViewController/other/TestSelectedIndexController.swift old mode 100644 new mode 100755 similarity index 100% rename from "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/TestSelectedIndexController.swift" rename to ScrollViewController/other/TestSelectedIndexController.swift diff --git a/ScrollViewController/other/ViewController.swift b/ScrollViewController/other/ViewController.swift old mode 100644 new mode 100755 diff --git "a/ScrollViewController/\345\217\257\344\273\245\345\234\250\345\210\235\345\247\213\345\214\226\346\210\226\350\200\205\350\277\224\345\233\236\351\241\265\351\235\242\347\232\204\346\227\266\345\200\231\350\256\276\347\275\256\345\275\223\345\211\215\351\241\265\344\270\272\345\205\266\344\273\226\351\241\265/Vc9Controller.swift" "b/ScrollViewController/\345\217\257\344\273\245\345\234\250\345\210\235\345\247\213\345\214\226\346\210\226\350\200\205\350\277\224\345\233\236\351\241\265\351\235\242\347\232\204\346\227\266\345\200\231\350\256\276\347\275\256\345\275\223\345\211\215\351\241\265\344\270\272\345\205\266\344\273\226\351\241\265/Vc9Controller.swift" old mode 100644 new mode 100755 diff --git "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/Vc8Controller.swift" "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/Vc8Controller.swift" deleted file mode 100644 index 115858e..0000000 --- "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/Vc8Controller.swift" +++ /dev/null @@ -1,310 +0,0 @@ -// -// Vc8Controller.swift -// ScrollViewController -// -// Created by jasnig on 16/4/21. -// Copyright © 2016年 ZeroJ. All rights reserved. -// github: https://github.com/jasnig -// 简书: http://www.jianshu.com/users/fb31a3d1ec30/latest_articles - -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -// -import UIKit - -/// 这些常量请根据项目需要修改 -let segmentViewHeight: CGFloat = 44.0 -let naviBarHeight: CGFloat = 64.0 -let headViewHeight: CGFloat = 200.0 -let defaultOffSetY: CGFloat = segmentViewHeight + naviBarHeight + headViewHeight - - -class Vc8Controller: UIViewController { - - var childVcs:[PageTableViewController] = [] - var currentChildVc: PageTableViewController! - - /// 用来实时记录子控制器的tableView的滚动的offSetY - var offSetY: CGFloat = -defaultOffSetY - - /// 当前的偏移量, 用于处理下拉刷新 或者其他需要和偏移量同步的动画效果 - var currentOffsetY: CGFloat = 0 { - didSet { - print(currentOffsetY) - } - } - // 懒加载 containerView 所有view的容器 - lazy var containerView: UIView = { - let containerView = UIView(frame: self.view.bounds) - containerView.backgroundColor = UIColor.whiteColor() - return containerView - }() - - // 懒加载 topView - lazy var topView: ScrollSegmentView! = {[unowned self] in - - var style = SegmentStyle() - - // 颜色渐变 - style.gradualChangeTitleColor = true - // 遮盖 - style.showCover = true - // 遮盖颜色 - style.coverBackgroundColor = UIColor.whiteColor() - - // title正常状态颜色 使用RGB空间值 - style.normalTitleColor = UIColor(red: 255.0/255.0, green: 255.0/255.0, blue: 255.0/255.0, alpha: 1.0) - // title选中状态颜色 使用RGB空间值 - style.selectedTitleColor = UIColor(red: 235.0/255.0, green: 0.0/255.0, blue: 0.0/255.0, alpha: 1.0) - - let titles = ["国内头条", "国际要闻", "趣事", "囧图", "明星八卦", "爱车", "国防要事", "科技频道", "手机专页", "风景图", "段子"] - - let topView = ScrollSegmentView(frame: CGRect(x: CGFloat(0.0), y: naviBarHeight + headViewHeight, width: self.view.bounds.size.width, height: segmentViewHeight), segmentStyle: style, titles: titles) - - topView.titleBtnOnClick = {[unowned self] (label: UILabel, index: Int) in - self.contentView.setContentOffSet(CGPoint(x: self.contentView.bounds.size.width * CGFloat(index), y: 0), animated: false) - - } - topView.backgroundColor = UIColor.lightGrayColor() - return topView - - }() - - // 懒加载 contentView - lazy var contentView: ContentView! = {[unowned self] in - let contentView = ContentView(frame: self.view.bounds, childVcs: self.childVcs, parentViewController: self) - contentView.delegate = self // 必须实现代理方法 - return contentView - }() - - // 懒加载 headView - lazy var headView: UIButton! = { - let headView = UIButton(frame: CGRect(x: 0.0, y: 0.0, width: self.view.bounds.size.width, height: headViewHeight)) - headView.setImage(UIImage(named: "fruit"), forState: .Normal) -// headView.image = UIImage(named: "fruit") - headView.userInteractionEnabled = true - - - return headView - }() - - // 懒加载 scrollView headView的容器 - lazy var scrollView: UIScrollView = { - let scrollView = UIScrollView(frame: CGRect(x: 0.0, y: naviBarHeight, width: self.view.bounds.size.width, height: headViewHeight)) - scrollView.delegate = self - scrollView.scrollsToTop = false - scrollView.contentSize = CGSize(width: 0.0, height: headViewHeight*2) - return scrollView - }() - - - override func viewDidLoad() { - super.viewDidLoad() - title = "简书个人主页" - view.backgroundColor = UIColor.whiteColor() - // 这个是必要的设置, 如果没有设置导致显示内容不正常, 请尝试设置这个属性 - automaticallyAdjustsScrollViewInsets = false - setChildVcs() - - addSubviews() - - // 添加通知监听每个页面的出现 - addNotificationObserver() - - } - - func addSubviews() { - view.addSubview(containerView) - // 1. 先添加contentView - containerView.addSubview(contentView) - scrollView.addSubview(headView) - // 2. 再添加scrollView - containerView.addSubview(scrollView) - - // 3. 再添加topView(topView必须添加在contentView的下面才可以实现悬浮效果) - containerView.addSubview(topView) - } - - func addNotificationObserver() { - NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(self.didSelectIndex(_:)), name: ScrollPageViewDidShowThePageNotification, object: nil) - - } - - func didSelectIndex(noti: NSNotification) { - let userInfo = noti.userInfo! - //注意键名是currentIndex - // 通知父控制器重新设置tableView的contentOffset.y - let currentIndex = userInfo["currentIndex"] as! Int - let childVc = childVcs[currentIndex] - currentChildVc = childVc - childVc.delegate?.setupTableViewOffSetYWhenViewWillAppear(childVc.tableView) - print(userInfo["currentIndex"]) - } - - deinit { - NSNotificationCenter.defaultCenter().removeObserver(self) - } - //1. 添加子控制器为PageTableViewController或者继承自他的Controller, - // 或者你可以参考PageTableViewController他里面的实现自行实现(可以使用UICollectionView)相关的代理和属性 并且设置delegate为self - - func setChildVcs() { - let vc1 = PageTableViewController() - - vc1.delegate = self - - let vc2 = Test1Controller() - vc2.delegate = self - - let vc3 = Test2Controller() - vc3.delegate = self - - let vc4 = Test3Controller() - vc4.delegate = self - - let vc5 = Test4Controller() - vc5.delegate = self - - let vc6 = Test5Controller() - vc6.delegate = self - - let vc7 = Test6Controller() - vc7.delegate = self - - let vc8 = Test7Controller() - vc8.delegate = self - - let vc9 = Test8Controller() - vc9.delegate = self - - let vc10 = Test9Controller() - vc10.delegate = self - - let vc11 = Test10Controller() - vc11.delegate = self - childVcs = [vc1, vc2, vc3,vc4, vc5, vc6, vc7, vc8, vc9, vc10, vc11] - - } - - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - } - -} - -// MARK:- UIScrollViewDelegate -extension Vc8Controller: UIScrollViewDelegate { - func scrollViewDidScroll(scrollView: UIScrollView) { - currentOffsetY = scrollView.contentOffset.y -// print(scrollView.contentOffset.y) - headView.frame.origin.y = currentOffsetY - if currentOffsetY < 0 { - containerView.frame.origin.y = -currentOffsetY - return - } - - if currentChildVc.tableView.contentOffset.y == currentOffsetY - defaultOffSetY { return } - currentChildVc.tableView.contentOffset.y = currentOffsetY - defaultOffSetY - } -} - -// MARK:- PageTableViewDelegate - 监控子控制器中的tableview的滚动和更新相关的UI -extension Vc8Controller: PageTableViewDelegate { - - // 设置将要显示的tableview的contentOffset.y - func setupTableViewOffSetYWhenViewWillAppear(scrollView: UIScrollView) { - - defer { - offSetY = scrollView.contentOffset.y - } -// print("\(offSetY) -------*\(scrollView.contentOffset.y)-----*\(-(naviBarHeight + segmentViewHeight)))") - if offSetY < -(naviBarHeight + segmentViewHeight) { - scrollView.contentOffset.y = offSetY - return - } else { - if scrollView.contentOffset.y < -(naviBarHeight + segmentViewHeight) { - - scrollView.contentOffset.y = -(naviBarHeight + segmentViewHeight) - // 使滑块停在navigationBar下面 - self.scrollView.frame.origin.y = naviBarHeight - headViewHeight - topView.frame.origin.y = naviBarHeight - return - } - return - - } - - - } - - // 根据子控制器的scrolView的偏移量来调整UI - func scrollViewIsScrolling(scrollView: UIScrollView) { - offSetY = scrollView.contentOffset.y - currentOffsetY = offSetY + defaultOffSetY -// print(offSetY) - - if offSetY > -(defaultOffSetY - headViewHeight) { - if topView.frame.origin.y == naviBarHeight { - return - } - // 使滑块停在navigationBar下面 - self.scrollView.frame.origin.y = naviBarHeight - headViewHeight - topView.frame.origin.y = naviBarHeight - return - } else if offSetY < -defaultOffSetY { - - topView.frame.origin.y = -offSetY - segmentViewHeight - self.scrollView.frame.origin.y = topView.frame.origin.y - headViewHeight - -// // 使headView停在navigationBar下面 -// if self.scrollView.frame.origin.y == naviBarHeight { -// return -// } -// self.scrollView.frame.origin.y = naviBarHeight -// topView.frame.origin.y = naviBarHeight + headViewHeight - return - } else { - - // 这里是让滑块和headView随着上下滚动 - //这种方式可能会出现同步的偏差问题 -// headView.frame.origin.y -= deltaY -// topView.frame.origin.y -= deltaY - // 这种方式会准确的同步位置 - topView.frame.origin.y = -offSetY - segmentViewHeight - self.scrollView.frame.origin.y = topView.frame.origin.y - headViewHeight - // 不加判断会触发self.scrollView的代理 相当于"递归", 会重复设置为相同的值 - if self.scrollView.contentOffset.y == currentOffsetY { - return - } - self.scrollView.contentOffset.y = currentOffsetY - } - - } - -} - - -// MARK:- ContentViewDelegate -extension Vc8Controller: ContentViewDelegate { - var segmentView: ScrollSegmentView { - return topView - } - -} - diff --git "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageCollectionViewController.swift" "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageCollectionViewController.swift" new file mode 100644 index 0000000..d89f456 --- /dev/null +++ "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageCollectionViewController.swift" @@ -0,0 +1,47 @@ +// +// PageCollectionViewController.swift +// ScrollViewController +// +// Created by ZeroJ on 16/8/31. +// Copyright © 2016年 ZeroJ. All rights reserved. +// + +import UIKit + + +class PageCollectionViewController: PageViewController { + static let cellID = "cellID" + lazy var collectionView: UICollectionView = { + let layout = UICollectionViewFlowLayout() + layout.scrollDirection = .Vertical + layout.itemSize = CGSize(width: 100.0, height: 100.0) + let collectionView = UICollectionView(frame: self.view.bounds, collectionViewLayout: layout) + collectionView.registerClass(UICollectionViewCell.self, forCellWithReuseIdentifier: PageCollectionViewController.cellID) + + collectionView.delegate = self + collectionView.dataSource = self + return collectionView + }() + + + override func viewDidLoad() { + super.viewDidLoad() + view.addSubview(collectionView) + } +} + +extension PageCollectionViewController: UICollectionViewDelegate, UICollectionViewDataSource { + func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int { + return 1 + } + + func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + return 100 + } + + func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell { + let cell = collectionView.dequeueReusableCellWithReuseIdentifier(PageCollectionViewController.cellID, forIndexPath: indexPath) + cell.backgroundColor = UIColor.redColor() + return cell + } +} diff --git "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/PageTableViewController.swift" "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageTableViewController.swift" old mode 100644 new mode 100755 similarity index 57% rename from "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/PageTableViewController.swift" rename to "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageTableViewController.swift" index 9fa027d..934f30c --- "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView)/PageTableViewController.swift" +++ "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageTableViewController.swift" @@ -29,53 +29,23 @@ // import UIKit -// MARK: PageTableViewDelegate -protocol PageTableViewDelegate: class { - func scrollViewIsScrolling(scrollView: UIScrollView) - func setupTableViewOffSetYWhenViewWillAppear(scrollView: UIScrollView) -} -class PageTableViewController: UIViewController { - - // 代理 - weak var delegate: PageTableViewDelegate? + +class PageTableViewController: PageViewController { // - var tableView: UITableView! - - func setupTableView() { - tableView = UITableView(frame: self.view.bounds, style: .Plain) + lazy var tableView: UITableView = { + let tableView = UITableView(frame: self.view.bounds, style: .Plain) tableView.delegate = self tableView.dataSource = self -// tableView.bounces = false - // 设置背景色 -// tableView.backgroundColor = UIColor.clearColor() -// let headView = UIView(frame: CGRect(x: 0.0, y: 0.0, width: view.bounds.size.width, height: defaultOffSetY)) -// tableView.tableHeaderView = headView - - // 设置tableview的内容偏移量 - tableView.contentInset = UIEdgeInsets(top: defaultOffSetY, left: 0, bottom: 0, right: 0) - self.view.addSubview(tableView) - } - - - /// !!! 不要在viewDidLoad()方法里面设置tableView或者collectionView的偏移量, 在初始化方法中设置偏移量,否则可能导致显示不正常 + return tableView + }() - init() { - super.init(nibName: nil, bundle: nil) - setupTableView() + override func viewDidLoad() { + super.viewDidLoad() + view.addSubview(tableView) } - required init?(coder aDecoder: NSCoder) { - super.init(coder: aDecoder) - } - - - - override func viewWillAppear(animated: Bool) { - super.viewWillAppear(animated) - print(zj_scrollPageController) - } override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() @@ -100,17 +70,18 @@ extension PageTableViewController: UITableViewDelegate, UITableViewDataSource { func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell { let cell = UITableViewCell(style: .Default, reuseIdentifier: "cellId") - cell.textLabel?.text = "未继承--------ceshishishihi" + cell.textLabel?.text = "--------ceshishishihi\(indexPath.row)" return cell } } +//// MARK: UIScrollViewDelegate - 监控tableview的滚动, 将改变通知给通知父控制器 +//extension PageTableViewController: UIScrollViewDelegate { +// func scrollViewDidScroll(scrollView: UIScrollView) { +// delegate?.scrollViewIsScrolling(scrollView) +// } +//} + -// MARK: UIScrollViewDelegate - 监控tableview的滚动, 将改变通知给通知父控制器 -extension PageTableViewController: UIScrollViewDelegate { - func scrollViewDidScroll(scrollView: UIScrollView) { - delegate?.scrollViewIsScrolling(scrollView) - } -} diff --git "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageViewController.swift" "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageViewController.swift" new file mode 100644 index 0000000..a92a67b --- /dev/null +++ "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/PageViewController.swift" @@ -0,0 +1,23 @@ +// +// PageViewController.swift +// ScrollViewController +// +// Created by ZeroJ on 16/8/31. +// Copyright © 2016年 ZeroJ. All rights reserved. +// + +import UIKit + +// MARK: PageTableViewDelegate +protocol PageViewDelegate: class { + func scrollViewIsScrolling(scrollView: UIScrollView) +} + + +class PageViewController: UIViewController, UIScrollViewDelegate { + // 代理 + weak var delegate: PageViewDelegate? + func scrollViewDidScroll(scrollView: UIScrollView) { + delegate?.scrollViewIsScrolling(scrollView) + } +} diff --git "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\270\215\344\275\277\347\224\250TableView)/Vc7Controller.swift" "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/Vc7Controller.swift" old mode 100644 new mode 100755 similarity index 67% rename from "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\270\215\344\275\277\347\224\250TableView)/Vc7Controller.swift" rename to "ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/Vc7Controller.swift" index 4aa0c46..a650e23 --- "a/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\270\215\344\275\277\347\224\250TableView)/Vc7Controller.swift" +++ "b/ScrollViewController/\346\234\211headView\347\232\204\346\225\210\346\236\234(\347\256\200\344\271\246\344\270\252\344\272\272\351\241\265\351\235\242,\344\275\277\347\224\250TableView, collectionView)/Vc7Controller.swift" @@ -30,15 +30,24 @@ import UIKit -class Vc7Controller: UIViewController { +let segmentViewHeight: CGFloat = 44.0 +let naviBarHeight: CGFloat = 64.0 +let headViewHeight: CGFloat = 200.0 -// let segmentViewHeight = 44.0 -// let naviBarHeight = 64.0 -// let headViewHeight = 200.0 - var offSetY: CGFloat = -defaultOffSetY +class CustomGestureTableView: UITableView { + + /// 返回true ---- 能同时识别多个手势 + func gestureRecognizer(gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWithGestureRecognizer otherGestureRecognizer: UIGestureRecognizer) -> Bool { + return (gestureRecognizer is UIPanGestureRecognizer) && (otherGestureRecognizer is UIPanGestureRecognizer) + } +} + +class Vc7Controller: UIViewController { + + var childScrollView: UIScrollView? // 懒加载 topView - lazy var topView: ScrollSegmentView! = {[unowned self] in + lazy var topView: ScrollSegmentView = {[unowned self] in var style = SegmentStyle() @@ -63,13 +72,18 @@ class Vc7Controller: UIViewController { } - - topView.backgroundColor = UIColor.lightGrayColor() return topView }() + lazy var headView: UIImageView = { + let headView = UIImageView(frame: CGRect(x: 0.0, y: 0.0, width: self.view.bounds.size.width, height: headViewHeight)) + headView.image = UIImage(named: "fruit") + return headView + }() + + // 懒加载contentView lazy var contentView: ContentView! = {[unowned self] in // 注意, 如果tableview是在storyboard中来的, 设置contentView的高度和这里不一样 @@ -80,8 +94,8 @@ class Vc7Controller: UIViewController { // 懒加载tableView, 注意如果是从storyBoard中连线过来的,那么注意设置contentView的高度有点不一样 // 或者在滚动的时候需要渐变navigationBar的时候,需要注意相关的tableView的frame设置和contentInset的设置 - lazy var tableView: UITableView = {[unowned self] in - let table = UITableView(frame: CGRect(x: 0.0, y: naviBarHeight, width: self.view.bounds.size.width, height: self.view.bounds.size.height - naviBarHeight), style: .Plain) + lazy var tableView: CustomGestureTableView = {[unowned self] in + let table = CustomGestureTableView(frame: CGRect(x: 0.0, y: naviBarHeight, width: self.view.bounds.size.width, height: self.view.bounds.size.height - naviBarHeight), style: .Plain) table.delegate = self table.dataSource = self return table @@ -89,7 +103,6 @@ class Vc7Controller: UIViewController { }() - var test: ((scroll: UIScrollView) -> Void)? override func viewDidLoad() { super.viewDidLoad() title = "简书个人主页" @@ -98,66 +111,54 @@ class Vc7Controller: UIViewController { automaticallyAdjustsScrollViewInsets = false // 设置tableView的headView - tableView.tableHeaderView = setTableViewHeadView() + tableView.tableHeaderView = headView tableView.tableFooterView = UIView() // 设置cell行高为contentView的高度 tableView.rowHeight = contentView.bounds.size.height // 设置tableView的sectionHeadHeight为segmentViewHeight tableView.sectionHeaderHeight = CGFloat(segmentViewHeight) + tableView.showsVerticalScrollIndicator = false view.addSubview(tableView) - } - - - func setTableViewHeadView() -> UIImageView { - let headView = UIImageView(frame: CGRect(x: 0.0, y: 0.0, width: view.bounds.size.width, height: headViewHeight)) - headView.image = UIImage(named: "fruit") - return headView + + let normalRefresher = NormalAnimator.normalAnimator() + normalRefresher.lastRefreshTimeKey = "vc7Header" + + /// 添加下拉刷新 + tableView.zj_addRefreshHeader(normalRefresher) { + /// 模拟延时 + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(2.0*Double(NSEC_PER_SEC))), dispatch_get_main_queue(), { [weak self] in + let strongSelf = self + guard let `self` = strongSelf else { return } + + self.tableView.zj_stopHeaderAnimation() + }) + + } + } func setChildVcs() -> [UIViewController] { - let vc1 = storyboard!.instantiateViewControllerWithIdentifier("test") - vc1.title = "国内头条" - let vc2 = UIViewController() - vc2.view.backgroundColor = UIColor.greenColor() - vc2.title = "国际要闻" - - let vc3 = UIViewController() - vc3.view.backgroundColor = UIColor.redColor() - vc3.title = "趣事" - - let vc4 = UIViewController() - vc4.view.backgroundColor = UIColor.yellowColor() - vc4.title = "囧图" - - let vc5 = UIViewController() - vc5.view.backgroundColor = UIColor.lightGrayColor() - vc5.title = "明星八卦" - - let vc6 = UIViewController() - vc6.view.backgroundColor = UIColor.brownColor() - vc6.title = "爱车" - let vc7 = UIViewController() - vc7.view.backgroundColor = UIColor.orangeColor() - vc7.title = "国防要事" + let titles = ["国内头条", "国际要闻", "趣事", "囧图", "明星八卦", "爱车", "国防要事", "科技频道", "手机专页"] + var childVcs: [UIViewController] = [] - let vc8 = UIViewController() - vc8.view.backgroundColor = UIColor.blueColor() - vc8.title = "科技频道" - - let vc9 = UIViewController() - vc9.view.backgroundColor = UIColor.brownColor() - vc9.title = "手机专页" - - let vc10 = UIViewController() - vc10.view.backgroundColor = UIColor.orangeColor() - vc10.title = "风景图" - - let vc11 = UIViewController() - vc11.view.backgroundColor = UIColor.blueColor() - vc11.title = "段子" + for (index, title) in titles.enumerate() { + let childVc: PageViewController + + if index % 2 == 0 { + childVc = PageTableViewController() + childVc.delegate = self + } + else { + childVc = PageCollectionViewController() + childVc.delegate = self + } + + childVc.title = title + childVcs.append(childVc) + } - return [vc1, vc2, vc3,vc4, vc5, vc6, vc7, vc8, vc9, vc10, vc11] + return childVcs } override func didReceiveMemoryWarning() { @@ -168,6 +169,33 @@ class Vc7Controller: UIViewController { } +extension Vc7Controller: PageViewDelegate { + func scrollViewIsScrolling(scrollView: UIScrollView) { + /// 记录便于处理联动 + childScrollView = scrollView + + if tableView.contentOffset.y < headViewHeight { + scrollView.contentOffset = CGPoint.zero + scrollView.showsVerticalScrollIndicator = false + } + else { + tableView.contentOffset.y = headViewHeight + scrollView.showsVerticalScrollIndicator = true + } + + } +} + +// MARK:- UIScrollViewDelegate 这里的代理可以监控tableView的滚动, 在滚动的时候就可以做一些事情, 比如使navigationBar渐变, 或者像简书一样改变头像的属性 +extension Vc7Controller: UIScrollViewDelegate { + func scrollViewDidScroll(scrollView: UIScrollView) { + if childScrollView?.contentOffset.y > 0 { + tableView.contentOffset.y = headViewHeight + } + + } +} + // MARK:- UITableViewDataSource UITableViewDelegate extension Vc7Controller: UITableViewDelegate, UITableViewDataSource { @@ -194,13 +222,6 @@ extension Vc7Controller: UITableViewDelegate, UITableViewDataSource { } -// MARK:- UIScrollViewDelegate 这里的代理可以监控tableView的滚动, 在滚动的时候就可以做一些事情, 比如使navigationBar渐变, 或者像简书一样改变头像的属性 -extension Vc7Controller: UIScrollViewDelegate { - func scrollViewDidScroll(scrollView: UIScrollView) { - print("gundong --------") - } -} - // MARK:- ContentViewDelegate extension Vc7Controller: ContentViewDelegate { var segmentView: ScrollSegmentView { diff --git "a/ScrollViewController/\346\240\207\351\242\230\344\270\215\346\273\232\345\212\250+\351\201\256\347\233\226+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc5Controller.swift" "b/ScrollViewController/\346\240\207\351\242\230\344\270\215\346\273\232\345\212\250+\351\201\256\347\233\226+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc5Controller.swift" old mode 100644 new mode 100755 diff --git "a/ScrollViewController/\346\273\232\345\212\250\346\235\241+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc3Controller.swift" "b/ScrollViewController/\346\273\232\345\212\250\346\235\241+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc3Controller.swift" old mode 100644 new mode 100755 diff --git "a/ScrollViewController/\347\274\251\346\224\276+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/vc1Controller.swift" "b/ScrollViewController/\347\274\251\346\224\276+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/vc1Controller.swift" old mode 100644 new mode 100755 diff --git "a/ScrollViewController/\350\207\252\345\256\232\344\271\211segmentView\345\222\214contentView\344\275\215\347\275\256\347\232\204\346\225\210\346\236\234)/Vc6Controller.swift" "b/ScrollViewController/\350\207\252\345\256\232\344\271\211segmentView\345\222\214contentView\344\275\215\347\275\256\347\232\204\346\225\210\346\236\234)/Vc6Controller.swift" old mode 100644 new mode 100755 diff --git "a/ScrollViewController/\351\201\256\347\233\226+\347\274\251\346\224\276+\346\262\241\346\234\211\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc4Controller.swift" "b/ScrollViewController/\351\201\256\347\233\226+\347\274\251\346\224\276+\346\262\241\346\234\211\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc4Controller.swift" old mode 100644 new mode 100755 diff --git "a/ScrollViewController/\351\201\256\347\233\226+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc2Controller.swift" "b/ScrollViewController/\351\201\256\347\233\226+\351\242\234\350\211\262\346\270\220\345\217\230 \346\225\210\346\236\234/Vc2Controller.swift" old mode 100644 new mode 100755 diff --git a/ScrollViewControllerTests/Info.plist b/ScrollViewControllerTests/Info.plist old mode 100644 new mode 100755 diff --git a/ScrollViewControllerTests/ScrollViewControllerTests.swift b/ScrollViewControllerTests/ScrollViewControllerTests.swift old mode 100644 new mode 100755 diff --git a/ScrollViewControllerUITests/Info.plist b/ScrollViewControllerUITests/Info.plist old mode 100644 new mode 100755 diff --git a/ScrollViewControllerUITests/ScrollViewControllerUITests.swift b/ScrollViewControllerUITests/ScrollViewControllerUITests.swift old mode 100644 new mode 100755 From 8c9a7a79ab43a04ae8fe87fe8430b415e989642d Mon Sep 17 00:00:00 2001 From: ZeroJ Date: Mon, 12 Sep 2016 23:23:02 +0800 Subject: [PATCH 2/8] readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7a0540a..7030147 100755 --- a/README.md +++ b/README.md @@ -243,8 +243,8 @@ pod 'ScrollPageView', '~> 0.1.4' -####如果对您有帮助,请随手给个star鼓励一下 - +####如果对你有帮助,请随手给个star +####如果你在使用中遇到问题: 可以联系我QQ: 854136959 ## License ScrollPageView is released under the MIT license. See LICENSE for details. From 9a24e83f4590e2884ebbda086e29ba215677a69a Mon Sep 17 00:00:00 2001 From: ZeroJ Date: Sun, 23 Oct 2016 23:20:23 +0800 Subject: [PATCH 3/8] add a collectionView's panGesture delegate method to handle the gesture begin --- ScrollViewController/ExtraView.xib | 2 +- .../ScrollPageView/ContentView.swift | 74 +++++++++++++------ .../SelectionCollectionViewCell.xib | 2 +- 3 files changed, 52 insertions(+), 26 deletions(-) diff --git a/ScrollViewController/ExtraView.xib b/ScrollViewController/ExtraView.xib index 82d366e..23058a5 100755 --- a/ScrollViewController/ExtraView.xib +++ b/ScrollViewController/ExtraView.xib @@ -1,5 +1,5 @@ - + diff --git a/ScrollViewController/ScrollPageView/ContentView.swift b/ScrollViewController/ScrollPageView/ContentView.swift index 9702fe6..7b42668 100755 --- a/ScrollViewController/ScrollPageView/ContentView.swift +++ b/ScrollViewController/ScrollPageView/ContentView.swift @@ -31,6 +31,22 @@ import UIKit +public class CustomGestureCollectionView: UICollectionView { + + var panGestureShouldBeginClosure: ((panGesture: UIPanGestureRecognizer, collectionView: CustomGestureCollectionView) -> Bool)? + func setupPanGestureShouldBeginClosure(closure: (panGesture: UIPanGestureRecognizer, collectionView: CustomGestureCollectionView) -> Bool) { + panGestureShouldBeginClosure = closure + } + override public func gestureRecognizerShouldBegin(gestureRecognizer: UIGestureRecognizer) -> Bool { + if let panGestureShouldBeginClosure = panGestureShouldBeginClosure, let panGesture = gestureRecognizer as? UIPanGestureRecognizer { + return panGestureShouldBeginClosure(panGesture: panGesture, collectionView: self) + } + else { + return super.gestureRecognizerShouldBegin(gestureRecognizer) + } + } +} + public class ContentView: UIView { static let cellId = "cellId" @@ -47,10 +63,10 @@ public class ContentView: UIView { private weak var parentViewController: UIViewController? public weak var delegate: ContentViewDelegate? - private(set) lazy var collectionView: UICollectionView = {[weak self] in + private(set) lazy var collectionView: CustomGestureCollectionView = {[weak self] in let flowLayout = UICollectionViewFlowLayout() - let collection = UICollectionView(frame: CGRectZero, collectionViewLayout: flowLayout) + let collection = CustomGestureCollectionView(frame: CGRectZero, collectionViewLayout: flowLayout) if let strongSelf = self { flowLayout.itemSize = strongSelf.bounds.size @@ -68,7 +84,6 @@ public class ContentView: UIView { collection.delegate = strongSelf collection.dataSource = strongSelf collection.registerClass(UICollectionViewCell.self, forCellWithReuseIdentifier: ContentView.cellId) - } return collection }() @@ -104,13 +119,27 @@ public class ContentView: UIView { addSubview(collectionView) // 设置naviVVc手势代理, 处理pop手势 - if let naviParentViewController = self.parentViewController?.parentViewController as? UINavigationController, let popGesture = naviParentViewController.interactivePopGestureRecognizer { - if naviParentViewController.viewControllers.count == 1 { return }// 如果是第一个不要设置代理 - naviParentViewController.interactivePopGestureRecognizer?.delegate = self - // 优先执行naviParentViewController.interactivePopGestureRecognizer的手势 - // 在代理方法中会判断是否真的执行, 不执行的时候就执行scrollView的滚动手势 - collectionView.panGestureRecognizer.requireGestureRecognizerToFail(popGesture) - + if let naviParentViewController = self.parentViewController?.parentViewController as? UINavigationController { + if naviParentViewController.viewControllers.count == 1 { return } + collectionView.setupPanGestureShouldBeginClosure({[weak self] (panGesture, collectionView) -> Bool in + + let strongSelf = self + guard let `self` = strongSelf else { return false} + + let transionX = panGesture.velocityInView(panGesture.view).x + + if collectionView.contentOffset.x == 0 && transionX > 0 { + naviParentViewController.interactivePopGestureRecognizer?.enabled = true + + } + else { + naviParentViewController.interactivePopGestureRecognizer?.enabled = false + + } + return self.delegate?.contentViewShouldBeginPanGesture(panGesture, collectionView: collectionView) ?? true + + + }) } } @@ -123,7 +152,8 @@ public class ContentView: UIView { override public func layoutSubviews() { super.layoutSubviews() collectionView.frame = bounds - + let vc = childVcs[currentIndex] + vc.view.frame = bounds } deinit { @@ -227,12 +257,14 @@ extension ContentView: UIScrollViewDelegate { final public func scrollViewDidEndScrollingAnimation(scrollView: UIScrollView) { delegate?.contentViewDidEndDisPlay(collectionView) - } final public func scrollViewDidEndDragging(scrollView: UIScrollView, willDecelerate decelerate: Bool) { let currentIndex = Int(floor(scrollView.contentOffset.x / bounds.size.width)) + if let naviParentViewController = self.parentViewController?.parentViewController as? UINavigationController { + naviParentViewController.interactivePopGestureRecognizer?.enabled = true + } delegate?.contentViewDidEndDrag(scrollView) print(scrollView.contentOffset.x) //快速滚动的时候第一页和最后一页(scroll too fast will not call 'scrollViewDidEndDecelerating') @@ -293,23 +325,13 @@ extension ContentView: UIScrollViewDelegate { } -// MARK: - UIGestureRecognizerDelegate -extension ContentView: UIGestureRecognizerDelegate { - public override func gestureRecognizerShouldBegin(gestureRecognizer: UIGestureRecognizer) -> Bool { - // handle the navigationController's pop gesture - if let naviParentViewController = self.parentViewController?.parentViewController as? UINavigationController where naviParentViewController.visibleViewController == parentViewController { // 当显示的是ScrollPageView的时候 只在第一个tag处执行pop手势 - return collectionView.contentOffset.x == 0 - } - return true - } -} - public protocol ContentViewDelegate: class { /// 有默认实现, 不推荐重写(override is not recommoned) func contentViewMoveToIndex(fromIndex: Int, toIndex: Int, progress: CGFloat) /// 有默认实现, 不推荐重写(override is not recommoned) func contentViewDidEndMoveToIndex(fromIndex: Int , toIndex: Int) - + func contentViewShouldBeginPanGesture(panGesture: UIPanGestureRecognizer , collectionView: CustomGestureCollectionView) -> Bool; + func contentViewDidBeginMove(scrollView: UIScrollView) func contentViewIsScrolling(scrollView: UIScrollView) @@ -335,6 +357,10 @@ extension ContentViewDelegate { public func contentViewDidBeginMove(scrollView: UIScrollView) { } + public func contentViewShouldBeginPanGesture(panGesture: UIPanGestureRecognizer , collectionView: CustomGestureCollectionView) -> Bool { + return true + } + // 内容每次滚动完成时调用, 确定title和其他的控件的位置 public func contentViewDidEndMoveToIndex(fromIndex: Int , toIndex: Int) { diff --git a/ScrollViewController/SelectionCollectionViewCell.xib b/ScrollViewController/SelectionCollectionViewCell.xib index 5754d39..4f96c63 100755 --- a/ScrollViewController/SelectionCollectionViewCell.xib +++ b/ScrollViewController/SelectionCollectionViewCell.xib @@ -1,5 +1,5 @@ - + From 705722f597d1c1d7fe05b57da25bb4ccfd49efbe Mon Sep 17 00:00:00 2001 From: kemchenj Date: Wed, 26 Oct 2016 22:04:55 +0800 Subject: [PATCH 4/8] =?UTF-8?q?1.=20=E5=86=85=E9=83=A8=E6=89=80=E6=9C=89?= =?UTF-8?q?=20ScrollView=20=E5=8F=8A=E5=AD=90=E7=B1=BB=E7=9A=84=20scrollsT?= =?UTF-8?q?oTop=20=E9=83=BD=E8=AE=BE=E7=BD=AE=E4=B8=BA=20false,=20?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=8E=20childVC=20=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=8F=E8=BF=94=E5=9B=9E=E6=9C=80=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E6=89=8B=E5=8A=BF=E5=86=B2=E7=AA=81=202.=20=E7=BB=99?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=9A=B4=E9=9C=B2=E4=B8=80=E4=BA=9B=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ScrollPageView/ContentView.swift | 7 ++++++- ScrollPageView/ScrollPageView.swift | 4 ++++ ScrollPageView/ScrollSegmentView.swift | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ScrollPageView/ContentView.swift b/ScrollPageView/ContentView.swift index 1f526f5..9bde553 100755 --- a/ScrollPageView/ContentView.swift +++ b/ScrollPageView/ContentView.swift @@ -41,7 +41,11 @@ public class ContentView: UIView { /// 用来记录开始滚动的offSetX private var oldOffSetX:CGFloat = 0.0 private var oldIndex = 0 - private var currentIndex = 1 + public private(set) var currentIndex = 1 + /// 当前显示的子控制器 + public var currentChildVc: UIViewController { + return childVcs[currentIndex] + } // 这里使用weak 避免循环引用 private weak var parentViewController: UIViewController? @@ -51,6 +55,7 @@ public class ContentView: UIView { let flowLayout = UICollectionViewFlowLayout() let collection = UICollectionView(frame: CGRectZero, collectionViewLayout: flowLayout) + collection.scrollsToTop = false if let strongSelf = self { flowLayout.itemSize = strongSelf.bounds.size diff --git a/ScrollPageView/ScrollPageView.swift b/ScrollPageView/ScrollPageView.swift index 5d48c0a..b5e1039 100755 --- a/ScrollPageView/ScrollPageView.swift +++ b/ScrollPageView/ScrollPageView.swift @@ -45,6 +45,10 @@ public class ScrollPageView: UIView { private var titlesArray: [String] = [] /// 所有的子控制器 private var childVcs: [UIViewController] = [] + /// 当前呈现子控制器 + public var currentChildVc: UIViewController { + return contentView.currentChildVc + } // 这里使用weak避免循环引用 private weak var parentViewController: UIViewController? diff --git a/ScrollPageView/ScrollSegmentView.swift b/ScrollPageView/ScrollSegmentView.swift index e2d6477..e84a0ff 100755 --- a/ScrollPageView/ScrollSegmentView.swift +++ b/ScrollPageView/ScrollSegmentView.swift @@ -64,6 +64,7 @@ public class ScrollSegmentView: UIView { private lazy var scrollView: UIScrollView = { let scrollV = UIScrollView() + scrollV.scrollsToTop = false scrollV.showsHorizontalScrollIndicator = false scrollV.bounces = true scrollV.pagingEnabled = false From 860a69e8856d3dbc5da0b3064547c9ac08ab480a Mon Sep 17 00:00:00 2001 From: ZeroJ Date: Sat, 5 Nov 2016 11:08:24 +0800 Subject: [PATCH 5/8] readme --- .../ScrollPageView/ContentView.swift | 31 +++++++------- .../ScrollPageView/ScrollPageView.swift | 4 +- .../ScrollPageView/ScrollSegmentView.swift | 42 +++++++++---------- .../ScrollPageView/SegmentStyle.swift | 2 +- 4 files changed, 38 insertions(+), 41 deletions(-) diff --git a/ScrollViewController/ScrollPageView/ContentView.swift b/ScrollViewController/ScrollPageView/ContentView.swift index 7b42668..02ed2d4 100755 --- a/ScrollViewController/ScrollPageView/ContentView.swift +++ b/ScrollViewController/ScrollPageView/ContentView.swift @@ -55,7 +55,7 @@ public class ContentView: UIView { /// 用来判断是否是点击了title, 点击了就不要调用scrollview的代理来进行相关的计算 private var forbidTouchToAdjustPosition = false /// 用来记录开始滚动的offSetX - private var oldOffSetX:CGFloat = 0.0 + private var beginOffSetX:CGFloat = 0.0 private var oldIndex = 0 private var currentIndex = 1 @@ -63,13 +63,11 @@ public class ContentView: UIView { private weak var parentViewController: UIViewController? public weak var delegate: ContentViewDelegate? - private(set) lazy var collectionView: CustomGestureCollectionView = {[weak self] in + private(set) lazy var collectionView: CustomGestureCollectionView = { let flowLayout = UICollectionViewFlowLayout() let collection = CustomGestureCollectionView(frame: CGRectZero, collectionViewLayout: flowLayout) - - if let strongSelf = self { - flowLayout.itemSize = strongSelf.bounds.size + flowLayout.itemSize = self.bounds.size flowLayout.scrollDirection = .Horizontal flowLayout.minimumLineSpacing = 0 flowLayout.minimumInteritemSpacing = 0 @@ -77,14 +75,13 @@ public class ContentView: UIView { collection.scrollsToTop = false collection.bounces = false collection.showsHorizontalScrollIndicator = false - collection.frame = strongSelf.bounds + collection.frame = self.bounds collection.collectionViewLayout = flowLayout collection.pagingEnabled = true // 如果不设置代理, 将不会调用scrollView的delegate方法 - collection.delegate = strongSelf - collection.dataSource = strongSelf + collection.delegate = self + collection.dataSource = self collection.registerClass(UICollectionViewCell.self, forCellWithReuseIdentifier: ContentView.cellId) - } return collection }() @@ -118,7 +115,7 @@ public class ContentView: UIView { // 在这里调用了懒加载的collectionView, 那么之前设置的self.frame将会用于collectionView,如果在layoutsubviews()里面没有相关的处理frame的操作, 那么将导致内容显示不正常 addSubview(collectionView) - // 设置naviVVc手势代理, 处理pop手势 + // 设置naviVVc手势代理, 处理pop手势 只在第一个页面的时候执行系统的滑动返回手势 if let naviParentViewController = self.parentViewController?.parentViewController as? UINavigationController { if naviParentViewController.viewControllers.count == 1 { return } collectionView.setupPanGestureShouldBeginClosure({[weak self] (panGesture, collectionView) -> Bool in @@ -185,6 +182,7 @@ extension ContentView { childVc.view.removeFromSuperview() childVc.removeFromParentViewController() } + childVcs.removeAll() // setting the new childVcs childVcs = newChildVcs @@ -205,8 +203,6 @@ extension ContentView { } } - - //MARK:- UICollectionViewDelegate, UICollectionViewDataSource extension ContentView: UICollectionViewDelegate, UICollectionViewDataSource { @@ -278,12 +274,14 @@ extension ContentView: UIScrollViewDelegate { // 手指开始拖的时候, 记录此时的offSetX, 并且表示不是点击title切换的内容(remenber the begin offsetX) final public func scrollViewWillBeginDragging(scrollView: UIScrollView) { /// 用来判断方向 - oldOffSetX = scrollView.contentOffset.x + beginOffSetX = scrollView.contentOffset.x delegate?.contentViewDidBeginMove(collectionView) forbidTouchToAdjustPosition = false } + + // 需要实时更新滚动的进度和移动的方向及下标 以便于外部使用 (compute the index and progress) final public func scrollViewDidScroll(scrollView: UIScrollView) { let offSetX = scrollView.contentOffset.x @@ -293,16 +291,17 @@ extension ContentView: UIScrollViewDelegate { } let temp = offSetX / bounds.size.width + // 滚动的进度 -- 取小数位 var progress = temp - floor(temp) - - if offSetX - oldOffSetX >= 0 {// 手指左滑, 滑块右移 + // 根据滚动的方向 + if offSetX - beginOffSetX >= 0 {// 手指左滑, 滑块右移 oldIndex = Int(floor(offSetX / bounds.size.width)) currentIndex = oldIndex + 1 if currentIndex >= childVcs.count { currentIndex = oldIndex - 1 } - if offSetX - oldOffSetX == scrollView.bounds.size.width {// 滚动完成 + if offSetX - beginOffSetX == scrollView.bounds.size.width {// 滚动完成 progress = 1.0; currentIndex = oldIndex; } diff --git a/ScrollViewController/ScrollPageView/ScrollPageView.swift b/ScrollViewController/ScrollPageView/ScrollPageView.swift index 93d0418..baabedf 100755 --- a/ScrollViewController/ScrollPageView/ScrollPageView.swift +++ b/ScrollViewController/ScrollPageView/ScrollPageView.swift @@ -40,8 +40,8 @@ public class ScrollPageView: UIView { } } - private var segView: ScrollSegmentView! - private var contentView: ContentView! + private(set) var segView: ScrollSegmentView! + private(set) var contentView: ContentView! private var titlesArray: [String] = [] /// 所有的子控制器 private var childVcs: [UIViewController] = [] diff --git a/ScrollViewController/ScrollPageView/ScrollSegmentView.swift b/ScrollViewController/ScrollPageView/ScrollSegmentView.swift index dffc3cf..61fe9d4 100755 --- a/ScrollViewController/ScrollPageView/ScrollSegmentView.swift +++ b/ScrollViewController/ScrollPageView/ScrollSegmentView.swift @@ -62,7 +62,7 @@ public class ScrollSegmentView: UIView { private var titlesWidthArray: [CGFloat] = [] /// 所有的标题 private var titles:[String] - + /// 管理标题的滚动 private lazy var scrollView: UIScrollView = { let scrollV = UIScrollView() scrollV.showsHorizontalScrollIndicator = false @@ -85,10 +85,9 @@ public class ScrollSegmentView: UIView { return nil } let cover = UIView() - cover.layer.cornerRadius = CGFloat(self.segmentStyle.coverCornerRadius) + cover.layer.cornerRadius = self.segmentStyle.coverCornerRadius // 这里只有一个cover 需要设置圆角, 故不用考虑离屏渲染的消耗, 直接设置 masksToBounds 来设置圆角 cover.layer.masksToBounds = true - return cover }() @@ -131,7 +130,6 @@ public class ScrollSegmentView: UIView { } else { fatalError("设置普通状态的文字颜色时 请使用RGB空间的颜色值") } - }() private lazy var selectedTitleColorRgb: (r: CGFloat, g: CGFloat, b: CGFloat) = { @@ -146,14 +144,8 @@ public class ScrollSegmentView: UIView { //FIXME: 如果提供的不是RGB空间的颜色值就可能crash private func getColorRGB(color: UIColor) -> (r: CGFloat, g: CGFloat, b: CGFloat)? { -// let colorString = String(color) -// let colorArr = colorString.componentsSeparatedByString(" ") -// print(colorString) -// guard let r = Int(colorArr[1]), let g = Int(colorArr[2]), let b = Int(colorArr[3]) else { -// return nil -// } - +// print(UIColor.getRed(color)) let numOfComponents = CGColorGetNumberOfComponents(color.CGColor) if numOfComponents == 4 { let componemts = CGColorGetComponents(color.CGColor) @@ -198,11 +190,13 @@ public class ScrollSegmentView: UIView { if let extraBtn = extraButton { addSubview(extraBtn) } - // 设置了frame之后可以直接设置其他的控件的frame了, 不需要在layoutsubView()里面设置 + // 根据titles添加相应的控件 setupTitles() + // 设置frame setupUI() } + required public init?(coder aDecoder: NSCoder) { fatalError("init(coder:) has not been implemented") } @@ -263,6 +257,8 @@ extension ScrollSegmentView { } } + + //MARK: - private helper extension ScrollSegmentView { private func setupTitles() { @@ -276,13 +272,16 @@ extension ScrollSegmentView { label.textAlignment = .Center label.userInteractionEnabled = true + // 添加点击手势 let tapGes = UITapGestureRecognizer(target: self, action: #selector(self.titleLabelOnClick(_:))) label.addGestureRecognizer(tapGes) - + // 计算文字尺寸 let size = (title as NSString).boundingRectWithSize(CGSizeMake(CGFloat(MAXFLOAT), 0.0), options: .UsesLineFragmentOrigin, attributes: [NSFontAttributeName: label.font], context: nil) - + // 缓存文字宽度 titlesWidthArray.append(size.width) + // 缓存label labelsArray.append(label) + // 添加label scrollView.addSubview(label) } } @@ -450,14 +449,16 @@ extension ScrollSegmentView { let oldLabel = labelsArray[oldIndex] as! CustomLabel let currentLabel = labelsArray[currentIndex] as! CustomLabel - // 需要改变的距离 和 宽度 + // 从一个label滚动到另一个label 需要改变的总的距离 和 总的宽度 let xDistance = currentLabel.frame.origin.x - oldLabel.frame.origin.x let wDistance = currentLabel.frame.size.width - oldLabel.frame.size.width - // 设置滚动条位置 + // 设置滚动条位置 = 最初的位置 + 改变的总距离 * 进度 scrollLine?.frame.origin.x = oldLabel.frame.origin.x + xDistance * progress + // 设置滚动条宽度 = 最初的宽度 + 改变的总宽度 * 进度 scrollLine?.frame.size.width = oldLabel.frame.size.width + wDistance * progress + // 设置 cover位置 if segmentStyle.scrollTitle { coverLayer?.frame.origin.x = oldLabel.frame.origin.x + xDistance * progress - CGFloat(xGap) @@ -466,7 +467,7 @@ extension ScrollSegmentView { coverLayer?.frame.origin.x = oldLabel.frame.origin.x + xDistance * progress coverLayer?.frame.size.width = oldLabel.frame.size.width + wDistance * progress } - + // print(progress) // 文字颜色渐变 if segmentStyle.gradualChangeTitleColor { @@ -475,7 +476,6 @@ extension ScrollSegmentView { currentLabel.textColor = UIColor(red: normalColorRgb.r - rgbDelta.deltaR * progress, green: normalColorRgb.g - rgbDelta.deltaG * progress, blue: normalColorRgb.b - rgbDelta.deltaB * progress, alpha: 1.0) - } @@ -503,9 +503,10 @@ extension ScrollSegmentView { $0.element.textColor = self.segmentStyle.normalTitleColor } } - + // 目标是让currentLabel居中显示 var offSetX = currentLabel.center.x - currentWidth / 2 if offSetX < 0 { + // 最小为0 offSetX = 0 } // considering the exist of extraButton @@ -543,9 +544,6 @@ extension ScrollSegmentView { } } - - - public class CustomLabel: UILabel { /// 用来记录当前label的缩放比例 public var currentTransformSx:CGFloat = 1.0 { diff --git a/ScrollViewController/ScrollPageView/SegmentStyle.swift b/ScrollViewController/ScrollPageView/SegmentStyle.swift index 3b88088..e34c5ce 100755 --- a/ScrollViewController/ScrollPageView/SegmentStyle.swift +++ b/ScrollViewController/ScrollPageView/SegmentStyle.swift @@ -85,7 +85,7 @@ public struct SegmentStyle { /// 遮盖的背景颜色 public var coverBackgroundColor = UIColor.lightGrayColor() /// 遮盖圆角 - public var coverCornerRadius = 14.0 + public var coverCornerRadius: CGFloat = 14.0 /// cover的高度 默认28 public var coverHeight: CGFloat = 28.0 From 96afc3453d58beb03ad0cfdd9c8121d42d18624e Mon Sep 17 00:00:00 2001 From: ZeroJ Date: Sat, 5 Nov 2016 11:11:29 +0800 Subject: [PATCH 6/8] readme --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7030147..35b2839 100755 --- a/README.md +++ b/README.md @@ -243,8 +243,14 @@ pod 'ScrollPageView', '~> 0.1.4' -####如果对你有帮助,请随手给个star -####如果你在使用中遇到问题: 可以联系我QQ: 854136959 +> 这是我写的这本书籍中的一个demo, 如果你希望知道具体的实现过程和其他的一些常用效果的实现, 那么你应该能轻易在网上下载到免费的盗版书籍. + +> 当然作为本书的写作者, 还是希望有人能支持正版书籍. 如果你有意购买书籍, 在[这篇文章中](http://www.jianshu.com/p/510500f3aebd), 介绍了书籍中所有的内容和书籍适合阅读的人群, 和一些试读章节, 以及购买链接. 在你准备购买之前, 请一定读一读里面的说明. 否则, 如果不适合你阅读, 虽然书籍售价35不是很贵, 但是也是一笔损失. + + +> 如果你希望联系到我, 你可以联系QQ:597769272 +> 或者通过[简书](http://www.jianshu.com/users/fb31a3d1ec30/latest_articles)联系到我 + ## License ScrollPageView is released under the MIT license. See LICENSE for details. From fafe536b8bac14f24bc7eabe5500fb54b1ac4248 Mon Sep 17 00:00:00 2001 From: ZeroJ Date: Sun, 6 Nov 2016 17:07:31 +0800 Subject: [PATCH 7/8] readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 35b2839..dce03b8 100755 --- a/README.md +++ b/README.md @@ -248,8 +248,8 @@ pod 'ScrollPageView', '~> 0.1.4' > 当然作为本书的写作者, 还是希望有人能支持正版书籍. 如果你有意购买书籍, 在[这篇文章中](http://www.jianshu.com/p/510500f3aebd), 介绍了书籍中所有的内容和书籍适合阅读的人群, 和一些试读章节, 以及购买链接. 在你准备购买之前, 请一定读一读里面的说明. 否则, 如果不适合你阅读, 虽然书籍售价35不是很贵, 但是也是一笔损失. -> 如果你希望联系到我, 你可以联系QQ:597769272 -> 或者通过[简书](http://www.jianshu.com/users/fb31a3d1ec30/latest_articles)联系到我 +> 如果你希望联系到我, 可以通过[简书](http://www.jianshu.com/users/fb31a3d1ec30/latest_articles)联系到我 + ## License From dc9536e301c971e8e20bc2815a3fe136665f0885 Mon Sep 17 00:00:00 2001 From: ZeroJ <854136959@qq.com> Date: Wed, 9 Nov 2016 11:55:15 +0800 Subject: [PATCH 8/8] readne --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dce03b8..d2958d0 100755 --- a/README.md +++ b/README.md @@ -243,9 +243,9 @@ pod 'ScrollPageView', '~> 0.1.4' -> 这是我写的这本书籍中的一个demo, 如果你希望知道具体的实现过程和其他的一些常用效果的实现, 那么你应该能轻易在网上下载到免费的盗版书籍. +> 这是我写的这本书籍中的一个demo, 如果你希望知道具体的实现过程和其他的一些常用效果的实现, 那么你应该能轻易在网上下载到免费的盗版书籍. -> 当然作为本书的写作者, 还是希望有人能支持正版书籍. 如果你有意购买书籍, 在[这篇文章中](http://www.jianshu.com/p/510500f3aebd), 介绍了书籍中所有的内容和书籍适合阅读的人群, 和一些试读章节, 以及购买链接. 在你准备购买之前, 请一定读一读里面的说明. 否则, 如果不适合你阅读, 虽然书籍售价35不是很贵, 但是也是一笔损失. +> 当然作为本书的写作者, 还是希望有人能支持正版书籍. 如果你有意购买书籍, 在[这篇文章中](http://www.jianshu.com/p/510500f3aebd), 介绍了书籍中所有的内容和书籍适合阅读的人群, 和一些试读章节, 以及购买链接. 在你准备[购买](http://www.qingdan.us/product/13)之前, 请一定读一读里面的说明. 否则, 如果不适合你阅读, 虽然书籍售价35不是很贵, 但是也是一笔损失. > 如果你希望联系到我, 可以通过[简书](http://www.jianshu.com/users/fb31a3d1ec30/latest_articles)联系到我