diff --git a/Podfile b/Podfile index 2e3c86f2..97e1231d 100644 --- a/Podfile +++ b/Podfile @@ -1,4 +1,6 @@ platform :ios, '7.0' target 'SDCycleScrollView' +#use_frameworks! + pod 'SDWebImage', '~> 4.0.0' diff --git a/Podfile.lock b/Podfile.lock index ce54f5a2..5138323b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,6 +9,6 @@ DEPENDENCIES: SPEC CHECKSUMS: SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41 -PODFILE CHECKSUM: bb16b173d76eba3daf81a0f30dde519405a53b0b +PODFILE CHECKSUM: 15dea9690d6001704f1e5d2a3d5fe6a8628a9d3f COCOAPODS: 1.1.1 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index ce54f5a2..5138323b 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -9,6 +9,6 @@ DEPENDENCIES: SPEC CHECKSUMS: SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41 -PODFILE CHECKSUM: bb16b173d76eba3daf81a0f30dde519405a53b0b +PODFILE CHECKSUM: 15dea9690d6001704f1e5d2a3d5fe6a8628a9d3f COCOAPODS: 1.1.1 diff --git a/SDCycleScrollView.xcodeproj/project.pbxproj b/SDCycleScrollView.xcodeproj/project.pbxproj index 7cbd3048..f3ab0da0 100644 --- a/SDCycleScrollView.xcodeproj/project.pbxproj +++ b/SDCycleScrollView.xcodeproj/project.pbxproj @@ -33,7 +33,7 @@ 999C10981AC14F3B00C11CDB /* h3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 999C10961AC14F3B00C11CDB /* h3.jpg */; }; 999C109A1AC14F7200C11CDB /* h1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 999C10991AC14F7200C11CDB /* h1.jpg */; }; 99A732631B24AB660033E878 /* 005.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 99A732621B24AB660033E878 /* 005.jpg */; }; - DA432B81FB7D3AC3A09F49AB /* libPods-SDCycleScrollView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A2DAE64BD8356B3DE966B61 /* libPods-SDCycleScrollView.a */; }; + 9BEB00FE3EB709E4FB44BABF /* libPods-SDCycleScrollView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE55CBF170FE2BFA0498D7B2 /* libPods-SDCycleScrollView.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -47,7 +47,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2A2DAE64BD8356B3DE966B61 /* libPods-SDCycleScrollView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SDCycleScrollView.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 48377B8D1C1027F5007B8C21 /* DemoVCWithXib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoVCWithXib.h; sourceTree = ""; }; 48377B8E1C1027F5007B8C21 /* DemoVCWithXib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemoVCWithXib.m; sourceTree = ""; }; 48377B8F1C1027F5007B8C21 /* DemoVCWithXib.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoVCWithXib.xib; sourceTree = ""; }; @@ -91,6 +90,7 @@ 999C10961AC14F3B00C11CDB /* h3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = h3.jpg; sourceTree = ""; }; 999C10991AC14F7200C11CDB /* h1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = h1.jpg; sourceTree = ""; }; 99A732621B24AB660033E878 /* 005.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = 005.jpg; sourceTree = ""; }; + EE55CBF170FE2BFA0498D7B2 /* libPods-SDCycleScrollView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SDCycleScrollView.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -98,7 +98,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DA432B81FB7D3AC3A09F49AB /* libPods-SDCycleScrollView.a in Frameworks */, + 9BEB00FE3EB709E4FB44BABF /* libPods-SDCycleScrollView.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -261,7 +261,7 @@ AB85341EE3F3D30597B024D0 /* Frameworks */ = { isa = PBXGroup; children = ( - 2A2DAE64BD8356B3DE966B61 /* libPods-SDCycleScrollView.a */, + EE55CBF170FE2BFA0498D7B2 /* libPods-SDCycleScrollView.a */, ); name = Frameworks; sourceTree = ""; diff --git a/SDCycleScrollView.xcworkspace/xcuserdata/gaoshaodong.xcuserdatad/UserInterfaceState.xcuserstate b/SDCycleScrollView.xcworkspace/xcuserdata/gaoshaodong.xcuserdatad/UserInterfaceState.xcuserstate index ac81c5f8..49496308 100644 Binary files a/SDCycleScrollView.xcworkspace/xcuserdata/gaoshaodong.xcuserdatad/UserInterfaceState.xcuserstate and b/SDCycleScrollView.xcworkspace/xcuserdata/gaoshaodong.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SDCycleScrollView/ViewController.m b/SDCycleScrollView/ViewController.m index 35921dd8..53303212 100644 --- a/SDCycleScrollView/ViewController.m +++ b/SDCycleScrollView/ViewController.m @@ -31,7 +31,7 @@ #import "ViewController.h" #import "SDCycleScrollView.h" #import "CustomCollectionViewCell.h" -#import +#import "UIImageView+WebCache.h" @interface ViewController ()