再 创作统计

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -43,6 +43,9 @@ class PQStuckPointEditerController: PQBaseViewController {
     var mStickers: [PQEditVisionTrackMaterialsModel]?
     // 播放器的开始和结束时间,1，刚进界面使用推荐的开始结束时间，2，用户修改起结点时修改
     var playeTimeRange: CMTimeRange = CMTimeRange()
+    
+    //add by ak 是否是再创作模式
+    var isReCreate:Bool = false
     // 下一步
     lazy var nextBtn: UIButton = {
         let nextBtn = UIButton(type: .custom)
@@ -280,6 +283,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         BFLog(message: "去发布")
         playerView.pause()
         let videoExporter = PQStuckPointPublicController()
+        videoExporter.isReCreate = isReCreate
         videoExporter.selectedTotalDuration = selectedTotalDuration
         videoExporter.selectedDataCount = selectedDataCount
         videoExporter.selectedImageDataCount = selectedImageDataCount
@@ -539,7 +543,15 @@ extension PQStuckPointEditerController {
                         }
                     }
 
-                    // 根据不同速度 取卡点 1,2,3
+                    /* 快慢速模式下取卡点
+                     - 快节奏为选中区域的所有点位，即0，1，2，3，4 5 6 7 8 9 10 ……
+                     - 适中为每两个点位取一个，即0，3，6，9 12
+                     - 慢节奏为每三个点位取一个，即0 5 10 15
+                      慢节奏要做特殊处理
+                       5d or L/1.23
+                     （*当输入素材为L ∈（0-10.5]s 时，判断与5d之间的关系，若L/1.2≥5d，则取5d；若L/1.2<5d，则取L/1.2）
+                     */
+                    // 跳跃卡点模式下根据不同速度 取卡点 1,2,3
                     /*
                      - 快节奏为选中区域的所有点位，即0，1，2，3，4……
                      - 适中为每两个点位取一个，即0，2，4，6……

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicController.swift

@@ -238,6 +238,7 @@ class PQStuckPointMusicController: PQBaseViewController {
             editerVC.selectedImageDataCount = selectedImageDataCount
             editerVC.selectedTotalDuration = selectedTotalDuration
             editerVC.selectedPhotoData = selectedPhotoData
+            editerVC.isReCreate = true
             navigationController?.pushViewController(editerVC, animated: true)
         }
         // 卡点视频音乐选择曝光上报

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -51,6 +51,9 @@ class PQStuckPointPublicController: PQBaseViewController {
     var remindView: PQRemindView?
     //已经选择标题内容，加一个属性接收 使用有不在主线不能直接使用 titleLabel text
     var selectTitle:String = ""
+    
+    //add by ak 是否是再创作模式
+    var isReCreate:Bool = false
     // 预览大小
     private var preViewSize: CGSize {
         switch aspectRatio {
@@ -271,6 +274,7 @@ class PQStuckPointPublicController: PQBaseViewController {
         coverImageTitle.text = "换封面"
         coverImageTitle.textAlignment = .center
         coverImageTitle.backgroundColor = UIColor(red: 0.22, green: 0.26, blue: 0.35, alpha: 0.5)
+        coverImageTitle.isUserInteractionEnabled = true
         coverImageTitle.textColor = .white
         coverImageTitle.font = UIFont.boldSystemFont(ofSize: 12)
         return coverImageTitle
@@ -349,7 +353,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     lazy var finishedBtn: UIButton = {
         let finishedBtn = UIButton(type: .custom)
         finishedBtn.setTitle("完成", for: .normal)
-        finishedBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#BDBDBD"), for: .normal)
+        finishedBtn.setTitleColor(UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue), for: .normal)
         finishedBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .medium)
         finishedBtn.backgroundColor = .clear
         finishedBtn.tag = 3
@@ -1213,13 +1217,13 @@ extension PQStuckPointPublicController {
         changPlayerIsPause(isPause: true)
         
         pinView.isHidden = true
-        publicTitleView.isHidden = false
+        publicTitleView.show()
         
         if(publicTitleView.inputTV.text.count > 0){
             publicTitleView.inputTV.text = titleLabel.text
         }
   
-        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_changeTitle, pageSource: .sp_stuck_publishSyncedUp, eventData:  ["videoId":videoData?.uniqueId ?? "","rootPageSource":reCreateData != nil ? "shanyinApp-main-syncedUpMusicRecreate" :"shanyinApp-main-syncedUpMusic"], remindmsg: "")
+        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_changeTitle, pageSource: .sp_stuck_publishSyncedUp, eventData:  ["videoId":videoData?.uniqueId ?? "","rootPageSource":isReCreate ? "shanyinApp-main-syncedUpMusicRecreate" :"shanyinApp-main-syncedUpMusic"], remindmsg: "")
     }
     
     @objc func settingCoverImage() {
@@ -1259,7 +1263,7 @@ extension PQStuckPointPublicController {
             self?.navigationController?.pushViewController(imageSelected, animated: true)
         }
         
-        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_changeCover, pageSource: .sp_stuck_publishSyncedUp, eventData:  ["videoId":videoData?.uniqueId ?? "","rootPageSource":reCreateData != nil ? "shanyinApp-main-syncedUpMusicRecreate" :"shanyinApp-main-syncedUpMusic"], remindmsg: "")
+        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_changeCover, pageSource: .sp_stuck_publishSyncedUp, eventData:  ["videoId":videoData?.uniqueId ?? "","rootPageSource":isReCreate ? "shanyinApp-main-syncedUpMusicRecreate" :"shanyinApp-main-syncedUpMusic"], remindmsg: "")
    
     }