iOS Team / CNLiveWebImage · Commits

Commit 8cf651b8d3bb5208a234c1cbc96fc34cdd4c3aca

Authored by 雷浩杰
1 parent a75c6cba

no message

Inline Side-by-side
Showing 20 changed files with 211 additions and 59 deletions
WSWebImageDemo.xcodeproj/project.pbxproj
  View file @8cf651b
@@ -7,9 +7,7 @@ @@ -7,9 +7,7 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 - 0339FBE71D48A94000E4EDAB /* CNLiveWebImageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0339FBE61D48A94000E4EDAB /* CNLiveWebImageManager.m */; };  
11 0339FBE91D48B7EF00E4EDAB /* text.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0339FBE81D48B7EF00E4EDAB /* text.jpg */; }; 10 0339FBE91D48B7EF00E4EDAB /* text.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0339FBE81D48B7EF00E4EDAB /* text.jpg */; };
12 - 036922401D4732C300F4E378 /* UIImageView+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 0369223F1D4732C300F4E378 /* UIImageView+WebCache.m */; };  
13 036CBF251D3731260044A601 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF241D3731260044A601 /* main.m */; }; 11 036CBF251D3731260044A601 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF241D3731260044A601 /* main.m */; };
14 036CBF281D3731260044A601 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF271D3731260044A601 /* AppDelegate.m */; }; 12 036CBF281D3731260044A601 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF271D3731260044A601 /* AppDelegate.m */; };
15 036CBF2B1D3731260044A601 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF2A1D3731260044A601 /* ViewController.m */; }; 13 036CBF2B1D3731260044A601 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF2A1D3731260044A601 /* ViewController.m */; };
@@ -18,11 +16,13 @@ @@ -18,11 +16,13 @@
18 036CBF331D3731260044A601 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 036CBF311D3731260044A601 /* LaunchScreen.storyboard */; }; 16 036CBF331D3731260044A601 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 036CBF311D3731260044A601 /* LaunchScreen.storyboard */; };
19 036CBF3E1D3731260044A601 /* WSWebImageDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF3D1D3731260044A601 /* WSWebImageDemoTests.m */; }; 17 036CBF3E1D3731260044A601 /* WSWebImageDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF3D1D3731260044A601 /* WSWebImageDemoTests.m */; };
20 036CBF491D3731260044A601 /* WSWebImageDemoUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF481D3731260044A601 /* WSWebImageDemoUITests.m */; }; 18 036CBF491D3731260044A601 /* WSWebImageDemoUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF481D3731260044A601 /* WSWebImageDemoUITests.m */; };
21 - 036CBF581D3731DE0044A601 /* CNLiveWebImageDownload.m in Sources */ = {isa = PBXBuildFile; fileRef = 036CBF571D3731DE0044A601 /* CNLiveWebImageDownload.m */; };  
22 - 038293CA1D40CE2F005E6252 /* UIImage+MultiFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 038293C91D40CE2F005E6252 /* UIImage+MultiFormat.m */; };  
23 - 038293CD1D40CE72005E6252 /* NSData+ImageContentType.m in Sources */ = {isa = PBXBuildFile; fileRef = 038293CC1D40CE72005E6252 /* NSData+ImageContentType.m */; };  
24 - 03AA3F601D3E1F1E00EC7E54 /* CNLiveImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 03AA3F5F1D3E1F1E00EC7E54 /* CNLiveImageCache.m */; };  
25 - 03E8B4891D45DEFD00980A27 /* CNLiveWebImageDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 03E8B4881D45DEFD00980A27 /* CNLiveWebImageDownloadOperation.m */; }; 19 + 324590E81D4B2A3200889091 /* CNLiveImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 324590D91D4B2A3200889091 /* CNLiveImageCache.m */; };
  20 + 324590E91D4B2A3200889091 /* CNLiveWebImageDownload.m in Sources */ = {isa = PBXBuildFile; fileRef = 324590DC1D4B2A3200889091 /* CNLiveWebImageDownload.m */; };
  21 + 324590EA1D4B2A3200889091 /* CNLiveWebImageDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 324590DE1D4B2A3200889091 /* CNLiveWebImageDownloadOperation.m */; };
  22 + 324590EB1D4B2A3200889091 /* CNLiveWebImageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 324590E01D4B2A3200889091 /* CNLiveWebImageManager.m */; };
  23 + 324590EC1D4B2A3200889091 /* NSData+CNLiveImageContentType.m in Sources */ = {isa = PBXBuildFile; fileRef = 324590E31D4B2A3200889091 /* NSData+CNLiveImageContentType.m */; };
  24 + 324590ED1D4B2A3200889091 /* UIImage+CNLiveMultiFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 324590E51D4B2A3200889091 /* UIImage+CNLiveMultiFormat.m */; };
  25 + 324590EE1D4B2A3200889091 /* UIImageView+CNLiveWebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 324590E71D4B2A3200889091 /* UIImageView+CNLiveWebCache.m */; };
