浏览代码

1,修改添加库中图片加载方式 2,添加所使用图片

jsonwang 3 年之前
父节点
当前提交
bf834752f1
共有 85 个文件被更改,包括 80 次插入45 次删除
  1. 二进制
      BFFramework/Assets/Stuckpoint/allPreview.png
  2. 二进制
      BFFramework/Assets/Stuckpoint/allPreview@2x.png
  3. 二进制
      BFFramework/Assets/Stuckpoint/allPreview@3x.png
  4. 二进制
      BFFramework/Assets/Stuckpoint/gpuplayBtn.png
  5. 二进制
      BFFramework/Assets/Stuckpoint/gpuplayBtn@2x.png
  6. 二进制
      BFFramework/Assets/Stuckpoint/gpuplayBtn@3x.png
  7. 二进制
      BFFramework/Assets/Stuckpoint/ic_heart@2x.png
  8. 二进制
      BFFramework/Assets/Stuckpoint/icon_oder@2x.png
  9. 二进制
      BFFramework/Assets/Stuckpoint/icon_search_delete@2x.png
  10. 二进制
      BFFramework/Assets/Stuckpoint/icon_search_s@2x.png
  11. 二进制
      BFFramework/Assets/Stuckpoint/icon_selected_down@2x.png
  12. 二进制
      BFFramework/Assets/Stuckpoint/icon_selected_up@2x.png
  13. 二进制
      BFFramework/Assets/Stuckpoint/icon_uploadVideo_do@2x.png
  14. 二进制
      BFFramework/Assets/Stuckpoint/icon_video_play@2x.png
  15. 二进制
      BFFramework/Assets/Stuckpoint/icon_video_play@3x.png
  16. 二进制
      BFFramework/Assets/Stuckpoint/material_loading.gif
  17. 二进制
      BFFramework/Assets/Stuckpoint/msg_clear_noreaded@2x.png
  18. 二进制
      BFFramework/Assets/Stuckpoint/msg_clear_noreaded@3x.png
  19. 二进制
      BFFramework/Assets/Stuckpoint/msg_default@2x.png
  20. 二进制
      BFFramework/Assets/Stuckpoint/msg_video_tag.png
  21. 二进制
      BFFramework/Assets/Stuckpoint/pic_network@2x.png
  22. 二进制
      BFFramework/Assets/Stuckpoint/pic_search_empty@2x.png
  23. 二进制
      BFFramework/Assets/Stuckpoint/playEmpty.png
  24. 二进制
      BFFramework/Assets/Stuckpoint/playEmpty@2x.png
  25. 二进制
      BFFramework/Assets/Stuckpoint/playEmpty@3x.png
  26. 二进制
      BFFramework/Assets/Stuckpoint/reCreate_opration_friend.png
  27. 二进制
      BFFramework/Assets/Stuckpoint/reCreate_opration_friend@2x.png
  28. 二进制
      BFFramework/Assets/Stuckpoint/reCreate_opration_friend@3x.png
  29. 二进制
      BFFramework/Assets/Stuckpoint/reCreate_opration_wechat.png
  30. 二进制
      BFFramework/Assets/Stuckpoint/reCreate_opration_wechat@2x.png
  31. 二进制
      BFFramework/Assets/Stuckpoint/reCreate_opration_wechat@3x.png
  32. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_dragingImage@2x.png
  33. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_dragingImage@3x.png
  34. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_edit_loading.gif
  35. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_music_loading.gif
  36. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_music_pause@2x.png
  37. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_music_pause@3x.png
  38. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_music_playing.gif
  39. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_reCreate_music@2x.png
  40. 二进制
      BFFramework/Assets/Stuckpoint/stuckPoint_reCreate_music@3x.png
  41. 二进制
      BFFramework/Assets/Stuckpoint/upload_delete@2x.png
  42. 二进制
      BFFramework/Assets/Stuckpoint/upload_delete@3x.png
  43. 二进制
      BFFramework/Assets/Stuckpoint/videomk_changeMode@2x.png
  44. 二进制
      BFFramework/Assets/Stuckpoint/videomk_changeMode@3x.png
  45. 二进制
      BFFramework/Assets/Stuckpoint/videomk_chose_nomal@2x.png
  46. 二进制
      BFFramework/Assets/Stuckpoint/videomk_chose_nomal@3x.png
  47. 二进制
      BFFramework/Assets/Stuckpoint/videomk_chose_selected@2x.png
  48. 二进制
      BFFramework/Assets/Stuckpoint/videomk_chose_selected@3x.png
  49. 二进制
      BFFramework/Assets/Stuckpoint/videomk_crop_left@2x.png
  50. 二进制
      BFFramework/Assets/Stuckpoint/videomk_crop_left@3x.png
  51. 二进制
      BFFramework/Assets/Stuckpoint/videomk_crop_right@2x.png
  52. 二进制
      BFFramework/Assets/Stuckpoint/videomk_crop_right@3x.png
  53. 二进制
      BFFramework/Assets/Stuckpoint/videomk_music_default@2x.png
  54. 二进制
      BFFramework/Assets/Stuckpoint/videomk_music_default@3x.png
  55. 二进制
      BFFramework/Assets/Stuckpoint/videomk_netMaterial_selected@2x.png
  56. 二进制
      BFFramework/Assets/Stuckpoint/videomk_netMaterial_selected@3x.png
  57. 二进制
      BFFramework/Assets/base/icon_detail_back@2x.png
  58. 二进制
      BFFramework/Assets/base/icon_detail_back@3x.png
  59. 二进制
      BFFramework/Assets/base/loading_pq.gif
  60. 二进制
      BFFramework/Assets/base/placehold_image@2x.png
  61. 二进制
      BFFramework/Assets/base/placehold_image@3x.png
  62. 1 1
      BFFramework/Classes/Base/Controller/PQBaseViewController.swift
  63. 1 1
      BFFramework/Classes/Base/View/PQAssetCategoryCell.swift
  64. 3 3
      BFFramework/Classes/Base/View/PQBaseVideoInfoView.swift
  65. 5 5
      BFFramework/Classes/Base/View/PQChoseMaterialCell.swift
  66. 1 1
      BFFramework/Classes/Base/View/PQFollowButton.swift
  67. 1 1
      BFFramework/Classes/Base/View/PQHeartAnimation.swift
  68. 1 1
      BFFramework/Classes/Base/View/PQLoadingHUB.swift
  69. 3 3
      BFFramework/Classes/Base/View/PQRemindView.swift
  70. 1 1
      BFFramework/Classes/Base/View/PQSectionHeadView.swift
  71. 22 0
      BFFramework/Classes/Categorys/Bundle+Ext.swift
  72. 10 0
      BFFramework/Classes/Categorys/UIImage+Ext.swift
  73. 1 1
      BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift
  74. 2 2
      BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift
  75. 4 4
      BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialDetailController.swift
  76. 2 2
      BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicController.swift
  77. 3 3
      BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift
  78. 1 1
      BFFramework/Classes/Stuckpoint/View/PQCuttingPointView.swift
  79. 2 2
      BFFramework/Classes/Stuckpoint/View/PQStuckPointLoadingView.swift
  80. 1 1
      BFFramework/Classes/Stuckpoint/View/PQStuckPointMaterialHeadView.swift
  81. 9 7
      BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicContentCell.swift
  82. 1 1
      BFFramework/Classes/Stuckpoint/View/PQStuckPointSearchEmptyCell.swift
  83. 2 2
      BFFramework/Classes/Stuckpoint/View/PQVideoCutingOprateView.swift
  84. 2 2
      BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift
  85. 1 0
      BFFramework/Classes/Utils/PQCommonMethodUtil.swift

