1.修改部分类目

BFCommonKit/Classes/BFCategorys/BFBundle+Ext.swift

@@ -26,14 +26,18 @@ public extension Bundle {
         return Bundle(url: BF_mainbundle_URL())!
     }
 
-    private class func bundleURL(moduleName: String) -> URL? {
-        var bundleURL = Bundle.main.url(forResource: "Frameworks", withExtension: nil)
-        bundleURL = bundleURL?.appendingPathComponent(moduleName).appendingPathExtension("framework").appendingPathComponent("\(moduleName)_Resources").appendingPathExtension("bundle")
-        return bundleURL
+    private class func bundleURL(moduleName: String,isAssets: Bool = true) -> URL? {
+        if isAssets {
+            var bundleURL = Bundle.main.url(forResource: "Frameworks", withExtension: nil)
+            bundleURL = bundleURL?.appendingPathComponent(moduleName).appendingPathExtension("framework").appendingPathComponent("\(moduleName)_Resources").appendingPathExtension("bundle")
+            return bundleURL
+        } else {
+            return Bundle.main.url(forResource: moduleName, withExtension: "bundle")
+        }
     }
 
-    class func current(moduleName: String) -> Bundle? {
-        guard let url = bundleURL(moduleName: moduleName) else {
+    class func current(moduleName: String,isAssets: Bool = true) -> Bundle? {
+        guard let url = bundleURL(moduleName: moduleName,isAssets: isAssets) else {
             return nil
         }
         return Bundle(url: url)

BFCommonKit/Classes/BFCategorys/BFUIImage+Ext.swift

@@ -26,8 +26,8 @@ public extension UIImage {
         return image
     }
 
-    class func moduleImage(named: String, moduleName: String) -> UIImage? {
-        let image: UIImage? = UIImage(named: named, in: Bundle.current(moduleName: moduleName), compatibleWith: nil)
+    class func moduleImage(named: String, moduleName: String,isAssets:Bool = true) -> UIImage? {
+        let image: UIImage? = UIImage(named: named, in: Bundle.current(moduleName: moduleName,isAssets: isAssets), compatibleWith: nil)
         return image
     }