图片资源获取

BFFramework.podspec

@@ -34,8 +34,7 @@ TODO: Add long description of the pod here.
 
   s.resource_bundles = {
 #     'BFFramework_Resources' => ['BFFramework/Assets/**/*.png','BFFramework/Assets/**/*.gif','BFFramework/Assets/**/*.mp3','BFFramework/Assets/**/*.mp4']
-    'BFFramework_Resources' => ['BFFramework/Assets/*']
-
+    'BFFramework_Resources' => ['BFFramework/Assets/**/*.xcassets', 'BFFramework/Assets/Resources/*']
   }
   s.static_framework = true
 

BFFramework/Classes/Base/BFFrameworkConfig.swift

@@ -0,0 +1,37 @@
+//
+//  BFFrameworkConfig.swift
+//  BFFramework
+//
+//  Created by 胡志强 on 2021/11/4.
+//
+
+import Foundation
+
+public func bfFramworkImage(by name: String) -> UIImage? {
+    
+    guard let url = currentBundle()?.url(forResource: "BFFramework_Resources", withExtension: "bundle") else {
+        return nil
+    }
+    return UIImage(named: name, in: Bundle(url: url), compatibleWith: nil)
+}
+
+func currentBundle() -> Bundle? {
+    return Bundle(for: BFFrameworkConfig.self)
+}
+
+class BFFrameworkConfig {
+    
+}
+/*
+ UIImage *ModuleImage(NSString *imageName) {
+     NSBundle *bundle = [NSBundle bundleForClass:[ResourcesBubdlesTest class]];
+     return [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil];
+ }
+ NSBundle *BundleWithName(NSString *bundleName) {
+     NSBundle *bundle = [NSBundle bundleForClass:[XHXRecordTools class]];
+     NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
+     return [NSBundle bundleWithURL:url];
+ }
+
+ */
+

BFFramework/Classes/Base/View/PQAssetCategoryCell.swift

