Переглянути джерело

Use YY_TARGET_IS_EXTENSION to support App Extension target: #13

ibireme 9 роки тому
батько
коміт
5570793fd8
2 змінених файлів з 10 додано та 0 видалено
  1. 2 0
      YYWebImage/YYWebImageManager.m
  2. 8 0
      YYWebImage/YYWebImageOperation.m

+ 2 - 0
YYWebImage/YYWebImageManager.m

@@ -112,11 +112,13 @@
 }
 }
 
 
 + (void)_delaySetActivity:(NSTimer *)timer {
 + (void)_delaySetActivity:(NSTimer *)timer {
+#ifndef YY_TARGET_IS_EXTENSION
     NSNumber *visiable = timer.userInfo;
     NSNumber *visiable = timer.userInfo;
     if ([UIApplication sharedApplication].networkActivityIndicatorVisible != visiable.boolValue) {
     if ([UIApplication sharedApplication].networkActivityIndicatorVisible != visiable.boolValue) {
         [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:visiable.boolValue];
         [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:visiable.boolValue];
     }
     }
     [timer invalidate];
     [timer invalidate];
+#endif
 }
 }
 
 
 + (void)_changeNetworkActivityCount:(NSInteger)delta {
 + (void)_changeNetworkActivityCount:(NSInteger)delta {

+ 8 - 0
YYWebImage/YYWebImageOperation.m

@@ -262,18 +262,22 @@ static void URLInBlackListAdd(NSURL *url) {
 
 
 - (void)dealloc {
 - (void)dealloc {
     [_lock lock];
     [_lock lock];
+#ifndef YY_TARGET_IS_EXTENSION
     if (_taskID != UIBackgroundTaskInvalid) {
     if (_taskID != UIBackgroundTaskInvalid) {
         [[UIApplication sharedApplication] endBackgroundTask:_taskID];
         [[UIApplication sharedApplication] endBackgroundTask:_taskID];
         _taskID = UIBackgroundTaskInvalid;
         _taskID = UIBackgroundTaskInvalid;
     }
     }
+#endif
     if ([self isExecuting]) {
     if ([self isExecuting]) {
         self.cancelled = YES;
         self.cancelled = YES;
         self.finished = YES;
         self.finished = YES;
         if (_connection) {
         if (_connection) {
             [_connection cancel];
             [_connection cancel];
+#ifndef YY_TARGET_IS_EXTENSION
             if (![_request.URL isFileURL] && (_options & YYWebImageOptionShowNetworkActivity)) {
             if (![_request.URL isFileURL] && (_options & YYWebImageOptionShowNetworkActivity)) {
                 [YYWebImageManager decrementNetworkActivityCount];
                 [YYWebImageManager decrementNetworkActivityCount];
             }
             }
+#endif
         }
         }
         if (_completion) {
         if (_completion) {
             @autoreleasepool {
             @autoreleasepool {
@@ -285,12 +289,14 @@ static void URLInBlackListAdd(NSURL *url) {
 }
 }
 
 
 - (void)_endBackgroundTask {
 - (void)_endBackgroundTask {
+#ifndef YY_TARGET_IS_EXTENSION
     [_lock lock];
     [_lock lock];
     if (_taskID != UIBackgroundTaskInvalid) {
     if (_taskID != UIBackgroundTaskInvalid) {
         [[UIApplication sharedApplication] endBackgroundTask:_taskID];
         [[UIApplication sharedApplication] endBackgroundTask:_taskID];
         _taskID = UIBackgroundTaskInvalid;
         _taskID = UIBackgroundTaskInvalid;
     }
     }
     [_lock unlock];
     [_lock unlock];
+#endif
 }
 }
 
 
 #pragma mark - Runs in operation thread
 #pragma mark - Runs in operation thread
@@ -744,6 +750,7 @@ static void URLInBlackListAdd(NSURL *url) {
             } else {
             } else {
                 self.executing = YES;
                 self.executing = YES;
                 [self performSelector:@selector(_startOperation) onThread:[[self class] _networkThread] withObject:nil waitUntilDone:NO modes:@[NSDefaultRunLoopMode]];
                 [self performSelector:@selector(_startOperation) onThread:[[self class] _networkThread] withObject:nil waitUntilDone:NO modes:@[NSDefaultRunLoopMode]];
+#ifndef YY_TARGET_IS_EXTENSION
                 if (_options & YYWebImageOptionAllowBackgroundTask) {
                 if (_options & YYWebImageOptionAllowBackgroundTask) {
                     __weak __typeof__ (self) _self = self;
                     __weak __typeof__ (self) _self = self;
                     if (_taskID == UIBackgroundTaskInvalid) {
                     if (_taskID == UIBackgroundTaskInvalid) {
@@ -756,6 +763,7 @@ static void URLInBlackListAdd(NSURL *url) {
                         }];
                         }];
                     }
                     }
                 }
                 }
+#endif
             }
             }
         }
         }
         [_lock unlock];
         [_lock unlock];