Ver Fonte

1.修改部分类

wenweiwei há 3 anos atrás
pai
commit
1d820d2740

+ 1 - 1
BFCommonKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'BFCommonKit'
-  s.version          = '1.1.8'
+  s.version          = '1.1.9'
   s.summary          = 'A short description of BFCommonKit.'
   s.swift_version    = '5.0'
 # This description is used to generate tags and improve search results.

+ 14 - 3
BFCommonKit/Classes/BFBase/View/PQLoadingHUB.swift

@@ -66,13 +66,24 @@ public class PQLoadingHUB: NSObject {
     public let viewTag = 11111
     public var isLoading: Bool = false
 
-    public func showHUB() {
+    public func showHUB(isMode:Bool = false) {
         DispatchQueue.main.async { [weak self] in
             let window = UIApplication.shared.keyWindow
             if (window?.viewWithTag(self!.viewTag)) == nil {
                 let loadingHUB: PQLoadingHUBView = PQLoadingHUBView(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
-                loadingHUB.tag = self!.viewTag
-                window?.addSubview(loadingHUB)
+            
+                if(isMode){
+                    let backView = UIImageView.init(frame: window?.frame ?? .zero)
+                    backView.backgroundColor = .clear
+                    backView.isUserInteractionEnabled = true
+                    backView.addSubview(loadingHUB)
+                    backView.tag = self!.viewTag
+                    window?.addSubview(backView)
+                }else{
+                    loadingHUB.tag = self!.viewTag
+                    window?.addSubview(loadingHUB)
+                }
+             
                 loadingHUB.center = window?.center as! CGPoint
                 loadingHUB.loading()
                 self?.isLoading = true

+ 4 - 2
BFCommonKit/Classes/BFBase/View/PQTextView.swift

@@ -16,6 +16,8 @@ open class PQTextView: UITextView {
     public  var maxTextLength : Int?
     // 输入个数超过时提示
     public  var maxTextLengthRemind : String?
+    // add by ak 默认字的起点位置
+    public  var placeHolderDefultPoint = CGPoint.init(x: 5, y: 7)
     /// setNeedsDisplay调用drawRect
     public  var placeHolder: String = "" {
         didSet {
@@ -87,8 +89,8 @@ open class PQTextView: UITextView {
             newRect.origin.x = (rect.width - size.width) / 2
             newRect.origin.y = (rect.height - size.height) / 2
         } else {
-            newRect.origin.x = placeHolder.contains("未识别到文字") ? 0 : 5
-            newRect.origin.y = placeHolder.contains("未识别到文字") ? 0 : 7
+            newRect.origin.x = placeHolder.contains("未识别到文字") ? 0 : placeHolderDefultPoint.x
+            newRect.origin.y = placeHolder.contains("未识别到文字") ? 0 : placeHolderDefultPoint.y
         }
         (placeHolder as NSString).draw(in: newRect, withAttributes: [NSAttributedString.Key.font: font ?? UIFont.systemFont(ofSize: 14), NSAttributedString.Key.foregroundColor: placeHolderColor])
     }

+ 14 - 0
BFCommonKit/Classes/BFEnums/Enums.swift

@@ -250,6 +250,20 @@ public  enum  objectType: String {
     case ot_click_shareWechat = "speedApp_clickButton_shareWechat" // 点击上报:分享微信
     case ot_click_shareWechatMoment = "speedApp_clickButton_shareWechatMoment" // 点击上报:分享朋友圈
     case ot_click_finished = "speedApp_clickButton_finished" // 点击上报:完成
+    
+    // 闪音点击上报:首页点击底部+
+    case ot_shanyinApp_clickButton_syncedUpMusic = "shanyinApp_clickButton_syncedUpMusic"
+
+    // 视频播放点击
+    case ot_shanyinApp_clickButton_syncedUpMusicRecreate = "shanyinApp_clickButton_syncedUpMusicRecreate"
+    case ot_shanyinApp_viewButton_syncedUpMusicRecreate = "shanyinApp_viewButton_syncedUpMusicRecreate"
+    // 点击上报:首页点击底部“我的”页面入口
+    case ot_shanyinApp_clickButton_mineTab = "shanyinApp_clickButton_mineTab"
+    // 页面曝光上报:“我的”页面曝光
+    case ot_shanyinApp_viewPage_mineTab = "shanyinApp_viewPage_mineTab"
+    // 编辑标题和封面
+    case ot_shanyinApp_clickButton_changeTitle = "shanyinApp_clickButton_changeTitle"
+    case ot_shanyinApp_clickButton_changeCover = "shanyinApp_clickButton_changeCover"
 }
 
 // MARK: - 视频上报类型

+ 11 - 7
BFCommonKit/Classes/BFUtility/PQCommonMethodUtil.swift

@@ -131,13 +131,17 @@ public func kf_imageCacheImage(originUrl: String, completeHandle: @escaping (_ i
 }
 
 /** 打印 */
-public func BFLog<T>(message _: T) {
-//    let logger = NXLogger.shared
-//
-//    logger.level = .info
-//    logger.ouput = .debuggerConsole
-//
-//    logger.d(message as? String ?? "")
+public func BFLog<T>(message: T) {
+    if PQBFConfig.shared.enableBFLog {
+        let logger = NXLogger.shared
+
+        logger.level = .info
+        logger.ouput = .debuggerConsole
+
+        logger.d(message as? String ?? "")
+    } else {
+//        BuglyLog.level(.warn, logs: message as? String)
+    }
 }
 
 // MARK: 获取公共参数