diff --git a/Demo/YYImageDemo.xcodeproj/project.pbxproj b/Demo/YYImageDemo.xcodeproj/project.pbxproj index 3d70b28..f95416f 100644 --- a/Demo/YYImageDemo.xcodeproj/project.pbxproj +++ b/Demo/YYImageDemo.xcodeproj/project.pbxproj @@ -44,6 +44,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + A11E94612514C2C500D4033C /* YYImage.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = YYImage.podspec; path = ../YYImage.podspec; sourceTree = ""; }; + A11E94622514C2CB00D4033C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; D91A602C1F057230008CD5D3 /* YYImageDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YYImageDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; D91A602F1F057230008CD5D3 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = YYImageDemo/AppDelegate.h; sourceTree = ""; }; D91A60301F057230008CD5D3 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = YYImageDemo/AppDelegate.m; sourceTree = ""; }; @@ -171,6 +173,8 @@ D97F40891F0573DA00DFD481 /* YYImage */ = { isa = PBXGroup; children = ( + A11E94622514C2CB00D4033C /* README.md */, + A11E94612514C2C500D4033C /* YYImage.podspec */, D97F408A1F0573DA00DFD481 /* YYAnimatedImageView.h */, D97F408B1F0573DA00DFD481 /* YYAnimatedImageView.m */, D97F408C1F0573DA00DFD481 /* YYFrameImage.h */, diff --git a/Demo/YYImageDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/YYImageDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Demo/YYImageDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/README.md b/README.md index cf5b226..207fc90 100755 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Image framework for iOS to display/encode/decode animated WebP, APNG, GIF, and m Features ============== +- 最近更新修复图片加载不出来,兼容iOS 14 - Display/encode/decode animated image with these types:
    WebP, APNG, GIF. - Display/encode/decode still image with these types:
    WebP, PNG, GIF, JPEG, JP2, TIFF, BMP, ICO, ICNS. - Baseline/progressive/interlaced image decode with these types:
    PNG, GIF, JPEG, BMP. @@ -138,7 +139,7 @@ Installation ### CocoaPods 1. Update cocoapods to the latest version. -2. Add `pod 'YYImage'` to your Podfile. +2. Add `pod 'YYImage', :git => 'https://github.com/QiuYeHong90/YYImage.git'` to your Podfile. 3. Run `pod install` or `pod update`. 4. Import \. 5. Notice: it doesn't include WebP subspec by default, if you want to support WebP format, you may add `pod 'YYImage/WebP'` to your Podfile. diff --git a/YYImage.podspec b/YYImage.podspec index 7f76678..f6b18e9 100644 --- a/YYImage.podspec +++ b/YYImage.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/ibireme/YYImage' s.platform = :ios, '6.0' s.ios.deployment_target = '6.0' - s.source = { :git => 'https://github.com/ibireme/YYImage.git', :tag => s.version.to_s } + s.source = { :git => 'https://github.com/QiuYeHong90/YYImage.git', :tag => s.version.to_s } s.requires_arc = true s.default_subspec = 'Core' diff --git a/YYImage/YYAnimatedImageView.m b/YYImage/YYAnimatedImageView.m index 07ee652..4cfb7b3 100644 --- a/YYImage/YYAnimatedImageView.m +++ b/YYImage/YYAnimatedImageView.m @@ -526,8 +526,13 @@ - (void)step:(CADisplayLink *)link { } - (void)displayLayer:(CALayer *)layer { - if (_curFrame) { - layer.contents = (__bridge id)_curFrame.CGImage; + UIImage *currentFrame = _curFrame; + if (!currentFrame) { + currentFrame = self.image; + } + if (currentFrame) { + layer.contentsScale = currentFrame.scale; + layer.contents = (__bridge id)currentFrame.CGImage; } }