26 /* End PBXBuildFile section */ 26 /* End PBXBuildFile section */
27 27
28 /* Begin PBXContainerItemProxy section */ 28 /* Begin PBXContainerItemProxy section */
@@ -43,12 +43,7 @@ @@ -43,12 +43,7 @@
43 /* End PBXContainerItemProxy section */ 43 /* End PBXContainerItemProxy section */
44 44
45 /* Begin PBXFileReference section */ 45 /* Begin PBXFileReference section */
46 - 0339FBE41D489DBF00E4EDAB /* CNLiveWebImageBlock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageBlock.h; sourceTree = "<group>"; };  
47 - 0339FBE51D48A94000E4EDAB /* CNLiveWebImageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageManager.h; sourceTree = "<group>"; };  
48 - 0339FBE61D48A94000E4EDAB /* CNLiveWebImageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWebImageManager.m; sourceTree = "<group>"; };  
49 0339FBE81D48B7EF00E4EDAB /* text.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = text.jpg; sourceTree = "<group>"; }; 46 0339FBE81D48B7EF00E4EDAB /* text.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = text.jpg; sourceTree = "<group>"; };
50 - 0369223E1D4732C300F4E378 /* UIImageView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+WebCache.h"; sourceTree = "<group>"; };  
51 - 0369223F1D4732C300F4E378 /* UIImageView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+WebCache.m"; sourceTree = "<group>"; };  
52 036CBF201D3731260044A601 /* WSWebImageDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WSWebImageDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 47 036CBF201D3731260044A601 /* WSWebImageDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WSWebImageDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
53 036CBF241D3731260044A601 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 48 036CBF241D3731260044A601 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
54 036CBF261D3731260044A601 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 49 036CBF261D3731260044A601 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -65,17 +60,22 @@ @@ -65,17 +60,22 @@
65 036CBF441D3731260044A601 /* WSWebImageDemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WSWebImageDemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 60 036CBF441D3731260044A601 /* WSWebImageDemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WSWebImageDemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
66 036CBF481D3731260044A601 /* WSWebImageDemoUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WSWebImageDemoUITests.m; sourceTree = "<group>"; }; 61 036CBF481D3731260044A601 /* WSWebImageDemoUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WSWebImageDemoUITests.m; sourceTree = "<group>"; };
67 036CBF4A1D3731260044A601 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 62 036CBF4A1D3731260044A601 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
68 - 036CBF561D3731DE0044A601 /* CNLiveWebImageDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageDownload.h; sourceTree = "<group>"; };  
69 - 036CBF571D3731DE0044A601 /* CNLiveWebImageDownload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWebImageDownload.m; sourceTree = "<group>"; };  
70 - 038293C81D40CE2F005E6252 /* UIImage+MultiFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+MultiFormat.h"; sourceTree = "<group>"; };  
71 - 038293C91D40CE2F005E6252 /* UIImage+MultiFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+MultiFormat.m"; sourceTree = "<group>"; };  
72 - 038293CB1D40CE72005E6252 /* NSData+ImageContentType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+ImageContentType.h"; sourceTree = "<group>"; };  
73 - 038293CC1D40CE72005E6252 /* NSData+ImageContentType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+ImageContentType.m"; sourceTree = "<group>"; };  
74 - 03AA3F5D1D3E1D3F00EC7E54 /* CNLiveWebImageOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageOperation.h; sourceTree = "<group>"; };  
75 - 03AA3F5E1D3E1F1E00EC7E54 /* CNLiveImageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveImageCache.h; sourceTree = "<group>"; };  
76 - 03AA3F5F1D3E1F1E00EC7E54 /* CNLiveImageCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveImageCache.m; sourceTree = "<group>"; };  
77 - 03E8B4871D45DEFD00980A27 /* CNLiveWebImageDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageDownloadOperation.h; sourceTree = "<group>"; };  
78 - 03E8B4881D45DEFD00980A27 /* CNLiveWebImageDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWebImageDownloadOperation.m; sourceTree = "<group>"; }; 63 + 324590D81D4B2A3200889091 /* CNLiveImageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveImageCache.h; sourceTree = "<group>"; };
  64 + 324590D91D4B2A3200889091 /* CNLiveImageCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveImageCache.m; sourceTree = "<group>"; };
  65 + 324590DA1D4B2A3200889091 /* CNLiveWebImageBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageBlock.h; sourceTree = "<group>"; };
  66 + 324590DB1D4B2A3200889091 /* CNLiveWebImageDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageDownload.h; sourceTree = "<group>"; };
  67 + 324590DC1D4B2A3200889091 /* CNLiveWebImageDownload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWebImageDownload.m; sourceTree = "<group>"; };
  68 + 324590DD1D4B2A3200889091 /* CNLiveWebImageDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageDownloadOperation.h; sourceTree = "<group>"; };
  69 + 324590DE1D4B2A3200889091 /* CNLiveWebImageDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWebImageDownloadOperation.m; sourceTree = "<group>"; };
  70 + 324590DF1D4B2A3200889091 /* CNLiveWebImageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageManager.h; sourceTree = "<group>"; };
  71 + 324590E01D4B2A3200889091 /* CNLiveWebImageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWebImageManager.m; sourceTree = "<group>"; };
  72 + 324590E11D4B2A3200889091 /* CNLiveWebImageOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebImageOperation.h; sourceTree = "<group>"; };
  73 + 324590E21D4B2A3200889091 /* NSData+CNLiveImageContentType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+CNLiveImageContentType.h"; sourceTree = "<group>"; };
  74 + 324590E31D4B2A3200889091 /* NSData+CNLiveImageContentType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+CNLiveImageContentType.m"; sourceTree = "<group>"; };
  75 + 324590E41D4B2A3200889091 /* UIImage+CNLiveMultiFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+CNLiveMultiFormat.h"; sourceTree = "<group>"; };
  76 + 324590E51D4B2A3200889091 /* UIImage+CNLiveMultiFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+CNLiveMultiFormat.m"; sourceTree = "<group>"; };
  77 + 324590E61D4B2A3200889091 /* UIImageView+CNLiveWebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+CNLiveWebCache.h"; sourceTree = "<group>"; };
  78 + 324590E71D4B2A3200889091 /* UIImageView+CNLiveWebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+CNLiveWebCache.m"; sourceTree = "<group>"; };
79 /* End PBXFileReference section */ 79 /* End PBXFileReference section */
80 80
81 /* Begin PBXFrameworksBuildPhase section */ 81 /* Begin PBXFrameworksBuildPhase section */
@@ -106,6 +106,7 @@ @@ -106,6 +106,7 @@
106 036CBF171D3731260044A601 = { 106 036CBF171D3731260044A601 = {
107 isa = PBXGroup; 107 isa = PBXGroup;
108 children = ( 108 children = (
  109 + 324590D71D4B2A3200889091 /* CNLiveWebImage */,
109 036CBF221D3731260044A601 /* WSWebImageDemo */, 110 036CBF221D3731260044A601 /* WSWebImageDemo */,
110 036CBF3C1D3731260044A601 /* WSWebImageDemoTests */, 111 036CBF3C1D3731260044A601 /* WSWebImageDemoTests */,
111 036CBF471D3731260044A601 /* WSWebImageDemoUITests */, 112 036CBF471D3731260044A601 /* WSWebImageDemoUITests */,
@@ -131,22 +132,6 @@ @@ -131,22 +132,6 @@
131 036CBF271D3731260044A601 /* AppDelegate.m */, 132 036CBF271D3731260044A601 /* AppDelegate.m */,
132 036CBF291D3731260044A601 /* ViewController.h */, 133 036CBF291D3731260044A601 /* ViewController.h */,
133 036CBF2A1D3731260044A601 /* ViewController.m */, 134 036CBF2A1D3731260044A601 /* ViewController.m */,
134 - 0339FBE51D48A94000E4EDAB /* CNLiveWebImageManager.h */,  
135 - 0339FBE61D48A94000E4EDAB /* CNLiveWebImageManager.m */,  
136 - 036CBF561D3731DE0044A601 /* CNLiveWebImageDownload.h */,  
137 - 036CBF571D3731DE0044A601 /* CNLiveWebImageDownload.m */,  
138 - 03E8B4871D45DEFD00980A27 /* CNLiveWebImageDownloadOperation.h */,  
139 - 03E8B4881D45DEFD00980A27 /* CNLiveWebImageDownloadOperation.m */,  
140 - 0339FBE41D489DBF00E4EDAB /* CNLiveWebImageBlock.h */,  
141 - 03AA3F5D1D3E1D3F00EC7E54 /* CNLiveWebImageOperation.h */,  
142 - 03AA3F5E1D3E1F1E00EC7E54 /* CNLiveImageCache.h */,  
143 - 03AA3F5F1D3E1F1E00EC7E54 /* CNLiveImageCache.m */,  
144 - 038293C81D40CE2F005E6252 /* UIImage+MultiFormat.h */,  
145 - 038293C91D40CE2F005E6252 /* UIImage+MultiFormat.m */,  
146 - 038293CB1D40CE72005E6252 /* NSData+ImageContentType.h */,  
147 - 038293CC1D40CE72005E6252 /* NSData+ImageContentType.m */,  
148 - 0369223E1D4732C300F4E378 /* UIImageView+WebCache.h */,  
149 - 0369223F1D4732C300F4E378 /* UIImageView+WebCache.m */,  
150 036CBF2C1D3731260044A601 /* Main.storyboard */, 135 036CBF2C1D3731260044A601 /* Main.storyboard */,
151 036CBF2F1D3731260044A601 /* Assets.xcassets */, 136 036CBF2F1D3731260044A601 /* Assets.xcassets */,
152 036CBF311D3731260044A601 /* LaunchScreen.storyboard */, 137 036CBF311D3731260044A601 /* LaunchScreen.storyboard */,
@@ -182,6 +167,30 @@ @@ -182,6 +167,30 @@
182 path = WSWebImageDemoUITests; 167 path = WSWebImageDemoUITests;
183 sourceTree = "<group>"; 168 sourceTree = "<group>";
184 }; 169 };
  170 + 324590D71D4B2A3200889091 /* CNLiveWebImage */ = {
  171 + isa = PBXGroup;
  172 + children = (
  173 + 324590D81D4B2A3200889091 /* CNLiveImageCache.h */,
  174 + 324590D91D4B2A3200889091 /* CNLiveImageCache.m */,
  175 + 324590DA1D4B2A3200889091 /* CNLiveWebImageBlock.h */,
  176 + 324590DB1D4B2A3200889091 /* CNLiveWebImageDownload.h */,
  177 + 324590DC1D4B2A3200889091 /* CNLiveWebImageDownload.m */,
  178 + 324590DD1D4B2A3200889091 /* CNLiveWebImageDownloadOperation.h */,
  179 + 324590DE1D4B2A3200889091 /* CNLiveWebImageDownloadOperation.m */,
  180 + 324590DF1D4B2A3200889091 /* CNLiveWebImageManager.h */,
  181 + 324590E01D4B2A3200889091 /* CNLiveWebImageManager.m */,
  182 + 324590E11D4B2A3200889091 /* CNLiveWebImageOperation.h */,
  183 + 324590E21D4B2A3200889091 /* NSData+CNLiveImageContentType.h */,
  184 + 324590E31D4B2A3200889091 /* NSData+CNLiveImageContentType.m */,
  185 + 324590E41D4B2A3200889091 /* UIImage+CNLiveMultiFormat.h */,
  186 + 324590E51D4B2A3200889091 /* UIImage+CNLiveMultiFormat.m */,
  187 + 324590E61D4B2A3200889091 /* UIImageView+CNLiveWebCache.h */,
  188 + 324590E71D4B2A3200889091 /* UIImageView+CNLiveWebCache.m */,
  189 + );
  190 + name = CNLiveWebImage;
  191 + path = WSWebImageDemo/CNLiveWebImage;
  192 + sourceTree = "<group>";
  193 + };
185 /* End PBXGroup section */ 194 /* End PBXGroup section */
186 195
187 /* Begin PBXNativeTarget section */ 196 /* Begin PBXNativeTarget section */
@@ -313,15 +322,15 @@ @@ -313,15 +322,15 @@
313 isa = PBXSourcesBuildPhase; 322 isa = PBXSourcesBuildPhase;
314 buildActionMask = 2147483647; 323 buildActionMask = 2147483647;
315 files = ( 324 files = (
  325 + 324590EB1D4B2A3200889091 /* CNLiveWebImageManager.m in Sources */,
  326 + 324590EC1D4B2A3200889091 /* NSData+CNLiveImageContentType.m in Sources */,
  327 + 324590ED1D4B2A3200889091 /* UIImage+CNLiveMultiFormat.m in Sources */,
  328 + 324590EE1D4B2A3200889091 /* UIImageView+CNLiveWebCache.m in Sources */,
  329 + 324590E91D4B2A3200889091 /* CNLiveWebImageDownload.m in Sources */,
316 036CBF2B1D3731260044A601 /* ViewController.m in Sources */, 330 036CBF2B1D3731260044A601 /* ViewController.m in Sources */,
317 - 036CBF581D3731DE0044A601 /* CNLiveWebImageDownload.m in Sources */,  
318 - 036922401D4732C300F4E378 /* UIImageView+WebCache.m in Sources */,  
319 - 03AA3F601D3E1F1E00EC7E54 /* CNLiveImageCache.m in Sources */,  
320 - 0339FBE71D48A94000E4EDAB /* CNLiveWebImageManager.m in Sources */, 331 + 324590E81D4B2A3200889091 /* CNLiveImageCache.m in Sources */,
  332 + 324590EA1D4B2A3200889091 /* CNLiveWebImageDownloadOperation.m in Sources */,
321 036CBF281D3731260044A601 /* AppDelegate.m in Sources */, 333 036CBF281D3731260044A601 /* AppDelegate.m in Sources */,
322 - 038293CD1D40CE72005E6252 /* NSData+ImageContentType.m in Sources */,  
323 - 03E8B4891D45DEFD00980A27 /* CNLiveWebImageDownloadOperation.m in Sources */,  
324 - 038293CA1D40CE2F005E6252 /* UIImage+MultiFormat.m in Sources */,  
325 036CBF251D3731260044A601 /* main.m in Sources */, 334 036CBF251D3731260044A601 /* main.m in Sources */,
326 ); 335 );
327 runOnlyForDeploymentPostprocessing = 0; 336 runOnlyForDeploymentPostprocessing = 0;
WSWebImageDemo.xcodeproj/xcuserdata/leihaojie.xcuserdatad/xcschemes/WSWebImageDemo.xcscheme 0 → 100644
  View file @8cf651b
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<Scheme
  3 + LastUpgradeVersion = "0730"
  4 + version = "1.3">
  5 + <BuildAction
  6 + parallelizeBuildables = "YES"
  7 + buildImplicitDependencies = "YES">
  8 + <BuildActionEntries>
  9 + <BuildActionEntry
  10 + buildForTesting = "YES"
  11 + buildForRunning = "YES"
  12 + buildForProfiling = "YES"
  13 + buildForArchiving = "YES"
  14 + buildForAnalyzing = "YES">
  15 + <BuildableReference
  16 + BuildableIdentifier = "primary"
  17 + BlueprintIdentifier = "036CBF1F1D3731260044A601"
  18 + BuildableName = "WSWebImageDemo.app"
  19 + BlueprintName = "WSWebImageDemo"
  20 + ReferencedContainer = "container:WSWebImageDemo.xcodeproj">
  21 + </BuildableReference>
  22 + </BuildActionEntry>
  23 + </BuildActionEntries>
  24 + </BuildAction>
  25 + <TestAction
  26 + buildConfiguration = "Debug"
  27 + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  28 + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
  29 + shouldUseLaunchSchemeArgsEnv = "YES">
  30 + <Testables>
  31 + <TestableReference
  32 + skipped = "NO">
  33 + <BuildableReference
  34 + BuildableIdentifier = "primary"
  35 + BlueprintIdentifier = "036CBF381D3731260044A601"
  36 + BuildableName = "WSWebImageDemoTests.xctest"
  37 + BlueprintName = "WSWebImageDemoTests"
  38 + ReferencedContainer = "container:WSWebImageDemo.xcodeproj">
  39 + </BuildableReference>
  40 + </TestableReference>
  41 + <TestableReference
  42 + skipped = "NO">
  43 + <BuildableReference
  44 + BuildableIdentifier = "primary"
  45 + BlueprintIdentifier = "036CBF431D3731260044A601"
  46 + BuildableName = "WSWebImageDemoUITests.xctest"
  47 + BlueprintName = "WSWebImageDemoUITests"
  48 + ReferencedContainer = "container:WSWebImageDemo.xcodeproj">
  49 + </BuildableReference>
  50 + </TestableReference>
  51 + </Testables>
  52 + <MacroExpansion>
  53 + <BuildableReference
  54 + BuildableIdentifier = "primary"
  55 + BlueprintIdentifier = "036CBF1F1D3731260044A601"
  56 + BuildableName = "WSWebImageDemo.app"
  57 + BlueprintName = "WSWebImageDemo"
  58 + ReferencedContainer = "container:WSWebImageDemo.xcodeproj">
  59 + </BuildableReference>
  60 + </MacroExpansion>
  61 + <AdditionalOptions>
  62 + </AdditionalOptions>
  63 + </TestAction>
  64 + <LaunchAction
  65 + buildConfiguration = "Debug"
  66 + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  67 + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
  68 + launchStyle = "0"
  69 + useCustomWorkingDirectory = "NO"
  70 + ignoresPersistentStateOnLaunch = "NO"
  71 + debugDocumentVersioning = "YES"
  72 + debugServiceExtension = "internal"
  73 + allowLocationSimulation = "YES">
  74 + <BuildableProductRunnable
  75 + runnableDebuggingMode = "0">
  76 + <BuildableReference
  77 + BuildableIdentifier = "primary"
  78 + BlueprintIdentifier = "036CBF1F1D3731260044A601"
  79 + BuildableName = "WSWebImageDemo.app"
  80 + BlueprintName = "WSWebImageDemo"
  81 + ReferencedContainer = "container:WSWebImageDemo.xcodeproj">
  82 + </BuildableReference>
  83 + </BuildableProductRunnable>
  84 + <AdditionalOptions>
  85 + </AdditionalOptions>
  86 + </LaunchAction>
  87 + <ProfileAction
  88 + buildConfiguration = "Release"
  89 + shouldUseLaunchSchemeArgsEnv = "YES"
  90 + savedToolIdentifier = ""
  91 + useCustomWorkingDirectory = "NO"
  92 + debugDocumentVersioning = "YES">
  93 + <BuildableProductRunnable
  94 + runnableDebuggingMode = "0">
  95 + <BuildableReference
  96 + BuildableIdentifier = "primary"
  97 + BlueprintIdentifier = "036CBF1F1D3731260044A601"
  98 + BuildableName = "WSWebImageDemo.app"
  99 + BlueprintName = "WSWebImageDemo"
  100 + ReferencedContainer = "container:WSWebImageDemo.xcodeproj">
  101 + </BuildableReference>
  102 + </BuildableProductRunnable>
  103 + </ProfileAction>
  104 + <AnalyzeAction
  105 + buildConfiguration = "Debug">
  106 + </AnalyzeAction>
  107 + <ArchiveAction
  108 + buildConfiguration = "Release"
  109 + revealArchiveInOrganizer = "YES">
  110 + </ArchiveAction>
  111 +</Scheme>
WSWebImageDemo.xcodeproj/xcuserdata/leihaojie.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
  View file @8cf651b
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3 +<plist version="1.0">
  4 +<dict>
  5 + <key>SchemeUserState</key>
  6 + <dict>
  7 + <key>WSWebImageDemo.xcscheme</key>
  8 + <dict>
  9 + <key>orderHint</key>
  10 + <integer>0</integer>
  11 + </dict>
  12 + </dict>
  13 + <key>SuppressBuildableAutocreation</key>
  14 + <dict>
  15 + <key>036CBF1F1D3731260044A601</key>
  16 + <dict>
  17 + <key>primary</key>
  18 + <true/>
  19 + </dict>
  20 + <key>036CBF381D3731260044A601</key>
  21 + <dict>
  22 + <key>primary</key>
  23 + <true/>
  24 + </dict>
  25 + <key>036CBF431D3731260044A601</key>
  26 + <dict>
  27 + <key>primary</key>
  28 + <true/>
  29 + </dict>
  30 + </dict>
  31 +</dict>
  32 +</plist>
WSWebImageDemo/CNLiveImageCache.h renamed to WSWebImageDemo/CNLiveWebImage/CNLiveImageCache.h
  View file @8cf651b
WSWebImageDemo/CNLiveImageCache.m renamed to WSWebImageDemo/CNLiveWebImage/CNLiveImageCache.m
  View file @8cf651b
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 #import "CNLiveImageCache.h" 9 #import "CNLiveImageCache.h"
10 #import <CommonCrypto/CommonDigest.h> 10 #import <CommonCrypto/CommonDigest.h>
11 -#import "UIImage+MultiFormat.h" 11 +#import "UIImage+CNLiveMultiFormat.h"
12 12
13 FOUNDATION_STATIC_INLINE NSUInteger CNLiveCacheCostForImage(UIImage *image) { 13 FOUNDATION_STATIC_INLINE NSUInteger CNLiveCacheCostForImage(UIImage *image) {
14 return image.size.height * image.size.width * image.scale * image.scale; 14 return image.size.height * image.size.width * image.scale * image.scale;
WSWebImageDemo/CNLiveWebImageBlock.h renamed to WSWebImageDemo/CNLiveWebImage/CNLiveWebImageBlock.h
  View file @8cf651b
WSWebImageDemo/CNLiveWebImageDownload.h renamed to WSWebImageDemo/CNLiveWebImage/CNLiveWebImageDownload.h
  View file @8cf651b
WSWebImageDemo/CNLiveWebImageDownload.m renamed to WSWebImageDemo/CNLiveWebImage/CNLiveWebImageDownload.m
  View file @8cf651b
WSWebImageDemo/CNLiveWebImageDownloadOperation.h renamed to WSWebImageDemo/CNLiveWebImage/CNLiveWebImageDownloadOperation.h
  View file @8cf651b
WSWebImageDemo/CNLiveWebImageDownloadOperation.m renamed to WSWebImageDemo/CNLiveWebImage/CNLiveWebImageDownloadOperation.m
  View file @8cf651b
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 #import "CNLiveWebImageDownloadOperation.h" 9 #import "CNLiveWebImageDownloadOperation.h"
10 #import "CNLiveWebImageOperation.h" 10 #import "CNLiveWebImageOperation.h"
11 #import <ImageIO/ImageIO.h> 11 #import <ImageIO/ImageIO.h>
12 -#import "UIImage+MultiFormat.h" 12 +#import "UIImage+CNLiveMultiFormat.h"
13 13
14 #define CNLiveWebImageBackgroundSessionIdentifier @"CNLiveWebImageBackgroundSessionIdentifier" 14 #define CNLiveWebImageBackgroundSessionIdentifier @"CNLiveWebImageBackgroundSessionIdentifier"
15 15
WSWebImageDemo/CNLiveWebImageManager.h renamed to WSWebImageDemo/CNLiveWebImage/CNLiveWebImageManager.h
  View file @8cf651b
WSWebImageDemo/CNLiveWebImageManager.m renamed to WSWebImageDemo/CNLiveWebImage/CNLiveWebImageManager.m
  View file @8cf651b
WSWebImageDemo/CNLiveWebImageOperation.h renamed to WSWebImageDemo/CNLiveWebImage/CNLiveWebImageOperation.h
  View file @8cf651b
WSWebImageDemo/NSData+ImageContentType.h renamed to WSWebImageDemo/CNLiveWebImage/NSData+CNLiveImageContentType.h
  View file @8cf651b
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 #import <Foundation/Foundation.h> 9 #import <Foundation/Foundation.h>
10 10
11 -@interface NSData (ImageContentType) 11 +@interface NSData (CNLiveImageContentType)
12 12
13 + (NSString *)ws_imageContentTypeWithData:(NSData *)data; 13 + (NSString *)ws_imageContentTypeWithData:(NSData *)data;
14 14
WSWebImageDemo/NSData+ImageContentType.m renamed to WSWebImageDemo/CNLiveWebImage/NSData+CNLiveImageContentType.m
  View file @8cf651b
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
6 // Copyright © 2016年 王帅. All rights reserved. 6 // Copyright © 2016年 王帅. All rights reserved.
7 // 7 //
8 8
9 -#import "NSData+ImageContentType.h" 9 +#import "NSData+CNLiveImageContentType.h"
10 10
11 -@implementation NSData (ImageContentType) 11 +@implementation NSData (CNLiveImageContentType)
12 12
13 + (NSString *)ws_imageContentTypeWithData:(NSData *)data 13 + (NSString *)ws_imageContentTypeWithData:(NSData *)data
14 { 14 {
WSWebImageDemo/UIImage+MultiFormat.h renamed to WSWebImageDemo/CNLiveWebImage/UIImage+CNLiveMultiFormat.h
  View file @8cf651b
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 #import <UIKit/UIKit.h> 9 #import <UIKit/UIKit.h>
10 10
11 -@interface UIImage (MultiFormat) 11 +@interface UIImage (CNLiveMultiFormat)
12 12
13 + (UIImage *)ws_imageWithData:(NSData *)data; 13 + (UIImage *)ws_imageWithData:(NSData *)data;
14 14
WSWebImageDemo/UIImage+MultiFormat.m renamed to WSWebImageDemo/CNLiveWebImage/UIImage+CNLiveMultiFormat.m
  View file @8cf651b
@@ -6,10 +6,10 @@ @@ -6,10 +6,10 @@
6 // Copyright © 2016年 王帅. All rights reserved. 6 // Copyright © 2016年 王帅. All rights reserved.
7 // 7 //
8 8
9 -#import "UIImage+MultiFormat.h"  
10 -#import "NSData+ImageContentType.h" 9 +#import "UIImage+CNLiveMultiFormat.h"
  10 +#import "NSData+CNLiveImageContentType.h"
11 11
12 -@implementation UIImage (MultiFormat) 12 +@implementation UIImage (CNLiveMultiFormat)
13 13
14 + (UIImage *)ws_imageWithData:(NSData *)data 14 + (UIImage *)ws_imageWithData:(NSData *)data
15 { 15 {
WSWebImageDemo/UIImageView+WebCache.h renamed to WSWebImageDemo/CNLiveWebImage/UIImageView+CNLiveWebCache.h
  View file @8cf651b
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 #import <UIKit/UIKit.h> 9 #import <UIKit/UIKit.h>
10 #import "CNLiveWebImageManager.h" 10 #import "CNLiveWebImageManager.h"
11 11
12 -@interface UIImageView (WebCache) 12 +@interface UIImageView (CNLiveWebCache)
13 13
14 - (void)ws_setImageWithUrl:(NSURL *)url; 14 - (void)ws_setImageWithUrl:(NSURL *)url;
15 15
WSWebImageDemo/UIImageView+WebCache.m renamed to WSWebImageDemo/CNLiveWebImage/UIImageView+CNLiveWebCache.m
  View file @8cf651b
@@ -6,10 +6,10 @@ @@ -6,10 +6,10 @@
6 // Copyright © 2016年 王帅. All rights reserved. 6 // Copyright © 2016年 王帅. All rights reserved.
7 // 7 //
8 8
9 -#import "UIImageView+WebCache.h" 9 +#import "UIImageView+CNLiveWebCache.h"
10 #import "CNLiveWebImageBlock.h" 10 #import "CNLiveWebImageBlock.h"
11 11
12 -@implementation UIImageView (WebCache) 12 +@implementation UIImageView (CNLiveWebCache)
13 13
14 - (void)ws_setImageWithUrl:(NSURL *)url 14 - (void)ws_setImageWithUrl:(NSURL *)url
15 { 15 {
WSWebImageDemo/ViewController.m
  View file @8cf651b
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 #import "ViewController.h" 9 #import "ViewController.h"
10 #import "CNLiveWebImageManager.h" 10 #import "CNLiveWebImageManager.h"
11 #import "CNLiveImageCache.h" 11 #import "CNLiveImageCache.h"
12 -#import "UIImageView+WebCache.h" 12 +#import "UIImageView+CNLiveWebCache.h"
13 13
14 @interface ViewController () 14 @interface ViewController ()
15 15