Преглед на файлове

add missing prefix and bumping the version to 0.9.11

ibireme преди 9 години
родител
ревизия
17adb10e63
променени са 4 файла, в които са добавени 74 реда и са изтрити 74 реда
  1. 1 1
      Framework/Info.plist
  2. 1 1
      YYWebImage.podspec
  3. 21 21
      YYWebImage/Categories/MKAnnotationView+YYWebImage.h
  4. 51 51
      YYWebImage/Categories/MKAnnotationView+YYWebImage.m

+ 1 - 1
Framework/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.10</string>
+	<string>0.9.11</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

+ 1 - 1
YYWebImage.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = 'YYWebImage'
   s.summary      = 'Asynchronous image loading framework.'
-  s.version      = '0.9.10'
+  s.version      = '0.9.11'
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.authors      = { 'ibireme' => 'ibireme@gmail.com' }
   s.social_media_url = 'http://blog.ibireme.com'

+ 21 - 21
YYWebImage/Categories/MKAnnotationView+YYWebImage.h

@@ -31,7 +31,7 @@
  operation and create a new request operation to fetch image. Set nil to clear
  the image and image URL.
  */
-@property (nonatomic, strong) NSURL *imageURL;
+@property (nonatomic, strong) NSURL *yy_imageURL;
 
 /**
  Set the view's `image` with a specified URL.
@@ -39,7 +39,7 @@
  @param imageURL    The image url (remote or local file path).
  @param placeholder The image to be set initially, until the image request finishes.
  */
-- (void)setImageWithURL:(NSURL *)imageURL placeholder:(UIImage *)placeholder;
+- (void)yy_setImageWithURL:(NSURL *)imageURL placeholder:(UIImage *)placeholder;
 
 /**
  Set the view's `image` with a specified URL.
@@ -47,7 +47,7 @@
  @param imageURL The image url (remote or local file path).
  @param options  The options to use when request the image.
  */
-- (void)setImageWithURL:(NSURL *)imageURL options:(YYWebImageOptions)options;
+- (void)yy_setImageWithURL:(NSURL *)imageURL options:(YYWebImageOptions)options;
 
 /**
  Set the view's `image` with a specified URL.
@@ -57,10 +57,10 @@
  @param options     The options to use when request the image.
  @param completion  The block invoked (on main thread) when image request completed.
  */
-- (void)setImageWithURL:(NSURL *)imageURL
-            placeholder:(UIImage *)placeholder
-                options:(YYWebImageOptions)options
-             completion:(YYWebImageCompletionBlock)completion;
+- (void)yy_setImageWithURL:(NSURL *)imageURL
+               placeholder:(UIImage *)placeholder
+                   options:(YYWebImageOptions)options
+                completion:(YYWebImageCompletionBlock)completion;
 
 /**
  Set the view's `image` with a specified URL.
@@ -72,12 +72,12 @@
  @param transform   The block invoked (on background thread) to do additional image process.
  @param completion  The block invoked (on main thread) when image request completed.
  */
-- (void)setImageWithURL:(NSURL *)imageURL
-            placeholder:(UIImage *)placeholder
-                options:(YYWebImageOptions)options
-               progress:(YYWebImageProgressBlock)progress
-              transform:(YYWebImageTransformBlock)transform
-             completion:(YYWebImageCompletionBlock)completion;
+- (void)yy_setImageWithURL:(NSURL *)imageURL
+               placeholder:(UIImage *)placeholder
+                   options:(YYWebImageOptions)options
+                  progress:(YYWebImageProgressBlock)progress
+                 transform:(YYWebImageTransformBlock)transform
+                completion:(YYWebImageCompletionBlock)completion;
 
 /**
  Set the view's `image` with a specified URL.
@@ -90,17 +90,17 @@
  @param transform   The block invoked (on background thread) to do additional image process.
  @param completion  The block invoked (on main thread) when image request completed.
  */
-- (void)setImageWithURL:(NSURL *)imageURL
-            placeholder:(UIImage *)placeholder
-                options:(YYWebImageOptions)options
-                manager:(YYWebImageManager *)manager
-               progress:(YYWebImageProgressBlock)progress
-              transform:(YYWebImageTransformBlock)transform
-             completion:(YYWebImageCompletionBlock)completion;
+- (void)yy_setImageWithURL:(NSURL *)imageURL
+               placeholder:(UIImage *)placeholder
+                   options:(YYWebImageOptions)options
+                   manager:(YYWebImageManager *)manager
+                  progress:(YYWebImageProgressBlock)progress
+                 transform:(YYWebImageTransformBlock)transform
+                completion:(YYWebImageCompletionBlock)completion;
 
 /**
  Cancel the current image request.
  */
-- (void)cancelCurrentImageRequest;
+- (void)yy_cancelCurrentImageRequest;
 
 @end

+ 51 - 51
YYWebImage/Categories/MKAnnotationView+YYWebImage.m

@@ -23,13 +23,13 @@ static int _YYWebImageSetterKey;
 
 @implementation MKAnnotationView (YYWebImage)
 
