wenweiwei 3 rokov pred
rodič
commit
605256b956

+ 4 - 4
BFCommonKit.podspec

@@ -62,10 +62,10 @@ TODO: Add long description of the pod here.
     dd.frameworks = 'UIKit','MessageUI','WebKit'
   end
 
-  # s.resource_bundles = {
-  #   'BFCommonKit' => ['BFCommonKit/Assets/*.png']
-  # }
-
+   s.resource_bundles = {
+     'BFCommon_Resources' => ['BFCommonKit/Assets/Resources/*.png']
+   }
+#    s.resources = 'BFCommonKit/Assets/Resources/*.png'
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
 #  s.frameworks = 'UIKit', 'AVFoundation','CoreMedia', 'QuartzCore'

BIN
BFCommonKit/Assets/Resources/icon_detail_back@2x.png


BIN
BFCommonKit/Assets/Resources/icon_detail_back@3x.png


BIN
BFCommonKit/Assets/Resources/placehold_image@2x.png


BIN
BFCommonKit/Assets/Resources/placehold_image@3x.png


+ 2 - 5
BFCommonKit/Classes/BFCategorys/BFBundle+Ext.swift

@@ -10,11 +10,8 @@ import Foundation
 public extension Bundle {
     // bf main bundle url
     func BF_mainbundle_URL() -> URL {
-        guard let className = NSClassFromString("PQBaseViewController").self else {
-            return Bundle.main.url(forResource: "BFCommonKit", withExtension: "bundle")!
-        }
-        let bundle: Bundle = Bundle(for: className.self)
-        return bundle.url(forResource: "BFCommonKit", withExtension: "bundle")!
+        let bundle: Bundle = Bundle(for: PQBaseViewController.self)
+        return bundle.url(forResource: "BFCommon_Resources", withExtension: "bundle")!
     }
 
     // bf main bundle

+ 2 - 1
Example/BFCommonKit/ViewController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 import BFCommonKit
-class ViewController: UIViewController {
+class ViewController: PQBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -17,6 +17,7 @@ class ViewController: UIViewController {
         btn.frame = CGRect.init(x: 100, y: 100, width: 100, height: 100)
         btn.backgroundColor = UIColor.hexColor(hexadecimal: "#3DC1C1")
         view.addSubview(btn)
+        leftBackButton()
     }
 
     override func didReceiveMemoryWarning() {

+ 12 - 12
Example/Podfile.lock

@@ -1,20 +1,20 @@
 PODS:
   - Alamofire (4.9.1)
-  - BFCommonKit (0.1.8):
-    - BFCommonKit/BFBase (= 0.1.8)
-    - BFCommonKit/BFCategorys (= 0.1.8)
-    - BFCommonKit/BFDebug (= 0.1.8)
-    - BFCommonKit/BFEnums (= 0.1.8)
-    - BFCommonKit/BFUtility (= 0.1.8)
-  - BFCommonKit/BFBase (0.1.8):
+  - BFCommonKit (1.0.0):
+    - BFCommonKit/BFBase (= 1.0.0)
+    - BFCommonKit/BFCategorys (= 1.0.0)
+    - BFCommonKit/BFDebug (= 1.0.0)
+    - BFCommonKit/BFEnums (= 1.0.0)
+    - BFCommonKit/BFUtility (= 1.0.0)
+  - BFCommonKit/BFBase (1.0.0):
     - Alamofire (= 4.9.1)
     - SnapKit (= 5.0.1)
-  - BFCommonKit/BFCategorys (0.1.8):
+  - BFCommonKit/BFCategorys (1.0.0):
     - BFCommonKit/BFUtility
     - KingfisherWebP (= 1.3.0)
-  - BFCommonKit/BFDebug (0.1.8)
-  - BFCommonKit/BFEnums (0.1.8)
-  - BFCommonKit/BFUtility (0.1.8):
+  - BFCommonKit/BFDebug (1.0.0)
+  - BFCommonKit/BFEnums (1.0.0)
+  - BFCommonKit/BFUtility (1.0.0):
     - Alamofire (= 4.9.1)
     - KeychainAccess (= 4.2.2)
     - Kingfisher (= 6.3.0)
@@ -56,7 +56,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
-  BFCommonKit: 1d33c63dc666847c73139c286751f83a2334d5a0
+  BFCommonKit: 50249e57b04c95674d59056ac7c649abbf1f4659
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
   Kingfisher: 6c3df386db71d82c0817a429d2c9421a77396529
   KingfisherWebP: dec17a5eb1af2658791bde1f93ae9a853678f826

+ 7 - 2
Example/Pods/Local Podspecs/BFCommonKit.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "BFCommonKit",
-  "version": "0.1.8",
+  "version": "1.0.0",
   "summary": "A short description of BFCommonKit.",
   "swift_versions": "5.0",
   "description": "TODO: Add long description of the pod here.",
@@ -14,11 +14,16 @@
   },
   "source": {
     "git": "https://git.yishihui.com/wenweiwei/BFCommonKit.git",
-    "tag": "0.1.8"
+    "tag": "1.0.0"
   },
   "platforms": {
     "ios": "10.0"
   },
+  "resource_bundles": {
+    "BFCommon_Resources": [
+      "BFCommonKit/Assets/Resources/*.png"
+    ]
+  },
   "subspecs": [
     {
       "name": "BFBase",

+ 12 - 12
Example/Pods/Manifest.lock

@@ -1,20 +1,20 @@
 PODS:
   - Alamofire (4.9.1)
-  - BFCommonKit (0.1.8):
-    - BFCommonKit/BFBase (= 0.1.8)
-    - BFCommonKit/BFCategorys (= 0.1.8)
-    - BFCommonKit/BFDebug (= 0.1.8)
-    - BFCommonKit/BFEnums (= 0.1.8)
-    - BFCommonKit/BFUtility (= 0.1.8)
-  - BFCommonKit/BFBase (0.1.8):
+  - BFCommonKit (1.0.0):
+    - BFCommonKit/BFBase (= 1.0.0)
+    - BFCommonKit/BFCategorys (= 1.0.0)
+    - BFCommonKit/BFDebug (= 1.0.0)
+    - BFCommonKit/BFEnums (= 1.0.0)
+    - BFCommonKit/BFUtility (= 1.0.0)
+  - BFCommonKit/BFBase (1.0.0):
     - Alamofire (= 4.9.1)
     - SnapKit (= 5.0.1)
-  - BFCommonKit/BFCategorys (0.1.8):
+  - BFCommonKit/BFCategorys (1.0.0):
     - BFCommonKit/BFUtility
     - KingfisherWebP (= 1.3.0)
-  - BFCommonKit/BFDebug (0.1.8)
-  - BFCommonKit/BFEnums (0.1.8)
-  - BFCommonKit/BFUtility (0.1.8):
+  - BFCommonKit/BFDebug (1.0.0)
+  - BFCommonKit/BFEnums (1.0.0)
+  - BFCommonKit/BFUtility (1.0.0):
     - Alamofire (= 4.9.1)
     - KeychainAccess (= 4.2.2)
     - Kingfisher (= 6.3.0)
@@ -56,7 +56,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
-  BFCommonKit: 1d33c63dc666847c73139c286751f83a2334d5a0
+  BFCommonKit: 50249e57b04c95674d59056ac7c649abbf1f4659
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
   Kingfisher: 6c3df386db71d82c0817a429d2c9421a77396529
   KingfisherWebP: dec17a5eb1af2658791bde1f93ae9a853678f826

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 416 - 395
Example/Pods/Pods.xcodeproj/project.pbxproj


+ 1 - 1
Example/Pods/Target Support Files/BFCommonKit/BFCommonKit-Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.1.8</string>
+  <string>1.0.0</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

+ 24 - 0
Example/Pods/Target Support Files/BFCommonKit/ResourceBundle-BFCommonKit-BFCommonKit-Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleIdentifier</key>
+  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

+ 24 - 0
Example/Pods/Target Support Files/BFCommonKit/ResourceBundle-BFCommonKit/Resources-BFCommonKit-Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleIdentifier</key>
+  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

+ 24 - 0
Example/Pods/Target Support Files/BFCommonKit/ResourceBundle-BFCommon_Resources-BFCommonKit-Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleIdentifier</key>
+  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

+ 24 - 0
Example/Pods/Target Support Files/BFCommonKit/ResourceBundle-Resources-BFCommonKit-Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleIdentifier</key>
+  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>${PRODUCT_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov