Merge branch 'master' of https://git.yishihui.com/wenweiwei/BFCommonKit

.gitignore

@@ -1,21 +1,22 @@
-<<<<<<< HEAD
-# OS X
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
 .DS_Store
-
-# Xcode
-build/
-=======
-# ---> Swift
+.atom/
+.buildlog/
+.history
+.svn/
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
->>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -24,94 +25,39 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-<<<<<<< HEAD
 xcuserdata/
-*.xccheckout
-profile
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-
-# Bundler
-.bundle
-
-=======
-xcuserdata
 
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
 *.ipa
+*.dSYM.zip
+*.dSYM
 
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-#
-# Pods/
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
 
-# Carthage
+# Swift Package Manager
 #
->>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-<<<<<<< HEAD
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-# 
-# Note: if you ignore the Pods directory, make sure to uncomment
-# `pod install` in .travis.yml
-#
-# Pods/
-=======
-# ---> Objective-C
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## Build generated
-build/
-DerivedData
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-
-## Other
-*.xccheckout
-*.moved-aside
-*.xcuserstate
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+.build/
 
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-#Pods/
+Pods/
+# Podfile.lock
 
 # Carthage
 #
@@ -120,4 +66,15 @@ xcuserdata
 
 Carthage/Build
 
->>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+PQCreativeCommunity.xcodeproj/xcshareddata/xcschemes

BFCommonKit/Classes/BFBase/Controller/PQBaseViewController.swift

@@ -58,7 +58,7 @@ open class PQBaseViewController: UIViewController, UIGestureRecognizerDelegate {
         lineView = UIView(frame: CGRect(x: 0, y: (navHeadImageView?.frame.maxY ?? cDevice_iPhoneNavBarAndStatusBarHei) - 0.5, width: cScreenWidth, height: 0.5))
         lineView?.backgroundColor = PQBFConfig.shared.styleBackGroundColor
         view.addSubview(lineView!)
-        UINavigationBar.appearance().setBackgroundImage(UIImage(), for: .default)
+//        UINavigationBar.appearance().setBackgroundImage(UIImage(), for: .default)
         automaticallyAdjustsScrollViewInsets = false
         navigationController?.interactivePopGestureRecognizer?.delegate = self
         fd_prefersNavigationBarHidden = true