merge

.gitignore

@@ -77,4 +77,5 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots/**/*.png
 fastlane/test_output
-PQCreativeCommunity.xcodeproj/xcshareddata/xcschemes
+PQCreativeCommunity.xcodeproj/xcshareddata/xcschemes
+Example

BFCommonKit.podspec

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

BFCommonKit/Classes/BFEnums/Enums.swift

@@ -62,7 +62,7 @@ public  enum  PAGESOURCE: String {
     case sp_follow_recommend = "shanyinApp-follow_recommend" // 由关注列表右划
     case sp_followSingle = "shanyinApp-followSingle" // 关注tab点击顶部个人头像进入某个人的关注
     case sp_followSingle_recommend = "shanyinApp-followSingle_recommend" // 关注tab点击顶部个人头像进入某个人的关注
-//    case sp_mine = "shanyinApp-mine" // 我的tab
+    case sp_mine = "speedApp-mine" // 我的tab
     case sp_search = "shanyinApp-search" // 搜索页
     case sp_uploadVideo = "shanyinApp-uploadVideo" // 视频制作入口
 
@@ -130,7 +130,9 @@ public  enum  PAGESOURCE: String {
     case sp_cmunit_collect = "collectAgeGenderPage" // 年龄 / 话题收集页
     case sp_cmunit_recommend = "recommendPage" // 推荐页（P0）
     case sp_cmunit_follow = "followPage" // 关注页
+    case sp_cmunit_moreFollow = "moreFollowPage" // 我关注的人（查看更多页）
     case sp_cmunit_joinTopic = "joinedTopicPage" // 加入的话题页
+    case sp_cmunit_moreJoinTopic = "moreJoinedTopicPage" // 我加入的话题（查看更多页）
     case sp_cmunit_hotTopic = "hotTopicPage" // 热门话题页
     case sp_cmunit_videoDetail = "videoDetailPage" // 内容详情页
     case sp_cmunit_topicDetail = "topicDetailPage" // 话题详情页
@@ -142,7 +144,8 @@ public  enum  PAGESOURCE: String {
     case sp_cmunit_loginPage = "loginPage" // 登陆页
     case sp_cmunit_interestedTopic = "hotTopicRecommendWindow" // 热门话题推荐页
     case sp_cmunit_cmtMsgPage = "commentMessagePage" // 评论消息页
-    
+    case sp_cmunit_mePage = "mePage" // 我的页
+    case sp_cmunit_userPage = "homePage" // 个人主页
     //点击上报：首页点击底部“我的”页面入口
     case sp_shanyinApp_main = "shanyinApp-main"
     //页面曝光上报：“我的”页面曝光
@@ -276,6 +279,8 @@ public  enum  objectType: String {
     case ot_click_chooseSearchMusic = "speedApp_clickButton_chooseSearchMusic" // 点击上报：选择音乐素材
     case ot_view_publishSyncedUp = "speedApp_viewWindow_publishSyncedUp" // 曝光上报：窗口曝光
     case ot_click_shareWechat = "speedApp_clickButton_shareWechat" // 点击上报：分享微信
+    case ot_shareFriendBtn = "shareFriendButton" // 分享微信
+    case ot_shareMomentBtn = "shareMomentButton" // 分享朋友圈
     case ot_click_shareWechatMoment = "speedApp_clickButton_shareWechatMoment" // 点击上报：分享朋友圈
     case ot_click_finished = "speedApp_clickButton_finished" // 点击上报：完成
     
@@ -401,6 +406,7 @@ public  enum  businessType: String {
     case bt_videoRealPlay = "videoRealPlay" // 视频播放到20s或播放到总时长30%，哪个先到为准
     case bt_videoPlaySuccess = "videoPlaySuccess" // 视频缓冲完成开始播放
     case bt_videoPlayEnd = "videoPlayEnd" // 视频播放到总时长100%
+    case bt_videoPlayDuration = "playDuration" // 视频播放时长ms - 有暂停动作时上报并重新计算
     case bt_videoPlayCancel = "videoPlayCancel" // 视频播放取消
     case bt_videoPlayDecoder = "videoPlayDecoder" // 视频解码器启动
     case bt_videoPlayDecoderError = "videoPlayDecoderError" // 视频解码失败
@@ -538,6 +544,7 @@ public  enum  messageSubType: Int {
     case mtsub_pushIncStart = 508 // 通知-激励开始
     case mtsub_pushIncEnd = 509 // 通知-激励结束
     case mtsub_pushIncRupt = 510 // 通知-激励中断
+    case mtsub_homeRecommend = 512 // 通知-激励中断
     case mtsub_shareSpace = 601 // 分享空间-分享
     case mtsub_shareSpLike = 602 // 分享空间-喜欢
     case mtsub_shareSpComm = 603 // 分享空间-评论

BFCommonKit/Classes/BFUtility/PQConstant.swift

@@ -256,6 +256,8 @@ public let cDownloadMatrialSuccessKey: String = "downloadMatrialSuccess\(cPrimar
 public let cVideoDealWithSuccessKey: String = "videoDealWithSuccess\(cPrimarykey)"
 /// 话题订阅状态改变时通知
 public let cTopicSubscribeStatusChangedKey: String = "topicSubscribeStatusChanged\(cPrimarykey)"
+/// 发布页最近加入的话题
+public let cPublicLastJoinTopicInfoKey: String = "publicLastJoinTopicInfoKey\(cPrimarykey)"
 
 /// 批量下载资源成功/失败的key
 public let cBatchDownloadMatrialSuccessKey: String = "batchDownloadMatrialSuccess\(cPrimarykey)"

Example/Podfile.lock

@@ -1,90 +0,0 @@
-PODS:
-  - Alamofire (5.4.3)
-  - BFCommonKit (1.4.4):
-    - BFCommonKit/BFBase (= 1.4.4)
-    - BFCommonKit/BFCategorys (= 1.4.4)
-    - BFCommonKit/BFConfig (= 1.4.4)
-    - BFCommonKit/BFDebug (= 1.4.4)
-    - BFCommonKit/BFEnums (= 1.4.4)
-    - BFCommonKit/BFUtility (= 1.4.4)
-  - BFCommonKit/BFBase (1.4.4):
-    - Alamofire (= 5.4.3)
-    - BFCommonKit/BFCategorys
-    - BFCommonKit/BFConfig
-    - BFCommonKit/BFUtility
-    - FDFullscreenPopGesture (= 1.1)
-    - RealmSwift (= 10.7.6)
-    - SnapKit (= 5.0.1)
-  - BFCommonKit/BFCategorys (1.4.4):
-    - KingfisherWebP (= 1.3.0)
-  - BFCommonKit/BFConfig (1.4.4)
-  - BFCommonKit/BFDebug (1.4.4):
-    - BFCommonKit/BFCategorys
-  - BFCommonKit/BFEnums (1.4.4)
-  - BFCommonKit/BFUtility (1.4.4):
-    - Alamofire (= 5.4.3)
-    - BFCommonKit/BFCategorys
-    - BFCommonKit/BFConfig
-    - KeychainAccess (= 4.2.2)
-    - Kingfisher (= 6.3.0)
-    - KingfisherWebP (= 1.3.0)
-    - Toast-Swift (= 5.0.1)
-  - FDFullscreenPopGesture (1.1)
-  - KeychainAccess (4.2.2)
-  - Kingfisher (6.3.0)
-  - KingfisherWebP (1.3.0):
-    - Kingfisher (~> 6.2)
-    - libwebp (>= 1.1.0)
-  - libwebp (1.2.1):
-    - libwebp/demux (= 1.2.1)
-    - libwebp/mux (= 1.2.1)
-    - libwebp/webp (= 1.2.1)
-  - libwebp/demux (1.2.1):
-    - libwebp/webp
-  - libwebp/mux (1.2.1):
-    - libwebp/demux
-  - libwebp/webp (1.2.1)
-  - Realm (10.7.6):
-    - Realm/Headers (= 10.7.6)
-  - Realm/Headers (10.7.6)
-  - RealmSwift (10.7.6):
-    - Realm (= 10.7.6)
-  - SnapKit (5.0.1)
-  - Toast-Swift (5.0.1)
-
-DEPENDENCIES:
-  - BFCommonKit (from `../`)
-
-SPEC REPOS:
-  trunk:
-    - Alamofire
-    - FDFullscreenPopGesture
-    - KeychainAccess
-    - Kingfisher
-    - KingfisherWebP
-    - libwebp
-    - Realm
-    - RealmSwift
-    - SnapKit
-    - Toast-Swift
-
-EXTERNAL SOURCES:
-  BFCommonKit:
-    :path: "../"
-
-SPEC CHECKSUMS:
-  Alamofire: e447a2774a40c996748296fa2c55112fdbbc42f9
-  BFCommonKit: 9fd8de73084c196dbd61397ada86c4545fa2c184
-  FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
-  KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
-  Kingfisher: 6c3df386db71d82c0817a429d2c9421a77396529
-  KingfisherWebP: dec17a5eb1af2658791bde1f93ae9a853678f826
-  libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
-  Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
-  RealmSwift: e31c4ddbcc42ac879313d656b86f9ca539f6f4f4
-  SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
-  Toast-Swift: 9b6a70f28b3bf0b96c40d46c0c4b9d6639846711
-
-PODFILE CHECKSUM: 5c138dc5d174c9336dd4473cb26265c7619334aa
-
-COCOAPODS: 1.11.2