二进制
BFFramework/Assets/Stuckpoint/allPreview.png


二进制
BFFramework/Assets/Stuckpoint/allPreview@2x.png


二进制
BFFramework/Assets/Stuckpoint/allPreview@3x.png


二进制
BFFramework/Assets/Stuckpoint/gpuplayBtn.png


二进制
BFFramework/Assets/Stuckpoint/gpuplayBtn@2x.png


二进制
BFFramework/Assets/Stuckpoint/gpuplayBtn@3x.png


二进制
BFFramework/Assets/Stuckpoint/ic_heart@2x.png


二进制
BFFramework/Assets/Stuckpoint/icon_oder@2x.png


二进制
BFFramework/Assets/Stuckpoint/icon_search_delete@2x.png


二进制
BFFramework/Assets/Stuckpoint/icon_search_s@2x.png


二进制
BFFramework/Assets/Stuckpoint/icon_selected_down@2x.png


二进制
BFFramework/Assets/Stuckpoint/icon_selected_up@2x.png


二进制
BFFramework/Assets/Stuckpoint/icon_uploadVideo_do@2x.png


二进制
BFFramework/Assets/Stuckpoint/icon_video_play@2x.png


二进制
BFFramework/Assets/Stuckpoint/icon_video_play@3x.png


二进制
BFFramework/Assets/Stuckpoint/material_loading.gif


