Skip to content

Commit

Permalink
dev log mode update
Browse files Browse the repository at this point in the history
  • Loading branch information
haoboxuxu committed Dec 6, 2021
1 parent 2b47bc0 commit 3a0d936
Show file tree
Hide file tree
Showing 9 changed files with 188 additions and 18 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 9 additions & 10 deletions HBWebImage/Classes/HBWebImageCacheManger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,27 @@ import Foundation
import UIKit

class HBWebImageCacheManger {
private var devmode = true

init(_ devmode: Bool?) {
if let devmode = devmode {
self.devmode = devmode
}
}

static func fetchCachedImage(urlStr: String) -> UIImage? {
let key = getKey(from: urlStr)
if let cachedImage = HBWebImageMemoryManager.shared.fetchImageFromMemory(with: key) {
print("👾HBWebImageCacheManger: fetchCachedImage from Memory success")
if __HBWebImageDevmode {
print("👾HBWebImageCacheManger: fetchCachedImage from Memory success")
}
return cachedImage
}

if let data = HBWebImageDiskManager.shared.fetchDataFromDisk(with: key) {
let cachedImage = UIImage(data: data)
print("👾HBWebImageCacheManger: fetchCachedImage from Disk success")
if __HBWebImageDevmode {
print("👾HBWebImageCacheManger: fetchCachedImage from Disk success")
}
HBWebImageMemoryManager.shared.saveImageToMemory(image: UIImage(data: data)!, with: key)
return cachedImage
}
print("👾HBWebImageCacheManger: fetchCachedImage failed")
if __HBWebImageDevmode {
print("👾HBWebImageCacheManger: fetchCachedImage failed")
}
return nil
}

Expand Down
1 change: 1 addition & 0 deletions HBWebImage/Classes/HBWebImageConstant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ let MainQueue = DispatchQueue.main
let WebImageQueue = DispatchQueue(label: "HBWebImage Download DispatchQueue", attributes: .concurrent)
let StorageQueue = DispatchQueue(label: "HBWebImage Disk&Memory Storage Queue", attributes: .concurrent)
let serialQueue = DispatchQueue(label: "HBWebImage serial wr_queue")
var __HBWebImageDevmode = false
14 changes: 10 additions & 4 deletions HBWebImage/Classes/HBWebImageDiskManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ class HBWebImageDiskManager {
let bundleID = Bundle.main.bundleIdentifier
DiskCachePath = NSHomeDirectory().appending("/Library").appending("/Caches/").appending(bundleID!).appending("/fsCachedData")

print("NSHomeDirectory = ", NSHomeDirectory())
print("DiskCachePath = ", DiskCachePath)
if __HBWebImageDevmode {
print("NSHomeDirectory = ", NSHomeDirectory())
print("DiskCachePath = ", DiskCachePath)
}
}


Expand All @@ -30,9 +32,13 @@ class HBWebImageDiskManager {
func saveDataToDisk(data: Data, with key: NSNumber) {
let path = fullPath(key)
if FileManager.default.createFile(atPath: path, contents: data) {
print("👾HBWebImageDiskManager: saveDataToDisk success")
if __HBWebImageDevmode {
print("👾HBWebImageDiskManager: saveDataToDisk success")
}
} else {
print("👾HBWebImageDiskManager: saveDataToDisk failed")
if __HBWebImageDevmode {
print("👾HBWebImageDiskManager: saveDataToDisk failed")
}
}
}

Expand Down
12 changes: 9 additions & 3 deletions HBWebImage/Classes/HBWebImageMemoryManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,21 @@ class HBWebImageMemoryManager {
//objc_sync_exit(keyChain)
cache.setObject(image, forKey: key)
cachedSize[key] = image.sizeInBytes
print("👾HBWebImageMemoryManager: saveImageToMemory")
if __HBWebImageDevmode {
print("👾HBWebImageMemoryManager: saveImageToMemory")
}
}

func fetchImageFromMemory(with key: NSNumber) -> UIImage? {
if !keyChain.contains(key) {
print("👾HBWebImageMemoryManager: fetchImageFromMemory failed")
if __HBWebImageDevmode {
print("👾HBWebImageMemoryManager: fetchImageFromMemory failed")
}
return nil
}
print("👾HBWebImageMemoryManager: fetchImageFromMemory success")
if __HBWebImageDevmode {
print("👾HBWebImageMemoryManager: fetchImageFromMemory success")
}
return cache.object(forKey: key)
}

Expand Down
11 changes: 10 additions & 1 deletion HBWebImage/Classes/UIImageView+HBWebImage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
import UIKit

extension UIImageView: HBWebImageProtocol {
//

public func hbSetImageDevMode(with url: URL?, placeholderImage: UIImage? = nil, completion: ((UIImage?) -> Void)? = nil) {
__HBWebImageDevmode = true
self.__hbSetImage(with: url, placeholderImage: placeholderImage, completion: nil)
}

public func hbSetImage(with url: URL?, placeholderImage: UIImage? = nil, completion: ((UIImage?) -> Void)? = nil) {
self.__hbSetImage(with: url, placeholderImage: placeholderImage, completion: nil)
}

private func __hbSetImage(with url: URL?, placeholderImage: UIImage? = nil, completion: ((UIImage?) -> Void)? = nil) {
MainQueue.async {
if let placeholderImage = placeholderImage {
self.image = placeholderImage
Expand Down

0 comments on commit 3a0d936

Please sign in to comment.