Merge branch 'master' into module

# Conflicts:
#	BFCommonKit/Classes/BFBase/Controller/PQBaseWebViewController.swift
#	BFCommonKit/Classes/BFBase/View/PQRemindView.swift

BFCommonKit/Assets/Resources/BFCommonKit.xcassets/icon_search_delete.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icon_search_delete@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BFCommonKit/Classes/BFConfig/PQBFConfig.swift

@@ -17,7 +17,6 @@ public class PQBFConfig: NSObject {
      styleTitleColor: UIColor = UIColor.white
      cutViewStyleColor: UIColor = UIColor.white
      cutViewTintColor: UIColor = UIColor.black
-     materialDeleteImage = UIImage.init().BF_Image(named:"icon_search_delete")
      cutDurationColor = UIColor.init(red: 238.0 / 255.0, green: 0 / 255.0, blue: 81.0 / 255.0, alpha: 0.1)
      hiddenMusicMask = false
      otherTintColor = UIColor.hexColor(hexadecimal: "#333333")
@@ -43,8 +42,7 @@ public class PQBFConfig: NSObject {
     public var styleTitleColor: UIColor = UIColor.black
     // 裁剪主题色
     public var cutViewStyleColor: UIColor = UIColor(red: 61.0 / 255.0, green: 193.0 / 255.0, blue: 193.0 / 255.0, alpha: 1)
-    // 素材删除图
-    public var materialDeleteImage: UIImage = UIImage().BF_Image(named:"icon_search_delete")
+
     // 裁剪主题色61, 193, 193
     public var cutDurationColor: UIColor = UIColor(red: 61.0 / 255.0, green: 193.0 / 255.0, blue: 193.0 / 255.0, alpha: 0.1)
     // 裁剪主题色

BFCommonKit/Classes/BFUtility/PQCommonMethodUtil.swift

@@ -145,14 +145,14 @@ public func BFLog<T>( _ type : Int = 0, _ file:String = #file, _ line:Int = #lin
     let msg = "\(file) (L:\(line)) \(message)"
     if type == 0{
 //        BuglyLog.level(.warn, logs: msg)
-        print("\(dateFmt.string(from: Date())) \(msg)")
+//        print("\(dateFmt.string(from: Date())) \(msg)")
     }
 #if DEBUG
-     if type == 1 {
+     if type == 11 {
         print("hhz-\(dateFmt.string(from: Date())) \(msg)");
-     }else if type == 2 {
+     }else if type == 12 {
         print("ak-\(dateFmt.string(from: Date())) \(msg)");
-     }else if type == 3 {
+     }else if type == 13 {
         print("ww-\(dateFmt.string(from: Date())) \(msg)");
      }