二进制
BFFramework/Assets/Stuckpoint/msg_clear_noreaded@2x.png


二进制
BFFramework/Assets/Stuckpoint/msg_clear_noreaded@3x.png


二进制
BFFramework/Assets/Stuckpoint/msg_default@2x.png


二进制
BFFramework/Assets/Stuckpoint/msg_video_tag.png


二进制
BFFramework/Assets/Stuckpoint/pic_network@2x.png


二进制
BFFramework/Assets/Stuckpoint/pic_search_empty@2x.png


二进制
BFFramework/Assets/Stuckpoint/playEmpty.png


二进制
BFFramework/Assets/Stuckpoint/playEmpty@2x.png


二进制
BFFramework/Assets/Stuckpoint/playEmpty@3x.png


二进制
BFFramework/Assets/Stuckpoint/reCreate_opration_friend.png


二进制
BFFramework/Assets/Stuckpoint/reCreate_opration_friend@2x.png


二进制
BFFramework/Assets/Stuckpoint/reCreate_opration_friend@3x.png


二进制
BFFramework/Assets/Stuckpoint/reCreate_opration_wechat.png


二进制
BFFramework/Assets/Stuckpoint/reCreate_opration_wechat@2x.png


二进制
BFFramework/Assets/Stuckpoint/reCreate_opration_wechat@3x.png


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_dragingImage@2x.png


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_dragingImage@3x.png


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_edit_loading.gif


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_music_loading.gif


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_music_pause@2x.png


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_music_pause@3x.png


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_music_playing.gif


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_reCreate_music@2x.png


二进制
BFFramework/Assets/Stuckpoint/stuckPoint_reCreate_music@3x.png


二进制
BFFramework/Assets/Stuckpoint/upload_delete@2x.png


二进制
BFFramework/Assets/Stuckpoint/upload_delete@3x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_changeMode@2x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_changeMode@3x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_chose_nomal@2x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_chose_nomal@3x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_chose_selected@2x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_chose_selected@3x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_crop_left@2x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_crop_left@3x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_crop_right@2x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_crop_right@3x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_music_default@2x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_music_default@3x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_netMaterial_selected@2x.png


二进制
BFFramework/Assets/Stuckpoint/videomk_netMaterial_selected@3x.png


二进制
BFFramework/Assets/base/icon_detail_back@2x.png


二进制
BFFramework/Assets/base/icon_detail_back@3x.png


二进制
BFFramework/Assets/base/loading_pq.gif


二进制
BFFramework/Assets/base/placehold_image@2x.png


二进制
BFFramework/Assets/base/placehold_image@3x.png


+ 1 - 1
BFFramework/Classes/Base/Controller/PQBaseViewController.swift

@@ -76,7 +76,7 @@ public class PQBaseViewController: UIViewController, UIGestureRecognizerDelegate
         let leftButton = UIButton(type: .custom)
         leftButton.frame = CGRect(x: 0, y: cDevice_iPhoneStatusBarHei, width: cDefaultMargin * 4, height: cDefaultMargin * 4)
         leftButton.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
