Bläddra i källkod

Merge pull request #1848 from onevcat/fix/gif-image-layer

Set correct layer for gif image
Wei Wang 4 år sedan
förälder
incheckning
1dabc42938

+ 0 - 1
Demo/Demo/Kingfisher-Demo/ViewControllers/GIFViewController.swift

@@ -38,7 +38,6 @@ class GIFViewController: UIViewController {
         
         // Should need to use different cache key to prevent data overwritten by each other.
         KF.url(url, cacheKey: "\(url)-imageview").set(to: imageView)
-        
         KF.url(url, cacheKey: "\(url)-animated_imageview").set(to: animatedImageView)
     }
 }

+ 1 - 13
Sources/Views/AnimatedImageView.swift

@@ -227,19 +227,7 @@ open class AnimatedImageView: UIImageView {
     }
     
     override open func display(_ layer: CALayer) {
-        if let currentFrame = animator?.currentFrameImage {
-            layer.contents = currentFrame.cgImage
-        } else {
-            if #available(iOS 15, *),
-               // https://developer.apple.com/documentation/xcode-release-notes/xcode-13-release-notes
-               // Apple Xcode 13 issue 83378814
-                ProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 15
-            {
-                super.display(layer)
-            } else {
-                layer.contents = image?.cgImage
-            }
-        }
+        layer.contents = animator?.currentFrameImage?.cgImage ?? image?.cgImage
     }
     
     override open func didMoveToWindow() {