dnrops
/
SDWebImageSwiftUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the issue that WebImage will stop download after first progressive loading image loaded

This commit is contained in:
DreamPiggy 2019-11-02 05:17:05 +08:00
parent b5d775f15e
commit a5c8082b79
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Example/SDWebImageSwiftUIDemo/ContentView.swift
View File

@ -29,6 +29,7 @@ struct ContentView: View {
"https://isparta.github.io/compare-webp/image/gif_webp/webp/2.webp",
"https://nokiatech.github.io/heif/content/images/ski_jump_1440x960.heic",
"https://nokiatech.github.io/heif/content/image_sequences/starfield_animation.heic",
"https://www.sample-videos.com/img/Sample-png-image-1mb.png",
"https://nr-platform.s3.amazonaws.com/uploads/platform/published_extension/branding_icon/275/AmazonS3.png",
"http://via.placeholder.com/200x200.jpg"]
@State var animated: Bool = true // You can change between WebImage/AnimatedImage

2
SDWebImageSwiftUI/Classes/ImageManager.swift
View File

@ -12,6 +12,7 @@ import SDWebImage
class ImageManager : ObservableObject {
@Published var image: PlatformImage?
@Published var isLoading: Bool = false
@Published var isIncremental: Bool = false
@Published var progress: CGFloat = 0
var manager = SDWebImageManager.shared
@ -56,6 +57,7 @@ class ImageManager : ObservableObject {
if let image = image {
self.image = image
}
self.isIncremental = !finished
if finished {
self.isLoading = false
self.progress = 1

9
SDWebImageSwiftUI/Classes/WebImage.swift
View File

@ -10,7 +10,7 @@ import SwiftUI
import SDWebImage
public struct WebImage : View {
static var emptyImage = Image(platformImage: PlatformImage())
static var emptyImage = PlatformImage()
var url: URL?
var placeholder: Image?
@ -46,7 +46,7 @@ public struct WebImage : View {
let view = image
return AnyView(view)
} else {
var image = placeholder ?? WebImage.emptyImage
var image = placeholder ?? Image(platformImage: WebImage.emptyImage)
image = configurations.reduce(image) { (previous, configuration) in
configuration(previous)
}
@ -57,7 +57,10 @@ public struct WebImage : View {
}
}
.onDisappear {
self.imageManager.cancel()
// When using prorgessive loading, the previous partial image will cause onDisappear. Filter this case
if self.imageManager.isLoading && !self.imageManager.isIncremental {
self.imageManager.cancel()
}
}
return AnyView(view)
}