-- (NSURL *)imageURL {
+- (NSURL *)yy_imageURL {
     _YYWebImageSetter *setter = objc_getAssociatedObject(self, &_YYWebImageSetterKey);
     return setter.imageURL;
 }
 
-- (void)setImageURL:(NSURL *)imageURL {
-    [self setImageWithURL:imageURL
+- (void)setYy_imageURL:(NSURL *)imageURL {
+    [self yy_setImageWithURL:imageURL
               placeholder:nil
                   options:kNilOptions
                   manager:nil
@@ -38,61 +38,61 @@ static int _YYWebImageSetterKey;
                completion:nil];
 }
 
-- (void)setImageWithURL:(NSURL *)imageURL placeholder:(UIImage *)placeholder {
-    [self setImageWithURL:imageURL
-              placeholder:placeholder
-                  options:kNilOptions
-                  manager:nil
-                 progress:nil
-                transform:nil
-               completion:nil];
+- (void)yy_setImageWithURL:(NSURL *)imageURL placeholder:(UIImage *)placeholder {
+    [self yy_setImageWithURL:imageURL
+                 placeholder:placeholder
+                     options:kNilOptions
+                     manager:nil
+                    progress:nil
+                   transform:nil
+                  completion:nil];
 }
 
-- (void)setImageWithURL:(NSURL *)imageURL options:(YYWebImageOptions)options {
-    [self setImageWithURL:imageURL
-              placeholder:nil
-                  options:options
-                  manager:nil
-                 progress:nil
-                transform:nil
-               completion:nil];
+- (void)yy_setImageWithURL:(NSURL *)imageURL options:(YYWebImageOptions)options {
+    [self yy_setImageWithURL:imageURL
+                 placeholder:nil
+                     options:options
+                     manager:nil
+                    progress:nil
+                   transform:nil
+                  completion:nil];
 }
 
-- (void)setImageWithURL:(NSURL *)imageURL
-            placeholder:(UIImage *)placeholder
-                options:(YYWebImageOptions)options
-             completion:(YYWebImageCompletionBlock)completion {
-    [self setImageWithURL:imageURL
-              placeholder:placeholder
-                  options:options
-                  manager:nil
-                 progress:nil
-                transform:nil
-               completion:completion];
+- (void)yy_setImageWithURL:(NSURL *)imageURL
+               placeholder:(UIImage *)placeholder
+                   options:(YYWebImageOptions)options
+                completion:(YYWebImageCompletionBlock)completion {
+    [self yy_setImageWithURL:imageURL
+                 placeholder:placeholder
+                     options:options
+                     manager:nil
+                    progress:nil
+                   transform:nil
+                  completion:completion];
 }
 
-- (void)setImageWithURL:(NSURL *)imageURL
-            placeholder:(UIImage *)placeholder
-                options:(YYWebImageOptions)options
-               progress:(YYWebImageProgressBlock)progress
-              transform:(YYWebImageTransformBlock)transform
-             completion:(YYWebImageCompletionBlock)completion {
-    [self setImageWithURL:imageURL
-              placeholder:placeholder
-                  options:options
-                  manager:nil
-                 progress:progress
-                transform:transform
-               completion:completion];
+- (void)yy_setImageWithURL:(NSURL *)imageURL
+               placeholder:(UIImage *)placeholder
+                   options:(YYWebImageOptions)options
+                  progress:(YYWebImageProgressBlock)progress
+                 transform:(YYWebImageTransformBlock)transform
+                completion:(YYWebImageCompletionBlock)completion {
+    [self yy_setImageWithURL:imageURL
+                 placeholder:placeholder
+                     options:options
+                     manager:nil
+                    progress:progress
+                   transform:transform
+                  completion:completion];
 }
 
-- (void)setImageWithURL:(NSURL *)imageURL
-            placeholder:(UIImage *)placeholder
-                options:(YYWebImageOptions)options
-                manager:(YYWebImageManager *)manager
-               progress:(YYWebImageProgressBlock)progress
-              transform:(YYWebImageTransformBlock)transform
-             completion:(YYWebImageCompletionBlock)completion {
+- (void)yy_setImageWithURL:(NSURL *)imageURL
+               placeholder:(UIImage *)placeholder
+                   options:(YYWebImageOptions)options
+                   manager:(YYWebImageManager *)manager
+                  progress:(YYWebImageProgressBlock)progress
+                 transform:(YYWebImageTransformBlock)transform
+                completion:(YYWebImageCompletionBlock)completion {
     if ([imageURL isKindOfClass:[NSString class]]) imageURL = [NSURL URLWithString:(id)imageURL];
     manager = manager ? manager : [YYWebImageManager sharedManager];
     
@@ -169,7 +169,7 @@ static int _YYWebImageSetterKey;
     });
 }
 
-- (void)cancelCurrentImageRequest {
+- (void)yy_cancelCurrentImageRequest {
     _YYWebImageSetter *setter = objc_getAssociatedObject(self, &_YYWebImageSetterKey);
     if (setter) [setter cancel];
 }