1.新增订阅相关

BFCommonKit/Classes/BFBase/Model/PQBaseModel.swift

@@ -185,6 +185,7 @@ public class PQEmptyModel: NSObject {
     public var summary: String? // 描述
     public var summaryColor: UIColor? // 描述颜色
     public var emptyImage: String? // 空白提示图
+    public var emptySoureImage: UIImage? // 空白提示图
     public var isRefreshHidden: Bool = true // 是否隐藏刷新按钮
     public var refreshImage: String? // 刷新按钮图片
     public var refreshTitle: NSMutableAttributedString? // 刷新按钮文字

BFCommonKit/Classes/BFBase/View/PQLoadingHUB.swift

@@ -13,10 +13,25 @@ public class PQLoadingHUBView: UIView {
     public var gifImages: [UIImage]?
     // gif播放时长
     public var duration: Double?
-
+    // 主题色
+    public var lodingColor: UIColor? {
+        didSet{
+            if lodingColor != nil {
+                loadingImage.tintColor = lodingColor ??  UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+                let data = try? Data(contentsOf: URL(fileURLWithPath: Bundle.current(moduleName: "BFCommonKit")?.path(forResource: "stuckPoint_music_loading", ofType: ".gif") ?? ""))
+                if data != nil {
+                    PQPHAssetVideoParaseUtil.parasGIFImage(data: data!, isRenderingColor: lodingColor ?? UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)) { [weak self] _, images, duration in
+                        self?.gifImages = images
+                        self?.duration = duration
+                    }
+                }
+            }
+        }
+    }
+    
     public lazy var loadingImage: UIImageView = {
         let loadingImage = UIImageView()
-        loadingImage.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        loadingImage.tintColor = lodingColor ??  UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return loadingImage
     }()
 
@@ -26,7 +41,7 @@ public class PQLoadingHUBView: UIView {
         isUserInteractionEnabled = false
         let data = try? Data(contentsOf: URL(fileURLWithPath: Bundle.current(moduleName: "BFCommonKit")?.path(forResource: "stuckPoint_music_loading", ofType: ".gif") ?? ""))
         if data != nil {
-            PQPHAssetVideoParaseUtil.parasGIFImage(data: data!, isRenderingColor: UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)) { [weak self] _, images, duration in
+            PQPHAssetVideoParaseUtil.parasGIFImage(data: data!, isRenderingColor: lodingColor ?? UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)) { [weak self] _, images, duration in
                 self?.gifImages = images
                 self?.duration = duration
             }
@@ -66,12 +81,12 @@ public class PQLoadingHUB: NSObject {
     public let viewTag = 11111
     public var isLoading: Bool = false
 
-    public func showHUB(isMode:Bool = false) {
+    public func showHUB(isMode:Bool = false,lodingColor:UIColor? = nil) {
         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.lodingColor = lodingColor
                 if(isMode){
                     let backView = UIImageView.init(frame: window?.frame ?? .zero)
                     backView.backgroundColor = .clear
@@ -101,7 +116,7 @@ public class PQLoadingHUB: NSObject {
         }
     }
 
-    public func showHUB(superView: UIView, isVerticality: Bool = false) {
+    public func showHUB(superView: UIView, isVerticality: Bool = false,lodingColor:UIColor? = nil) {
         DispatchQueue.main.async { [weak self] in
             if superView.viewWithTag(self!.viewTag) == nil {
                 let hubW: CGFloat = 100
@@ -110,6 +125,7 @@ public class PQLoadingHUB: NSObject {
                 let hubY: CGFloat = isVerticality ? ((supW - hubW) / 2) : ((supH - hubW) / 2)
                 let hubX: CGFloat = isVerticality ? ((supH - hubW) / 2) : ((supW - hubW) / 2)
                 let loadingHUB: PQLoadingHUBView = PQLoadingHUBView(frame: CGRect(x: hubX, y: hubY, width: 100, height: 100))
+                loadingHUB.lodingColor = lodingColor
                 loadingHUB.tag = self!.viewTag
                 superView.addSubview(loadingHUB)
                 loadingHUB.loading()

BFCommonKit/Classes/BFBase/View/PQRemindView.swift

@@ -296,11 +296,12 @@ extension PQEmptyRemindView {
             refreshBtn.setTitle("刷新", for: .normal)
             imageView.image = UIImage.moduleImage(named: "pic_network", moduleName: "BFCommonKit")
         } else {
-            if emptyData?.emptyImage != nil, emptyData?.emptyImage?.count ?? 0 > 0 {
-                imageView.image = UIImage.moduleImage(named: emptyData?.emptyImage ?? "", moduleName: "BFCommonKit")
-            } else {
-                imageView.image = nil
-            }
+//            if emptyData?.emptyImage != nil, emptyData?.emptyImage?.count ?? 0 > 0 {
+//                imageView.image = UIImage.moduleImage(named: emptyData?.emptyImage ?? "", moduleName: "BFCommonKit")
+//            } else {
+//                imageView.image = nil
+//            }
+            imageView.image = emptyData?.emptySoureImage ?? UIImage.moduleImage(named: emptyData?.emptyImage ?? "", moduleName: "BFCommonKit")
             remindLab.text = emptyData?.title
             remindSubLab.text = emptyData?.summary
             refreshBtn.isHidden = emptyData?.isRefreshHidden ?? true
@@ -318,8 +319,8 @@ extension PQEmptyRemindView {
 
     override public var isHidden: Bool {
         didSet {
-            addData()
-            addLayout()
+//            addData()
+//            addLayout()
         }
     }
 
@@ -327,7 +328,7 @@ extension PQEmptyRemindView {
         var imageH: CGFloat = cDefaultMargin * 7
         var contentH: CGFloat = 0
 
-        if (emptyData?.emptyImage != nil &&  emptyData?.emptyImage?.count ?? 0 > 0) || !isNetConnected() {
+        if (emptyData?.emptySoureImage != nil) || (emptyData?.emptyImage != nil &&  emptyData?.emptyImage?.count ?? 0 > 0) || !isNetConnected() {
             contentH = contentH + imageH + cDefaultMargin
         } else {
             imageH = 0
@@ -352,16 +353,17 @@ extension PQEmptyRemindView {
 //            make.top.equalTo(imageView.snp_bottom).offset(cDefaultMargin)
 //        }
         remindLab.snp.remakeConstraints { make in
-            make.size.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.top.equalTo(imageView.snp_bottom).offset(cDefaultMargin)
         }
         remindSubLab.snp.makeConstraints { make in
-            make.left.right.equalTo(self)
-            make.top.equalTo(remindLab.snp_bottom).offset(cDefaultMargin)
+            make.left.right.equalToSuperview()
+            make.top.equalTo(remindLab.snp.bottom).offset(cDefaultMargin)
         }
         refreshBtn.snp.makeConstraints { make in
             make.width.equalTo(cDefaultMargin * 13)
             make.height.equalTo(cDefaultMargin * 4)
-            make.top.equalTo(remindSubLab.snp_bottom).offset(cDefaultMargin)
+            make.top.equalTo(remindSubLab.snp.bottom).offset(cDefaultMargin)
             make.centerX.equalToSuperview()
         }
     }

BFCommonKit/Classes/BFUtility/PQCommonMethodUtil.swift

@@ -653,7 +653,7 @@ public func systemCurrentDate() -> String {
 public func timeIntervalToDateString(timeInterval: TimeInterval) -> String {
     let date = Date(timeIntervalSince1970: timeInterval)
     let dateFormatter = DateFormatter()
-    dateFormatter.dateFormat = "MM月dd日 HH:mm"
+    dateFormatter.dateFormat = "yyyy年MM月dd日"
     return dateFormatter.string(from: date)
 }
 

BFCommonKit/Classes/BFUtility/PQConstant.swift

@@ -124,6 +124,10 @@ public let cUserInfoStorageKey: String = "userInfo\(cPrimarykey)"
 public let cGuidedInfoStorageKey: String = "guidedInfo\(cPrimarykey)"
 // 是否第一次安装
 public let cFirstInstall: String = "firstInstall\(cPrimarykey)"
+// 是否显示了用户信息收集
+public let cShowUserInfoCollectInstall: String = "showUserInfoCollectInstall\(cPrimarykey)"
+// 是否显示了感兴趣
+public let cShowUserInterestedTopic: String = "showUserInterestedTopic\(cPrimarykey)"
 // 第一次冷启动未上传参数
 public let cFirstParams: String = "firstParams\(cPrimarykey)"
 

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -104,6 +104,7 @@
 		2BF0C4F19D0CDE840DE7F47BA7314D6F /* Typealiases.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79B02BBE6E25835F4BE58117EF676AE /* Typealiases.swift */; };
 		2D1272B3A10B8A8D7B41A09A648ACB4B /* RLMFindOneAndModifyOptions.h in Copy . Public Headers */ = {isa = PBXBuildFile; fileRef = 3527D38A8A55480CA7486F5EC626E210 /* RLMFindOneAndModifyOptions.h */; };
 		2D47D363E4D5D74FFA8F7483ED558E9D /* RLMUpdateResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CC5CC31D3B7F4CD2B77E0652C550C1B /* RLMUpdateResult.h */; };
+		2D6C41AC26CA78D7005264CB /* stuckPoint_music_loading.gif in Resources */ = {isa = PBXBuildFile; fileRef = 2D6C41AB26CA78D7005264CB /* stuckPoint_music_loading.gif */; };
 		2DA2EFCA9120EEB3152C253E5A989672 /* RLMMongoDatabase.h in Copy . Public Headers */ = {isa = PBXBuildFile; fileRef = 27F306B798321B1ABC35F0123F328C05 /* RLMMongoDatabase.h */; };
 		2DA30CEC9131E487D7C060BD55A85FFD /* NXLoggerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B785C777CDBA9B7700E978D20DD46A83 /* NXLoggerVC.swift */; };
 		2DC4923481850D908B63ECAFD2B204E4 /* RLMApp_Private.h in Copy . Private Headers */ = {isa = PBXBuildFile; fileRef = B9CC718DA7BBEAE9D99E19756662BC1C /* RLMApp_Private.h */; };
@@ -984,6 +985,7 @@
 		2C4B00B6996E8B70EE60DD745F9E13A1 /* quant_levels_utils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = quant_levels_utils.h; path = src/utils/quant_levels_utils.h; sourceTree = "<group>"; };
 		2C5398F53A96B11F85DFBCDA6A5277AB /* upsampling_sse41.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = upsampling_sse41.c; path = src/dsp/upsampling_sse41.c; sourceTree = "<group>"; };
 		2C9EE4320097CF4D7A56B5F68A78998F /* RLMCredentials.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RLMCredentials.h; path = include/RLMCredentials.h; sourceTree = "<group>"; };
+		2D6C41AB26CA78D7005264CB /* stuckPoint_music_loading.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = stuckPoint_music_loading.gif; sourceTree = "<group>"; };
 		2D95EB7C58DD633C812B4D0C1CA28CCC /* quant_levels_utils.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = quant_levels_utils.c; path = src/utils/quant_levels_utils.c; sourceTree = "<group>"; };
 		2DC55159FB708E00E0D0DE72678EDF6F /* RLMObject.mm */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.objcpp; name = RLMObject.mm; path = Realm/RLMObject.mm; sourceTree = "<group>"; };
 		2E352D688992D294DC8F55847FC7673E /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.0.sdk/System/Library/Frameworks/MessageUI.framework; sourceTree = DEVELOPER_DIR; };
@@ -2149,6 +2151,7 @@
 		9353B39199B21E8DEE6E60C986F56647 /* BFCommonKit */ = {
 			isa = PBXGroup;
 			children = (
+				2D6C41AB26CA78D7005264CB /* stuckPoint_music_loading.gif */,
 				7E12339010CD3DDDBFF4E36591223665 /* Material.xcassets */,
 				E38CE39250C41BB0C37BD8477C797117 /* BFBase */,
 				E1698C419D79D024C9C07BF6AF338B8F /* BFCategorys */,
@@ -3244,6 +3247,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F9BEAE84DE0CDFCE59D3B1CC53C67B8D /* Material.xcassets in Resources */,
+				2D6C41AC26CA78D7005264CB /* stuckPoint_music_loading.gif in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};