1.修改素材访问

BFFramework.podspec

@@ -33,7 +33,7 @@ TODO: Add long description of the pod here.
   s.source_files = 'BFFramework/Classes/**/*'
 
    s.resource_bundles = {
-     'BFFramework' => ['BFFramework/Assets/**/*.png','BFFramework/Assets/**/*.gif']
+     'BFFramework_Resources' => ['BFFramework/Assets/**/*.png','BFFramework/Assets/**/*.gif']
    }
    s.static_framework = true
 

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.init().BF_Image(named:  "icon_uploadVideo_do").withRenderingMode(.alwaysTemplate)
+        seleImage.image = UIImage.moduleImage(named: "icon_uploadVideo_do", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate)
         seleImage.isHidden = true
         return seleImage
     }()

BFFramework/Classes/Base/View/PQBaseVideoInfoView.swift

@@ -11,14 +11,14 @@ import BFCommonKit
 
 open class PQBaseVideoInfoView: UIView {
     lazy public var imageView: UIImageView = {
-        let imageView = UIImageView(image: UIImage.init().BF_Image(named:  "msg_default"))
+        let imageView = UIImageView(image:UIImage.moduleImage(named: "msg_default", moduleName: "BFFramework",isAssets: false))
         imageView.addCorner(corner: 4)
         imageView.contentMode = .scaleAspectFill
         return imageView
     }()
 
     lazy public var videoTagView: UIImageView = {
-        let videoTagView = UIImageView(image: UIImage.init().BF_Image(named:  "msg_video_tag"))
+        let videoTagView = UIImageView(image:UIImage.moduleImage(named: "msg_video_tag", moduleName: "BFFramework",isAssets: false))
         return videoTagView
     }()
 
@@ -52,7 +52,7 @@ open class PQBaseVideoInfoView: UIView {
    open func addData() {
         // 这里会crash
         let coverImg = (videoData?.videoCoverSnapshotPath != nil && (videoData?.videoCoverSnapshotPath?.count ?? 0) > 0) ? videoData?.videoCoverSnapshotPath ?? "" : (videoData?.coverImg?["coverImgPath"] as? String ?? "")
-        imageView.setNetImage(url: coverImg, placeholder: UIImage.init().BF_Image(named: "msg_default"))
+    imageView.setNetImage(url: coverImg, placeholder: UIImage.moduleImage(named: "msg_default", moduleName: "BFFramework",isAssets: false)!)
         titleLab.text = videoData?.title
     }
 

BFFramework/Classes/Base/View/PQChoseMaterialCell.swift

@@ -45,17 +45,17 @@ public class PQChoseMaterialCell: UICollectionViewCell {
     }()
 
     lazy public var videoStatuImageView: UIImageView = {
-        let videoStatuImageView = UIImageView(image: UIImage.init().BF_Image(named:  "allPreview"))
+        let videoStatuImageView = UIImageView(image:UIImage.moduleImage(named: "allPreview", moduleName: "BFFramework",isAssets: false))
         return videoStatuImageView
     }()
 
     lazy public var videoLoadingView: AnimatedImageView = {
         let videoLoadingView = AnimatedImageView()
-        videoLoadingView.kf.setImage(with: URL(fileURLWithPath:  Bundle.init().BF_mainbundle().path(forResource: "material_loading", ofType: ".gif")!))
+        videoLoadingView.kf.setImage(with: URL(fileURLWithPath:  (Bundle.current(moduleName: "BFFramework",isAssets: false)?.path(forResource: "material_loading", ofType: ".gif")!) ?? ""))
         videoLoadingView.stopAnimating()
         return videoLoadingView
     }()
-
+    
     lazy public var choseContentView: UIView = {
         let choseContentView = UIView()
         let ges = UITapGestureRecognizer(target: self, action: #selector(choseTap(ges:)))
@@ -66,8 +66,8 @@ public class PQChoseMaterialCell: UICollectionViewCell {
 
     lazy public var choseBtn: UIButton = {
         let choseBtn = UIButton(type: .custom)
-        choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_nomal"), for: .normal)
-        choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_selected").withRenderingMode(.alwaysTemplate), for: .selected)
+        choseBtn.setBackgroundImage(UIImage.moduleImage(named: "videomk_chose_nomal", moduleName: "BFFramework",isAssets: false), for: .normal)
+        choseBtn.setBackgroundImage(UIImage.moduleImage(named: "videomk_chose_selected", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .selected)
         choseBtn.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         choseBtn.setTitleColor(UIColor.white, for: .normal)
         choseBtn.titleLabel?.font = UIFont.systemFont(ofSize: 12)

BFFramework/Classes/Base/View/PQSectionHeadView.swift

@@ -43,7 +43,7 @@ public class PQSectionHeadView: UIView {
     lazy public  var clearBtn: UIButton = {
         let clearBtn = UIButton(type: .custom)
         clearBtn.setTitle("全部已读 ", for: .normal)
-        clearBtn.setImage(UIImage.init().BF_Image(named: "msg_clear_noreaded"), for: .normal)
+        clearBtn.setImage(UIImage.moduleImage(named: "msg_clear_noreaded", moduleName: "BFFramework",isAssets: false), for: .normal)
         clearBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#666666"), for: .normal)
         clearBtn.titleLabel?.font = UIFont(name: "PingFangSC", size: 13)
         clearBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -175,7 +175,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         musicNameView.addCorner(corner: musicNameView.frame.height / 2)
         let musicImageView = UIImageView()
         musicImageView.tintColor = PQBFConfig.shared.styleTitleColor
-        musicImageView.image = UIImage().BF_Image(named: "stuckPoint_reCreate_music").withRenderingMode(.alwaysTemplate)
+        musicImageView.image = UIImage.moduleImage(named: "stuckPoint_reCreate_music", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate)
         musicImageView.frame = CGRect(x: musicNameView.frame.height / 2 - 5, y: (musicNameView.frame.height - 22) / 2, width: 22, height: 22)
         musicNameView.addSubview(musicImageView)
         musicNameLab.frame.origin.x = musicImageView.frame.maxX + 5

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -31,8 +31,8 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         changeCollecBtn.titleLabel?.lineBreakMode = .byTruncatingTail
         changeCollecBtn.tintColor = PQBFConfig.shared.styleTitleColor
         changeCollecBtn.setTitle("全部", for: .normal)
-        changeCollecBtn.setImage(UIImage().BF_Image(named: "icon_selected_down").withRenderingMode(.alwaysTemplate), for: .normal)
-        changeCollecBtn.setImage(UIImage().BF_Image(named: "icon_selected_up").withRenderingMode(.alwaysTemplate), for: .selected)
+        changeCollecBtn.setImage(UIImage.moduleImage(named: "icon_selected_down", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
+        changeCollecBtn.setImage(UIImage.moduleImage(named: "icon_selected_up", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .selected)
         changeCollecBtn.setTitleColor(PQBFConfig.shared.styleTitleColor, for: .normal)
         changeCollecBtn.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .medium)
         changeCollecBtn.tag = 1

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialDetailController.swift

@@ -51,7 +51,7 @@ class PQStuckPointMaterialDetailController: PQBaseViewController {
     lazy var choseBtn: UIButton = {
         let choseBtn = UIButton(type: .custom)
         choseBtn.frame = CGRect(x: choseTitleBtn.frame.minX - cDefaultMargin * 3, y: 0, width: cDefaultMargin * 3, height: cDefaultMargin * 3)
-        choseBtn.setBackgroundImage(UIImage().BF_Image(named: "videomk_chose_nomal"), for: .normal)
+        choseBtn.setBackgroundImage(UIImage.moduleImage(named: "videomk_chose_nomal", moduleName: "BFFramework",isAssets: false), for: .normal)
         choseBtn.setTitleColor(UIColor.white, for: .normal)
         choseBtn.titleLabel?.font = UIFont.systemFont(ofSize: 12)
         choseBtn.tag = 1
@@ -62,7 +62,7 @@ class PQStuckPointMaterialDetailController: PQBaseViewController {
 
     lazy var changeModeBtn: UIButton = {
         let changeModeBtn = UIButton(type: .custom)
-        changeModeBtn.setImage(UIImage().BF_Image(named: "videomk_changeMode"), for: .normal)
+        changeModeBtn.setImage(UIImage.moduleImage(named: "videomk_changeMode", moduleName: "BFFramework",isAssets: false), for: .normal)
         changeModeBtn.frame = CGRect(x: 15, y: preImageView.frame.height - cDefaultMargin * 4 - 15, width: cDefaultMargin * 4, height: cDefaultMargin * 4)
         changeModeBtn.tag = 3
         changeModeBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
@@ -81,7 +81,7 @@ class PQStuckPointMaterialDetailController: PQBaseViewController {
     lazy var playBtn: UIButton = {
         let playBtn = UIButton(type: .custom)
         playBtn.frame = CGRect(x: (preImageView.frame.width - cDefaultMargin * 5) / 2, y: (preImageView.frame.height - cDefaultMargin * 5) / 2, width: cDefaultMargin * 5, height: cDefaultMargin * 5)
-        playBtn.setImage(UIImage().BF_Image(named: "icon_video_play"), for: .normal)
+        playBtn.setImage(UIImage.moduleImage(named: "icon_video_play", moduleName: "BFFramework",isAssets: false), for: .normal)
         playBtn.isUserInteractionEnabled = false
         playBtn.isHidden = true
         // playBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
@@ -358,7 +358,7 @@ class PQStuckPointMaterialDetailController: PQBaseViewController {
             }
             choseTitleBtn.isSelected = true
         } else {
-            choseBtn.setBackgroundImage(UIImage().BF_Image(named: "videomk_chose_nomal"), for: .normal)
+            choseBtn.setBackgroundImage(UIImage.moduleImage(named: "videomk_chose_nomal", moduleName: "BFFramework",isAssets: false), for: .normal)
             choseBtn.backgroundColor = UIColor.clear
             choseBtn.setTitle(nil, for: .normal)
             choseTitleBtn.isSelected = false

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicController.swift

@@ -71,7 +71,7 @@ class PQStuckPointMusicController: PQBaseViewController {
     // 输入框清空按钮
     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)
@@ -90,7 +90,7 @@ class PQStuckPointMusicController: PQBaseViewController {
 
         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/Controller/PQStuckPointPublicController.swift

@@ -157,7 +157,7 @@ class PQStuckPointPublicController: PQBaseViewController {
         playerHeaderCoverImageView.clipsToBounds = true
         
         let playBtn = UIButton(type: .custom)
-        playBtn.setImage(UIImage().BF_Image(named: "icon_video_play"), for: .normal)
+        playBtn.setImage(UIImage.moduleImage(named: "icon_video_play", moduleName: "BFFramework",isAssets: false), for: .normal)
         playBtn.tag = 4
         playBtn.isUserInteractionEnabled = false
         playerHeaderCoverImageView.addSubview(playBtn)
@@ -205,7 +205,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     lazy var playBtn: UIButton = {
         let playBtn = UIButton(type: .custom)
         playBtn.frame = CGRect(x: (preViewSize.width - cDefaultMargin * 5) / 2, y: (preViewSize.height - cDefaultMargin * 5) / 2, width: cDefaultMargin * 5, height: cDefaultMargin * 5)
-        playBtn.setImage(UIImage().BF_Image(named: "icon_video_play"), for: .normal)
+        playBtn.setImage(UIImage.moduleImage(named: "icon_video_play", moduleName: "BFFramework",isAssets: false), for: .normal)
         playBtn.tag = 4
         playBtn.isHidden = true
         playBtn.isUserInteractionEnabled = false
@@ -259,7 +259,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     // 手势提示
     lazy var pinView: UIImageView = {
         let pinView = UIImageView()
-        pinView.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "editCoverPin", ofType: ".gif")!))
+        pinView.kf.setImage(with: URL(fileURLWithPath: (Bundle.current(moduleName: "BFFramework",isAssets: false)?.path(forResource: "editCoverPin", ofType: ".gif")!)!))
         return pinView
     }()
     //封面
@@ -340,7 +340,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     lazy var shareWechatBtn: UIButton = {
         let shareWechatBtn = UIButton(type: .custom)
         shareWechatBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 70)
-        shareWechatBtn.setImage(UIImage().BF_Image(named: "reCreate_opration_wechat"), for: .normal)
+        shareWechatBtn.setImage(UIImage.moduleImage(named: "reCreate_opration_wechat", moduleName: "BFFramework",isAssets: false), for: .normal)
         shareWechatBtn.backgroundColor = PQBFConfig.shared.styleBackGroundColor
         shareWechatBtn.addCorner(corner: 6)
         shareWechatBtn.tag = 2
@@ -351,7 +351,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     lazy var shareFriendBtn: UIButton = {
         let shareFriendBtn = UIButton(type: .custom)
         shareFriendBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 70)
-        shareFriendBtn.setImage(UIImage().BF_Image(named: "reCreate_opration_friend"), for: .normal)
+        shareFriendBtn.setImage(UIImage.moduleImage(named: "reCreate_opration_friend", moduleName: "BFFramework",isAssets: false), for: .normal)
         shareFriendBtn.backgroundColor = PQBFConfig.shared.styleBackGroundColor
         shareFriendBtn.addCorner(corner: 6)
         shareFriendBtn.tag = 1

BFFramework/Classes/Stuckpoint/View/PQCuttingPointView.swift

@@ -18,7 +18,7 @@ class PQCuttingPointView: UIView {
     }()
 
     lazy var dragingImageView: UIImageView = {
-        let dragingImageView = UIImageView(image: UIImage().BF_Image(named: "stuckPoint_dragingImage").withRenderingMode(.alwaysTemplate))
+        let dragingImageView = UIImageView(image:UIImage.moduleImage(named: "stuckPoint_dragingImage", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate))
         dragingImageView.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return dragingImageView
     }()

BFFramework/Classes/Stuckpoint/View/PQEditPublicCoverImageView.swift

@@ -37,7 +37,7 @@ class PQEditPublicCoverImageView: UIView {
     lazy var compliteBtn: UIButton = {
         let compliteBtn = UIButton(type: .custom)
         compliteBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 70)
-        compliteBtn.setImage(UIImage().BF_Image(named: "editCoverimageOk"), for: .normal)
+        compliteBtn.setImage(UIImage.moduleImage(named: "editCoverimageOk", moduleName: "BFFramework",isAssets: false), for: .normal)
         compliteBtn.backgroundColor = PQBFConfig.shared.styleBackGroundColor
         compliteBtn.adjustsImageWhenHighlighted = false
         compliteBtn.tag = 2
@@ -49,7 +49,7 @@ class PQEditPublicCoverImageView: UIView {
     lazy var selectPhotoBtn: UIButton = {
         let selectPhotoBtn = UIButton(type: .custom)
         selectPhotoBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 70)
-        selectPhotoBtn.setImage(UIImage().BF_Image(named: "editCoverimageSelect"), for: .normal)
+        selectPhotoBtn.setImage(UIImage.moduleImage(named: "editCoverimageSelect", moduleName: "BFFramework",isAssets: false), for: .normal)
         selectPhotoBtn.adjustsImageWhenHighlighted = false
         selectPhotoBtn.backgroundColor = PQBFConfig.shared.styleBackGroundColor
         selectPhotoBtn.tag = 1
@@ -89,7 +89,7 @@ class PQEditPublicCoverImageView: UIView {
             coverImageBtn.addTarget(self, action: #selector(coverImageBtnClick(sender:)), for: .touchUpInside)
             //选中后的角标
             let iconView = UIImageView.init(frame: CGRect(x: frame.size.width  - 22.0 - 6, y: 6, width: 22, height: 22))
-            iconView.image = UIImage().BF_Image(named: "editCoverimageSelected")
+            iconView.image = UIImage.moduleImage(named: "editCoverimageSelected", moduleName: "BFFramework",isAssets: false)
           
             iconView.tag = 1000
             if(i == 0){

BFFramework/Classes/Stuckpoint/View/PQEditPublicTitleView.swift

@@ -240,7 +240,7 @@ class PQEditPublicTitleViewContentCell: UICollectionViewCell {
     lazy var iconView: UIImageView = {
         let iconView = UIImageView()
         iconView.backgroundColor = .clear
-        iconView.image = UIImage().BF_Image(named: "editTitleTips")
+        iconView.image = UIImage.moduleImage(named: "editTitleTips", moduleName: "BFFramework",isAssets: false)
         return iconView
     }()
 

BFFramework/Classes/Stuckpoint/View/PQStuckPointLoadingView.swift

@@ -16,7 +16,7 @@ class PQStuckPointLoadingView: UIView {
     lazy var loadingView: UIImageView = {
         let loadingView = UIImageView()
         loadingView.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
-        let data = try? Data(contentsOf: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "stuckPoint_edit_loading", ofType: ".gif")!))
+        let data = try? Data(contentsOf: URL(fileURLWithPath: (Bundle.current(moduleName: "BFFramework",isAssets: false)?.path(forResource: "stuckPoint_edit_loading", ofType: ".gif")!)!))
         if data != nil {
             PQPHAssetVideoParaseUtil.parasGIFImage(data: data!, isRenderingColor: UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)) { _, images, duration in
                 loadingView.displayGIF(data: nil, images: images, repeatCount: .max, duration: duration ?? 2)
@@ -31,7 +31,7 @@ class PQStuckPointLoadingView: UIView {
         navBarLeftBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
         navBarLeftBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
         navBarLeftBtn.tintColor = PQBFConfig.shared.styleTitleColor
-        navBarLeftBtn.setImage(UIImage().BF_Image(named: "icon_detail_back").withRenderingMode(.alwaysTemplate), for: .normal)
+        navBarLeftBtn.setImage(UIImage.moduleImage(named: "icon_detail_back", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
         navBarLeftBtn.addTarget(self, action: #selector(cancelDownload(sender:)), for: .touchUpInside)
         return navBarLeftBtn
     }()

BFFramework/Classes/Stuckpoint/View/PQStuckPointMaterialHeadView.swift

@@ -12,7 +12,7 @@ import BFCommonKit
 
 class PQStuckPointMaterialHeadView: UIView {
     lazy var iconImageView: UIImageView = {
-        let iconImageView = UIImageView(image: UIImage().BF_Image(named: "videomk_netMaterial_selected"))
+        let iconImageView = UIImageView(image:UIImage.moduleImage(named: "videomk_netMaterial_selected", moduleName: "BFFramework",isAssets: false))
         return iconImageView
     }()
 

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().BF_Image(named: "videomk_music_default"))
+        let audioImageView = UIImageView(image:UIImage.moduleImage(named: "videomk_music_default", moduleName: "BFFramework",isAssets: false))
         audioImageView.addCorner(corner: 4)
         audioImageView.contentMode = .scaleAspectFill
         return audioImageView
@@ -30,7 +30,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
 
     lazy var playImageView: UIImageView = {
         let playImageView = UIImageView()
-        playImageView.image = UIImage().BF_Image(named: "stuckPoint_music_pause")
+        playImageView.image = UIImage.moduleImage(named: "stuckPoint_music_pause", moduleName: "BFFramework",isAssets: false)
         return playImageView
     }()
 
@@ -115,16 +115,16 @@ 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().BF_Image(named: "videomk_music_default"))
+            audioImageView.setNetImage(url: "\((bgmData as? PQVoiceModel)?.avatarUrl ?? "")", placeholder: UIImage.moduleImage(named: "videomk_music_default", moduleName: "BFFramework",isAssets: false)!)
             confirmContentView.isHidden = !((bgmData as? PQVoiceModel)?.isSelected ?? false)
             if (bgmData as? PQVoiceModel)?.isSelected ?? false {
                 playImageView.isHidden = false
                 if (bgmData as? PQVoiceModel)?.isPlaying ?? false {
                     playImageView.image = nil
-                    playImageView.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
+                    playImageView.kf.setImage(with: URL(fileURLWithPath: (Bundle.current(moduleName: "BFFramework",isAssets: false)?.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!)!))
                     musicNameLab.move()
                 } else {
-                    playImageView.image = UIImage().BF_Image(named: "stuckPoint_music_pause")
+                    playImageView.image = UIImage.moduleImage(named: "stuckPoint_music_pause", moduleName: "BFFramework",isAssets: false)
                     musicNameLab.stop()
                 }
             } else {
@@ -134,9 +134,9 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
             }
         } else {
             if (bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji != nil {
-                audioImageView.setNetImage(url: "\((bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji ?? "")", placeholder: UIImage().BF_Image(named: "videomk_music_default"))
+                audioImageView.setNetImage(url: "\((bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji ?? "")", placeholder:UIImage.moduleImage(named: "videomk_music_default", moduleName: "BFFramework",isAssets: false)!)
             } else {
-                audioImageView.image = UIImage().BF_Image(named: "videomk_music_default")
+                audioImageView.image = UIImage.moduleImage(named: "videomk_music_default", moduleName: "BFFramework",isAssets: false)
             }
             titleLab.text = " \((bgmData as? PQStuckPointMusicTagsModel)?.tagName ?? "")"
             if (titleLab.text?.count ?? 0) > 8 {

BFFramework/Classes/Stuckpoint/View/PQStuckPointSearchEmptyCell.swift

@@ -11,7 +11,7 @@ import BFCommonKit
 
 class PQStuckPointSearchEmptyCell: UICollectionViewCell {
     lazy var emptyImageView: UIImageView = {
-        let emptyImageView = UIImageView(image: UIImage().BF_Image(named: "pic_search_empty"))
+        let emptyImageView = UIImageView(image:UIImage.moduleImage(named: "pic_search_empty", moduleName: "BFFramework",isAssets: false))
         emptyImageView.backgroundColor = UIColor.clear
         emptyImageView.contentMode = .scaleAspectFit
         return emptyImageView

BFFramework/Classes/Stuckpoint/View/PQVideoCutingOprateView.swift

@@ -68,7 +68,7 @@ class PQVideoCutingOprateView: UIView {
     }()
 
     lazy var leftOprateView: UIImageView = {
-        let leftOprateView = UIImageView(image: UIImage().BF_Image(named: "videomk_crop_left").withRenderingMode(.alwaysTemplate))
+        let leftOprateView = UIImageView(image:UIImage.moduleImage(named: "videomk_crop_left", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate))
         leftOprateView.tintColor = PQBFConfig.shared.cutViewTintColor
         leftOprateView.contentMode = .scaleAspectFill
         leftOprateView.isUserInteractionEnabled = true
@@ -81,7 +81,7 @@ class PQVideoCutingOprateView: UIView {
     }()
 
     lazy var rightOprateView: UIImageView = {
-        let rightOprateView = UIImageView(image: UIImage().BF_Image(named: "videomk_crop_right").withRenderingMode(.alwaysTemplate))
+        let rightOprateView = UIImageView(image:UIImage.moduleImage(named: "videomk_crop_right", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate))
         rightOprateView.tintColor = PQBFConfig.shared.cutViewTintColor
         rightOprateView.contentMode = .scaleAspectFill
         rightOprateView.isUserInteractionEnabled = true

BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -164,7 +164,7 @@ public class PQGPUImagePlayerView: UIView {
     // 暂停播放view
     lazy var playView: UIImageView = {
         let view = UIImageView(frame: CGRect(x: (self.frame.size.width - 52) / 2, y: (self.frame.size.height - 52) / 2, width: 52, height: 52))
-        view.image =  UIImage().BF_Image(named: "gpuplayBtn")
+        view.image = UIImage.moduleImage(named: "gpuplayBtn", moduleName: "BFFramework",isAssets: false)
         view.isHidden = true
         return view
 
@@ -214,7 +214,7 @@ public class PQGPUImagePlayerView: UIView {
         backgroundColor = PQBFConfig.shared.styleBackGroundColor
         playerEmptyView = UIImageView(frame: bounds)
         playerEmptyView.backgroundColor = .black
-        playerEmptyView.image =  UIImage().BF_Image(named: "playEmpty")
+        playerEmptyView.image = UIImage.moduleImage(named: "playEmpty", moduleName: "BFFramework",isAssets: false)
         playerEmptyView.contentMode = .center
         addSubview(playerEmptyView)
 

BFFramework/Classes/selectImage/PQSelecteVideoItemCell.swift

@@ -35,7 +35,7 @@ class PQSelecteVideoItemCell: UICollectionViewCell {
     }()
  
     lazy var seleImage: UIImageView = {
-        let seleImage = UIImageView(image: UIImage().BF_Image(named:  "icon_upload_do"))
+        let seleImage = UIImageView(image:UIImage.moduleImage(named: "icon_upload_do", moduleName: "BFFramework",isAssets: false))
         return seleImage
     }()
 

BFFramework/Classes/selectImage/PQUploadController.swift

@@ -137,7 +137,7 @@ class PQUploadController: PQBaseViewController {
         backBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
         backBtn.backgroundColor = .yellow
        
-        backBtn.setImage(UIImage().BF_Image(named:  "icon_blanc_back"), for: .normal)
+        backBtn.setImage(UIImage.moduleImage(named: "icon_blanc_back", moduleName: "BFFramework",isAssets: false), for: .normal)
         backBtn.addTarget(self, action: #selector(backBtnClick), for: .touchUpInside)
         return backBtn
     }()
@@ -243,7 +243,7 @@ class PQUploadController: PQBaseViewController {
         selecteBtn.titleLabel?.lineBreakMode = .byTruncatingTail
         selecteBtn.setTitle("全部", for: .normal)
         
-        selecteBtn.setImage(UIImage().BF_Image(named: "icon_uploadVideo_more"), for: .normal)
+        selecteBtn.setImage(UIImage.moduleImage(named: "icon_uploadVideo_more", moduleName: "BFFramework",isAssets: false), for: .normal)
         selecteBtn.setTitleColor(UIColor.black, for: .normal)
         selecteBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .medium)
         selecteBtn.tag = 2
@@ -254,7 +254,7 @@ class PQUploadController: PQBaseViewController {
 
     lazy var deleteBtn: UIButton = {
         let deleteBtn = UIButton(frame: CGRect(x: cDefaultMargin, y: 0, width: cDefaultMargin * 4, height: cDevice_iPhoneTabBarHei))
-        deleteBtn.setImage( UIImage().BF_Image(named:  "icon_blanc_back"), for: .normal)
+        deleteBtn.setImage(UIImage.moduleImage(named: "icon_blanc_back", moduleName: "BFFramework",isAssets: false), for: .normal)
         deleteBtn.tag = 1
         deleteBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
         return deleteBtn