@@ -35,7 +35,7 @@ public class PQAssetCategoryCell: UICollectionViewCell {
     lazy public var seleImage: UIImageView = {
         let seleImage = UIImageView()
         seleImage.tintColor = PQBFConfig.shared.styleTitleColor
-        seleImage.image = UIImage.moduleImage(named: "icon_uploadVideo_do", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate)
+        seleImage.image = bfFramworkImage(by: "icon_uploadVideo_do")?.withRenderingMode(.alwaysTemplate)//UIImage.moduleImage(named: , moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate)
         seleImage.isHidden = true
         return seleImage
     }()

BFFramework/Classes/Stuckpoint/Controller/PQEditMusicSearchController.swift

@@ -46,7 +46,7 @@ class PQEditMusicSearchController: BFBaseViewController {
     // 输入框清空按钮
     lazy var clearBtn: UIButton = {
         let clearBtn = UIButton(type: .custom)
-        clearBtn.setImage(UIImage().BF_Image(named: "icon_search_delete"), for: .normal)
+        clearBtn.setImage(UIImage.moduleImage(named: "icon_search_delete", moduleName: "BFFramework", isAssets: false), for: .normal)
         clearBtn.frame = CGRect(x: 0, y: 0, width: 28, height: 32)
         clearBtn.tag = 1
         clearBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
@@ -64,7 +64,7 @@ class PQEditMusicSearchController: BFBaseViewController {
 
         searchTF.leftViewMode = .always
         let leftView = UIView(frame: CGRect(x: 0, y: 0, width: 35, height: 32))
-        let imageView = UIImageView(image: UIImage().BF_Image(named: "icon_search_s"))
+        let imageView = UIImageView(image: UIImage.moduleImage(named: "icon_search_s", moduleName: "BFFramework", isAssets: false))
         imageView.frame = CGRect(x: 15, y: 8, width: 16, height: 16)
         leftView.addSubview(imageView)
         searchTF.leftView = leftView

BFFramework/Classes/Stuckpoint/View/PQCustomSpeedSettingView.swift

@@ -6,13 +6,14 @@
 //  功能：自定义速度界面
 
 import Foundation
+import BFUIKit
 
 class PQCustomSpeedSettingView: UIView {
     // 左上角返回
     lazy var backBtn: BFUIButton = {
         let backBtn = BFUIButton(type: .custom)
         backBtn.addTarget(self, action: #selector(backClick(sender:)), for: .touchUpInside)
-        backBtn.setImage(UIImage().BF_Image(named: "customSpeedClosed"), for: .normal)
+        backBtn.setImage(UIImage.moduleImage(named: "customSpeedClosed", moduleName: "BFFramework", isAssets: true), for: .normal)
         backBtn.adjustsImageWhenHighlighted = false
         return backBtn
     }()
@@ -53,13 +54,13 @@ class PQCustomSpeedSettingView: UIView {
 
     // 提示1
     lazy var customSpeedFastView: UIImageView = {
-        let customSpeedFastView = UIImageView(image: UIImage().BF_Image(named: "customSpeedFast"))
+        let customSpeedFastView = UIImageView(image: UIImage.moduleImage(named: "customSpeedFast", moduleName: "BFFramework", isAssets: false))
         return customSpeedFastView
     }()
 
     // 提示2
     lazy var customSpeedSlowView: UIImageView = {
-        let customSpeedSlowView = UIImageView(image: UIImage().BF_Image(named: "customSpeedSlow"))
+        let customSpeedSlowView = UIImageView(image: UIImage.moduleImage(named: "customSpeedSlow", moduleName: "BFFramework", isAssets: false))
         return customSpeedSlowView
     }()
 

BFFramework/Classes/Stuckpoint/View/PQSelecteMusicView.swift

@@ -535,7 +535,7 @@ class PQSelectMusicCell: UICollectionViewCell {
     var contentType: stuckPointMusicContentType = .catagery
 
     lazy var audioImageView: UIImageView = {
-        let audioImageView = UIImageView(image: UIImage().BF_Image(named: "videomk_music_default"))
+        let audioImageView = UIImageView(image: bfFramworkImage(by: "videomk_music_default"))
         audioImageView.addCorner(corner: 4)
         audioImageView.contentMode = .scaleAspectFill
         return audioImageView
@@ -622,7 +622,7 @@ class PQSelectMusicCell: UICollectionViewCell {
     }
 
     func addData() {
-        audioImageView.setNetImage(url: "\(bgmData?.avatarUrl ?? "")", placeholder: UIImage().BF_Image(named: "videomk_music_default"))
+        audioImageView.setNetImage(url: "\(bgmData?.avatarUrl ?? "")", placeholder: bfFramworkImage(by: "videomk_music_default")!)
         
         if((bgmData?.musicName ?? "").count <= 4){
             musicNameLab.text = (bgmData?.musicName ?? "").appending("\n ")
@@ -640,7 +640,7 @@ class PQSelectMusicCell: UICollectionViewCell {
             playImageView.isHidden = false
             imageMaskView.isHidden = false
             playImageView.image = nil
-            playImageView.kf.setImage(with: URL(fileURLWithPath: currentBundlePath()!.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
+            playImageView.kf.setImage(with: URL(fileURLWithPath: currentBundle()!.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
       
         } else if  bgmData?.voiceStatue == .isPause{
             playImageView.isHidden = false
@@ -659,7 +659,7 @@ class PQSelectMusicCell: UICollectionViewCell {
 //            imageMaskView.isHidden = false
 //            if bgmData?.voiceStatue == .isPlaying {
 //                playImageView.image = nil
-//                playImageView.kf.setImage(with: URL(fileURLWithPath: currentBundlePath()!.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
+//                playImageView.kf.setImage(with: URL(fileURLWithPath: currentBundle()!.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
 //
 //            } else {
 //                playImageView.image = UIImage.moduleImage(named: "stuckPoint_music_pause", moduleName: "BFFramework",isAssets: false)

BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicContentCell.swift

@@ -15,7 +15,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
     var contentType: stuckPointMusicContentType = .catagery
 
     lazy var audioImageView: UIImageView = {
-        let audioImageView = UIImageView(image:UIImage.moduleImage(named: "videomk_music_default", moduleName: "BFFramework",isAssets: false))
+         let audioImageView = UIImageView(image:bfFramworkImage(by: "videomk_music_default")!)
         audioImageView.addCorner(corner: 4)
         audioImageView.contentMode = .scaleAspectFill
         return audioImageView
@@ -123,7 +123,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
         musicNameLab.isHidden = !(bgmData is PQVoiceModel)
         titleLab.isHidden = (bgmData is PQVoiceModel)
         if bgmData is PQVoiceModel {
-            audioImageView.setNetImage(url: "\((bgmData as? PQVoiceModel)?.avatarUrl ?? "")", placeholder: UIImage.moduleImage(named: "videomk_music_default", moduleName: "BFFramework",isAssets: false)!)
+            audioImageView.setNetImage(url: "\((bgmData as? PQVoiceModel)?.avatarUrl ?? "")", placeholder: bfFramworkImage(by: "videomk_music_default")!)
             confirmContentView.isHidden = !((bgmData as? PQVoiceModel)?.isSelected ?? false)
             if (bgmData as? PQVoiceModel)?.isSelected ?? false {
                 imageMaskView.isHidden = false
@@ -131,10 +131,10 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
                 if (bgmData as? PQVoiceModel)?.isPlaying ?? false {
 
                     if playImageView.image == nil {
-                        playImageView.image = UIImage().BF_Image(named: "loading")
+                        playImageView.image = UIImage.moduleImage(named: "loading", moduleName: "BFFramework", isAssets: false)
                         startLoadingAnimation()
                     }else {
-                        playImageView.kf.setImage(with: URL(fileURLWithPath: (currentBundlePath()!.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!)))
+                        playImageView.kf.setImage(with: URL(fileURLWithPath: (currentBundle()!.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!)))
 
                     }
                     musicNameLab.move()
@@ -149,9 +149,9 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
             }
         } else {
             if (bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji != nil {
-                audioImageView.setNetImage(url: "\((bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji ?? "")", placeholder:UIImage.moduleImage(named: "videomk_music_default", moduleName: "BFFramework",isAssets: false)!)
+                audioImageView.setNetImage(url: "\((bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji ?? "")", placeholder:bfFramworkImage(by: "videomk_music_default")!)
             } else {
-                audioImageView.image = UIImage.moduleImage(named: "videomk_music_default", moduleName: "BFFramework",isAssets: false)
+                audioImageView.image = bfFramworkImage(by: "videomk_music_default")
             }
             titleLab.text = " \((bgmData as? PQStuckPointMusicTagsModel)?.tagName ?? "")"
             if (titleLab.text?.count ?? 0) > 8 {
@@ -254,7 +254,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
     func stopLoadingAnimation(){
         playImageView.layer.removeAllAnimations()
         if (bgmData as? PQVoiceModel)?.isPlaying ?? false {
-            playImageView.kf.setImage(with: URL(fileURLWithPath: currentBundlePath()!.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
+            playImageView.kf.setImage(with: URL(fileURLWithPath: currentBundle()!.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
         }
     }
 }