-        leftButton.setImage(UIImage(named: image ?? "icon_detail_back"), for: .normal)
+        leftButton.setImage(UIImage.init().BF_Image(named:  image ?? "icon_detail_back"), for: .normal)
         leftButton.addTarget(self, action: #selector(backBtnClick), for: .touchUpInside)
         navHeadImageView?.addSubview(leftButton)
         backButton = leftButton

+ 1 - 1
BFFramework/Classes/Base/View/PQAssetCategoryCell.swift

@@ -32,7 +32,7 @@ class PQAssetCategoryCell: UICollectionViewCell {
     }()
 
     lazy var seleImage: UIImageView = {
-        let seleImage = UIImageView(image: UIImage(named: "icon_uploadVideo_do"))
+        let seleImage = UIImageView(image: UIImage.init().BF_Image(named:  "icon_uploadVideo_do"))
         seleImage.isHidden = true
         return seleImage
     }()

+ 3 - 3
BFFramework/Classes/Base/View/PQBaseVideoInfoView.swift

@@ -10,14 +10,14 @@ import UIKit
 
 class PQBaseVideoInfoView: UIView {
     lazy var imageView: UIImageView = {
-        let imageView = UIImageView(image: UIImage(named: "msg_default"))
+        let imageView = UIImageView(image: UIImage.init().BF_Image(named:  "msg_default"))
         imageView.addCorner(corner: 4)
         imageView.contentMode = .scaleAspectFill
         return imageView
     }()
 
     lazy var videoTagView: UIImageView = {
-        let videoTagView = UIImageView(image: UIImage(named: "msg_video_tag"))
+        let videoTagView = UIImageView(image: UIImage.init().BF_Image(named:  "msg_video_tag"))
         return videoTagView
     }()
 
@@ -51,7 +51,7 @@ class PQBaseVideoInfoView: UIView {
     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(named: "msg_default")!)
+        imageView.setNetImage(url: coverImg, placeholder: UIImage.init().BF_Image(named: "msg_default"))
         titleLab.text = videoData?.title
     }
 

+ 5 - 5
BFFramework/Classes/Base/View/PQChoseMaterialCell.swift

@@ -44,13 +44,13 @@ class PQChoseMaterialCell: UICollectionViewCell {
     }()
 
     lazy var videoStatuImageView: UIImageView = {
-        let videoStatuImageView = UIImageView(image: UIImage(named: "allPreview"))
+        let videoStatuImageView = UIImageView(image: UIImage.init().BF_Image(named:  "allPreview"))
         return videoStatuImageView
     }()
 
     lazy var videoLoadingView: AnimatedImageView = {
         let videoLoadingView = AnimatedImageView()
-        videoLoadingView.kf.setImage(with: URL(fileURLWithPath: Bundle.main.path(forResource: "material_loading", ofType: ".gif")!))
+        videoLoadingView.kf.setImage(with: URL(fileURLWithPath:  Bundle.init().BF_mainbundle().path(forResource: "material_loading", ofType: ".gif")!))
         videoLoadingView.stopAnimating()
         return videoLoadingView
     }()
@@ -65,8 +65,8 @@ class PQChoseMaterialCell: UICollectionViewCell {
 
     lazy var choseBtn: UIButton = {
         let choseBtn = UIButton(type: .custom)
-        choseBtn.setBackgroundImage(UIImage(named: "videomk_chose_nomal"), for: .normal)
-        choseBtn.setBackgroundImage(UIImage(named: "videomk_chose_selected"), for: .selected)
+        choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_nomal"), for: .normal)
+        choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_selected"), for: .selected)
         choseBtn.setTitleColor(UIColor.white, for: .normal)
         choseBtn.titleLabel?.font = UIFont.systemFont(ofSize: 12)
         choseBtn.tag = 1
@@ -78,7 +78,7 @@ class PQChoseMaterialCell: UICollectionViewCell {
     /// 删除按钮
     lazy var deleteBtn: UIButton = {
         let deleteBtn = UIButton(type: .custom)
-        deleteBtn.setImage(UIImage(named: "icon_search_delete"), for: .normal)
+        deleteBtn.setImage(UIImage.init().BF_Image(named:  "icon_search_delete"), for: .normal)
         deleteBtn.tag = 2
         deleteBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
         deleteBtn.isHidden = !isAdded

+ 1 - 1
BFFramework/Classes/Base/View/PQFollowButton.swift

@@ -15,7 +15,7 @@ class PQFollowButton: UIButton {
         let attenBtn = UIButton(type: .custom)
         attenBtn.isUserInteractionEnabled = false
         attenBtn.setTitle("", for: .selected)
-        attenBtn.setImage(UIImage(named: "icon_oder"), for: .selected)
+        attenBtn.setImage(UIImage.init().BF_Image(named: "icon_oder"), for: .selected)
         attenBtn.setTitle("+", for: .normal)
         attenBtn.setImage(nil, for: .normal)
         attenBtn.setTitleColor(UIColor.white, for: .normal)

+ 1 - 1
BFFramework/Classes/Base/View/PQHeartAnimation.swift

@@ -18,7 +18,7 @@ class PQHeartAnimation: NSObject {
         }
         let imgV = UIImageView(frame: CGRect(x: point.x - size / 2.0, y: point.y - size / 2.0, width: size, height: size))
         imgV.tag = cHeartTag
-        imgV.image = UIImage(named: "ic_heart")
+        imgV.image = UIImage.init().BF_Image(named:  "ic_heart")
         imgV.contentMode = .scaleAspectFill
         baseView.addSubview(imgV)
 

+ 1 - 1
BFFramework/Classes/Base/View/PQLoadingHUB.swift

@@ -11,7 +11,7 @@ import UIKit
 class PQLoadingHUBView: UIView {
     lazy var loadingImage: UIImageView = {
         let loadingImage = UIImageView()
-        loadingImage.kf.setImage(with: URL(fileURLWithPath: Bundle.main.path(forResource: "loading_pq", ofType: ".gif")!))
+        loadingImage.kf.setImage(with: URL(fileURLWithPath: Bundle.init().BF_mainbundle().path(forResource: "loading_pq", ofType: ".gif")!))
         return loadingImage
     }()
 

+ 3 - 3
BFFramework/Classes/Base/View/PQRemindView.swift

@@ -86,10 +86,10 @@ extension PQEmptyRemindView {
             refreshBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#EE0051")
             refreshBtn.setTitleColor(UIColor.white, for: .normal)
             refreshBtn.setTitle("刷新", for: .normal)
-            imageView.image = UIImage(named: "pic_network")
+            imageView.image = UIImage.init().BF_Image(named:  "pic_network")
         } else {
             if emptyData?.emptyImage != nil, emptyData?.emptyImage?.count ?? 0 > 0 {
-                imageView.image = UIImage(named: emptyData?.emptyImage ?? "")
+                imageView.image = UIImage.init().BF_Image(named:  emptyData?.emptyImage ?? "")
             } else {
                 imageView.image = nil
             }
@@ -97,7 +97,7 @@ extension PQEmptyRemindView {
             remindSubLab.text = emptyData?.summary
             refreshBtn.isHidden = emptyData?.isRefreshHidden ?? true
             if emptyData?.refreshImage != nil, (emptyData?.refreshImage?.count ?? 0) > 0 {
-                refreshBtn.setImage(UIImage(named: emptyData?.refreshImage ?? ""), for: .normal)
+                refreshBtn.setImage(UIImage.init().BF_Image(named:  emptyData?.refreshImage ?? ""), for: .normal)
             } else {
                 refreshBtn.setImage(nil, for: .normal)
             }

+ 1 - 1
BFFramework/Classes/Base/View/PQSectionHeadView.swift

@@ -42,7 +42,7 @@ class PQSectionHeadView: UIView {
     lazy var clearBtn: UIButton = {
         let clearBtn = UIButton(type: .custom)
         clearBtn.setTitle("全部已读 ", for: .normal)
-        clearBtn.setImage(UIImage(named: "msg_clear_noreaded"), for: .normal)
+        clearBtn.setImage(UIImage.init().BF_Image(named: "msg_clear_noreaded"), 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)

+ 22 - 0
BFFramework/Classes/Categorys/Bundle+Ext.swift

@@ -0,0 +1,22 @@
+//
+//  Bundle+Ext.swift
+//  BFFramework
+//
+//  Created by ak on 2021/6/2.
+//  取 BFFramework 资源目录
+
+import Foundation
+
+extension Bundle {
+    
+    // bf main bundle url
+    func BF_mainbundle_URL() -> URL {
+        let bundle:Bundle = Bundle.init(for: PQBaseViewController.self)
+        return bundle.url(forResource: "BFFramework", withExtension: "bundle")!
+    }
+    // bf main bundle
+    func BF_mainbundle() -> Bundle {
+        return  Bundle.init(url: BF_mainbundle_URL())!
+    }
+ 
+}

+ 10 - 0
BFFramework/Classes/Categorys/UIImage+Ext.swift

@@ -7,7 +7,17 @@
 //
 
 import Foundation
+
 extension UIImage {
+    
+    //从BFframwork bundle 中取图片
+    func BF_Image(named:String) -> UIImage {
+  
+        let image:UIImage = UIImage.init(named: named, in:  Bundle.init().BF_mainbundle(), compatibleWith: nil) ?? UIImage.init()
+        return image
+        
+    }
+ 
     func cropImage(ratio: CGFloat) -> UIImage {
         // 计算最终尺寸
         let newSize: CGSize = CGSize(width: size.width, height: size.width * ratio)

+ 1 - 1
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -155,7 +155,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         musicNameView.frame = CGRect(x: (view.frame.width - nameWidth) / 2, y: cDevice_iPhoneStatusBarHei + (cDevice_iPhoneNavBarHei - cDefaultMargin * 3) / 2, width: nameWidth, height: cDefaultMargin * 3)
 //        musicNameView.backgroundColor = UIColor.hexColor(hexadecimal: "#333333")
         musicNameView.addCorner(corner: musicNameView.frame.height / 2)
-        let musicImageView = UIImageView(image: UIImage(named: "stuckPoint_reCreate_music"))
+        let musicImageView = UIImageView(image:UIImage.init().BF_Image(named:  "stuckPoint_reCreate_music"))
         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

+ 2 - 2
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -29,8 +29,8 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         let changeCollecBtn = UIButton(frame: CGRect(x: cDefaultMargin * 5, y: cDevice_iPhoneStatusBarHei, width: cScreenWidth - cDefaultMargin * 10, height: cDefaultMargin * 4))
         changeCollecBtn.titleLabel?.lineBreakMode = .byTruncatingTail
         changeCollecBtn.setTitle("全部", for: .normal)
-        changeCollecBtn.setImage(UIImage(named: "icon_selected_down"), for: .normal)
-        changeCollecBtn.setImage(UIImage(named: "icon_selected_up"), for: .selected)
+        changeCollecBtn.setImage(UIImage.init().BF_Image(named:  "icon_selected_down"), for: .normal)
+        changeCollecBtn.setImage(UIImage.init().BF_Image(named:  "icon_selected_up"), for: .selected)
         changeCollecBtn.setTitleColor(UIColor.white, for: .selected)
         changeCollecBtn.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .medium)
         changeCollecBtn.tag = 1

+ 4 - 4
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialDetailController.swift

@@ -50,7 +50,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(named: "videomk_chose_nomal"), for: .normal)
+        choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_nomal"), for: .normal)
         choseBtn.setTitleColor(UIColor.white, for: .normal)
         choseBtn.titleLabel?.font = UIFont.systemFont(ofSize: 12)
         choseBtn.tag = 1
@@ -61,7 +61,7 @@ class PQStuckPointMaterialDetailController: PQBaseViewController {
 
     lazy var changeModeBtn: UIButton = {
         let changeModeBtn = UIButton(type: .custom)
-        changeModeBtn.setImage(UIImage(named: "videomk_changeMode"), for: .normal)
+        changeModeBtn.setImage(UIImage.init().BF_Image(named:  "videomk_changeMode"), 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)
@@ -80,7 +80,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(named: "icon_video_play_big"), for: .normal)
+        playBtn.setImage(UIImage.init().BF_Image(named:  "icon_video_play_big"), for: .normal)
         playBtn.isUserInteractionEnabled = false
         playBtn.isHidden = true
         // playBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
@@ -357,7 +357,7 @@ class PQStuckPointMaterialDetailController: PQBaseViewController {
             }
             choseTitleBtn.isSelected = true
         } else {
-            choseBtn.setBackgroundImage(UIImage(named: "videomk_chose_nomal"), for: .normal)
+            choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_nomal"), for: .normal)
             choseBtn.backgroundColor = UIColor.clear
             choseBtn.setTitle(nil, for: .normal)
             choseTitleBtn.isSelected = false

+ 2 - 2
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicController.swift

@@ -69,7 +69,7 @@ class PQStuckPointMusicController: PQBaseViewController {
     // 输入框清空按钮
     lazy var clearBtn: UIButton = {
         let clearBtn = UIButton(type: .custom)
-        clearBtn.setImage(UIImage(named: "icon_search_delete"), for: .normal)
+        clearBtn.setImage(UIImage.init().BF_Image(named:  "icon_search_delete"), 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)
@@ -88,7 +88,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(named: "icon_search_s"))
+        let imageView = UIImageView(image: UIImage.init().BF_Image(named:  "icon_search_s"))
         imageView.frame = CGRect(x: 15, y: 8, width: 16, height: 16)
         leftView.addSubview(imageView)
         searchTF.leftView = leftView

+ 3 - 3
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -170,7 +170,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(named: "icon_video_play_big"), for: .normal)
+        playBtn.setImage(UIImage.init().BF_Image(named: "icon_video_play_big"), for: .normal)
         playBtn.tag = 4
         playBtn.isHidden = true
         playBtn.isUserInteractionEnabled = false
@@ -214,7 +214,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     lazy var shareWechatBtn: UIButton = {
         let shareWechatBtn = UIButton(type: .custom)
         shareWechatBtn.frame = CGRect(x: 0, y: 0, width: 165, height: 100)
-        shareWechatBtn.setImage(UIImage(named: "reCreate_opration_wechat"), for: .normal)
+        shareWechatBtn.setImage(UIImage.init().BF_Image(named:  "reCreate_opration_wechat"), for: .normal)
         shareWechatBtn.setTitle("分享好友和群", for: .normal)
         shareWechatBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16)
         shareWechatBtn.setTitleColor(UIColor.white, for: .normal)
@@ -229,7 +229,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     lazy var shareFriendBtn: UIButton = {
         let shareFriendBtn = UIButton(type: .custom)
         shareFriendBtn.frame = CGRect(x: 0, y: 0, width: 165, height: 100)
-        shareFriendBtn.setImage(UIImage(named: "reCreate_opration_friend"), for: .normal)
+        shareFriendBtn.setImage(UIImage.init().BF_Image(named:  "reCreate_opration_friend"), for: .normal)
         shareFriendBtn.setTitle("分享朋友圈", for: .normal)
         shareFriendBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16)
         shareFriendBtn.setTitleColor(UIColor.white, for: .normal)

+ 1 - 1
BFFramework/Classes/Stuckpoint/View/PQCuttingPointView.swift

@@ -17,7 +17,7 @@ class PQCuttingPointView: UIView {
     }()
 
     lazy var dragingImageView: UIImageView = {
-        let dragingImageView = UIImageView(image: UIImage(named: "stuckPoint_dragingImage"))
+        let dragingImageView = UIImageView(image: UIImage.init().BF_Image(named:  "stuckPoint_dragingImage"))
         return dragingImageView
     }()
 

+ 2 - 2
BFFramework/Classes/Stuckpoint/View/PQStuckPointLoadingView.swift

@@ -15,7 +15,7 @@ class PQStuckPointLoadingView: UIView {
     /// 同步进度显示
     lazy var loadingView: AnimatedImageView = {
         let loadingView = AnimatedImageView()
-        loadingView.kf.setImage(with: URL(fileURLWithPath: Bundle.main.path(forResource: "stuckPoint_edit_loading", ofType: ".gif")!))
+        loadingView.kf.setImage(with: URL(fileURLWithPath: Bundle.init().BF_mainbundle().path(forResource: "stuckPoint_edit_loading", ofType: ".gif")!))
         loadingView.startAnimating()
         return loadingView
     }()
@@ -25,7 +25,7 @@ class PQStuckPointLoadingView: UIView {
         navBarLeftBtn.frame = CGRect(x: 0, y: cDevice_iPhoneStatusBarHei, width: cDefaultMargin * 4, height: cDefaultMargin * 4)
         navBarLeftBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
         navBarLeftBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
-        navBarLeftBtn.setImage(UIImage(named: "icon_detail_back"), for: .normal)
+        navBarLeftBtn.setImage(UIImage.init().BF_Image(named:  "icon_detail_back"), for: .normal)
         navBarLeftBtn.addTarget(self, action: #selector(cancelDownload(sender:)), for: .touchUpInside)
         return navBarLeftBtn
     }()

+ 1 - 1
BFFramework/Classes/Stuckpoint/View/PQStuckPointMaterialHeadView.swift

@@ -10,7 +10,7 @@ import UIKit
 import SnapKit
 class PQStuckPointMaterialHeadView: UIView {
     lazy var iconImageView: UIImageView = {
-        let iconImageView = UIImageView(image: UIImage(named: "videomk_netMaterial_selected"))
+        let iconImageView = UIImageView(image: UIImage.init().BF_Image(named:  "videomk_netMaterial_selected"))
         return iconImageView
     }()
 

+ 9 - 7
BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicContentCell.swift

@@ -14,7 +14,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
     var contentType: stuckPointMusicContentType = .catagery
 
     lazy var audioImageView: UIImageView = {
-        let audioImageView = UIImageView(image: UIImage(named: "videomk_music_default"))
+        let audioImageView = UIImageView(image: UIImage.init().BF_Image(named:  "videomk_music_default"))
         audioImageView.addCorner(corner: 4)
         audioImageView.contentMode = .scaleAspectFill
         return audioImageView
@@ -29,7 +29,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
 
     lazy var playImageView: UIImageView = {
         let playImageView = UIImageView()
-        playImageView.image = UIImage(named: "stuckPoint_music_pause")
+        playImageView.image = UIImage.init().BF_Image(named:  "stuckPoint_music_pause")
         return playImageView
     }()
 
@@ -114,16 +114,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(named: "videomk_music_default")!)
+            audioImageView.setNetImage(url: "\((bgmData as? PQVoiceModel)?.avatarUrl ?? "")", placeholder: UIImage.init().BF_Image(named:  "videomk_music_default"))
             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.main.path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
+                    playImageView.kf.setImage(with: URL(fileURLWithPath: Bundle.init().BF_mainbundle().path(forResource: "stuckPoint_music_playing", ofType: ".gif")!))
                     musicNameLab.move()
                 } else {
-                    playImageView.image = UIImage(named: "stuckPoint_music_pause")
+                    playImageView.image = UIImage.init().BF_Image(named:  "stuckPoint_music_pause")
                     musicNameLab.stop()
                 }
             } else {
@@ -132,10 +132,12 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
                 musicNameLab.stop()
             }
         } else {
+            
+
             if (bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji != nil {
-                audioImageView.setNetImage(url: "\((bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji ?? "")", placeholder: UIImage(named: "videomk_music_default")!)
+                audioImageView.setNetImage(url: "\((bgmData as? PQStuckPointMusicTagsModel)?.tagEmoji ?? "")", placeholder: UIImage.init().BF_Image(named: "videomk_music_default"))
             } else {
-                audioImageView.image = UIImage(named: "videomk_music_default")
+                audioImageView.image = UIImage.init().BF_Image(named:  "videomk_music_default")
             }
             titleLab.text = " \((bgmData as? PQStuckPointMusicTagsModel)?.tagName ?? "")"
             if (titleLab.text?.count ?? 0) > 8 {

+ 1 - 1
BFFramework/Classes/Stuckpoint/View/PQStuckPointSearchEmptyCell.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class PQStuckPointSearchEmptyCell: UICollectionViewCell {
     lazy var emptyImageView: UIImageView = {
-        let emptyImageView = UIImageView(image: UIImage(named: "pic_search_empty"))
+        let emptyImageView = UIImageView(image: UIImage.init().BF_Image(named:  "pic_search_empty"))
         emptyImageView.backgroundColor = UIColor.clear
         emptyImageView.contentMode = .scaleAspectFit
         return emptyImageView

+ 2 - 2
BFFramework/Classes/Stuckpoint/View/PQVideoCutingOprateView.swift

@@ -66,7 +66,7 @@ class PQVideoCutingOprateView: UIView {
     }()
 
     lazy var leftOprateView: UIImageView = {
-        let leftOprateView = UIImageView(image: UIImage(named: "videomk_crop_left"))
+        let leftOprateView = UIImageView(image:UIImage.init().BF_Image(named:  "videomk_crop_left"))
         leftOprateView.contentMode = .scaleAspectFill
         leftOprateView.isUserInteractionEnabled = true
         leftOprateView.backgroundColor = UIColor.white
@@ -78,7 +78,7 @@ class PQVideoCutingOprateView: UIView {
     }()
 
     lazy var rightOprateView: UIImageView = {
-        let rightOprateView = UIImageView(image: UIImage(named: "videomk_crop_right"))
+        let rightOprateView = UIImageView(image: UIImage.init().BF_Image(named:  "videomk_crop_right"))
         rightOprateView.contentMode = .scaleAspectFill
         rightOprateView.isUserInteractionEnabled = true
         rightOprateView.backgroundColor = UIColor.white

+ 2 - 2
BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -167,7 +167,7 @@ public class PQGPUImagePlayerView: UIView, RenderViewDelegate {
     // 暂停播放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(named: "gpuplayBtn")
+        view.image = UIImage.init().BF_Image(named:  "gpuplayBtn")
         view.isHidden = true
         return view
 
@@ -218,7 +218,7 @@ public class PQGPUImagePlayerView: UIView, RenderViewDelegate {
 
         playerEmptyView = UIImageView(frame: bounds)
         playerEmptyView.backgroundColor = .black
-        playerEmptyView.image = UIImage(named: "playEmpty")
+        playerEmptyView.image = UIImage.init().BF_Image(named:  "playEmpty")
         playerEmptyView.contentMode = .center
         addSubview(playerEmptyView)
 

+ 1 - 0
BFFramework/Classes/Utils/PQCommonMethodUtil.swift

@@ -801,6 +801,7 @@ var playGifImages: [UIImage] = {
     for i in 0 ... 44 {
         gifImages.append(UIImage(named: "\(i).png")!)
     }
+    
     return gifImages
 }()