添加统计

BFFramework/Classes/Stuckpoint/Controller/PQEditMusicSearchController.swift

@@ -3,7 +3,7 @@
 //  BFFramework
 //
 //  Created by ak on 2021/8/7.
-//
+//  功能：显示编辑界中搜索音乐界面
 
 import Foundation
  
@@ -89,11 +89,16 @@ class PQEditMusicSearchController: PQBaseViewController {
             if !isTagsClick {
                 self?.view.endEditing(true)
                 if !(itemData is PQEmptyModel) {
+                    PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicSearchAudition, pageSource: .sp_shanyinApp_main, extParams: ["musicName":(itemData as? PQVoiceModel)?.musicName ?? "" ,"musicId":(itemData as? PQVoiceModel)?.musicId ?? ""], remindmsg: "")
+                    
                     self?.playStuckPointMusic(itemData: itemData as? PQVoiceModel)
                 }
             }
         }
         searchController.btnClickHandle = { [weak self] btn, bgmData in
+            
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicSearchSelect, pageSource: .sp_shanyinApp_main, extParams: ["musicName":(bgmData as? PQVoiceModel)?.musicName ?? "" ,"musicId":(bgmData as? PQVoiceModel)?.musicId ?? ""], remindmsg: "")
+            
             // 使用音乐
             self?.backBtnClick()
             if(self?.btnClickHandle != nil){
@@ -111,6 +116,13 @@ class PQEditMusicSearchController: PQBaseViewController {
         super.backBtnClick()
         avPlayer.pause()
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        PQEventTrackViewModel.baseReportUpload(businessType: .bt_windowView, objectType: .ot_shanyinApp_musicVideoPreview_musicSearch, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
+
+
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
         view.addSubview(searchTF)
@@ -266,6 +278,8 @@ extension PQEditMusicSearchController: UITextFieldDelegate {
 
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         loadSearchData()
+        
+        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicSearch, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
         view.endEditing(true)
         if textField.text == nil || (textField.text?.count ?? 0) <= 0 {
             cShowHUB(superView: nil, msg: "请先输入搜索内容")

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -444,7 +444,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         searchVC.btnClickHandle = { [weak self] _, bgmData in
             // 使用音乐
             BFLog(message: "搜索音乐点击了使用")
-//            self?.musicEditBGView.insertSearchMusic(model: bgmData as! PQVoiceModel)
+            self?.musicEditBGView.insertSearchMusic(model: bgmData as! PQVoiceModel)
             self?.userstuckPointMusic(musicData: bgmData as? PQVoiceModel)
         }
         
@@ -460,6 +460,9 @@ class PQStuckPointEditerController: PQBaseViewController {
         musicEditerBtn.isSelected = false
         pointEditBGView.isHidden = false
         musicEditBGView.isHidden = true
+        
+        
+        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_videoTab, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
     }
 
     // 音乐编辑
@@ -469,6 +472,9 @@ class PQStuckPointEditerController: PQBaseViewController {
         pointEditerBtn.isSelected = false
         pointEditBGView.isHidden = true
         musicEditBGView.isHidden = false
+        
+        
+        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicTab, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
     }
 
     // 三种模式修改
@@ -550,16 +556,22 @@ class PQStuckPointEditerController: PQBaseViewController {
             speedStuckBtnGifName = "speedstuck_h"
             jumpPointBtnGifName = "jumpPoint_n"
             currentCreateStickersModel = .createStickersModelSpeed
+            
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_selectPatternSpeed, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
         
         } else if sender.tag == 2 { // 跳跃卡点
             speedStuckBtnGifName = "speedstuck_n"
             jumpPointBtnGifName = "jumpPoint_h"
             currentCreateStickersModel = .createStickersModelPoint
+            
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_selectPatternMusicVideo, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
 
         } else if sender.tag == 3 { // 仅音乐
             speedStuckBtnGifName = "speedstuck_n"
             jumpPointBtnGifName = "jumpPoint_n"
             currentCreateStickersModel = .createStickersModelOnlyMusic
+            
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_selectPatternBgm, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
        
         }
     
@@ -1563,7 +1575,7 @@ extension PQStuckPointEditerController {
                     }
                     // 添加子视图
 //                    if(playerView )
-                    self?.addSubViews()
+//                    self?.addSubViews()
                 } else {
                     if self?.synchroMarskView.superview != nil {
                         self?.synchroMarskView.removeMarskView()

BFFramework/Classes/Stuckpoint/View/PQSelecteMusicView.swift

@@ -28,6 +28,9 @@ class PQSelecteMusicView: UIView {
     var didSelectItemHandle:((_ isPlaying:Bool) -> Void)?
     // 当前选择的分类
     var currentSelectTag:PQStuckPointMusicTagsModel?
+    
+    //搜索出来的歌曲要插入到热门的前面 有可能是多个
+    var searchMusiceDatas: [PQVoiceModel] = Array<PQVoiceModel>.init()
  
     lazy var avPlayer: AVPlayer = {
         let avPlayer = AVPlayer()
@@ -119,6 +122,18 @@ class PQSelecteMusicView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
 
+    //插入数据
+    func insertSearchMusic(model:PQVoiceModel) {
+        model.isSelected = true
+        searchMusiceDatas.insert(model, at: 0)
+        
+        //有搜索的数据
+//        if(musicDatas.first?.name == "热门"){
+            musicDatas.insert(contentsOf: searchMusiceDatas, at: 0)
+//        }
+        
+        selectMusicCollection.reloadData()
+    }
     func autolayout() {
         categoryCollection.snp.makeConstraints { make in
             make.height.equalTo(20)
@@ -171,6 +186,13 @@ class PQSelecteMusicView: UIView {
                 self?.pageNum = (self?.pageNum ?? 0) + 1
                 
                 self?.musicDatas = self!.musicDatas + musicInfo
+                
+                //有搜索的数据
+//                if((self?.searchMusiceDatas.count ?? 0) > 0 && self!.musicDatas.first?.name == "热门"){
+                    self?.musicDatas.insert(contentsOf: self?.searchMusiceDatas ?? Array.init(), at: 0)
+                   
+//                }
+                
                 self?.selectMusicCollection.reloadData()
             }
 
@@ -262,6 +284,8 @@ extension PQSelecteMusicView: UICollectionViewDelegate, UICollectionViewDataSour
                 //暂停播放音乐
                 self?.pausePlayer()
                 
+                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicSelect, pageSource: .sp_shanyinApp_main, extParams: ["musicName":(bgmData as? PQVoiceModel)?.musicName ?? "" ,"musicId":(bgmData as? PQVoiceModel)?.musicId ?? ""], remindmsg: "")
+                
                 if self?.btnClickHandle != nil {
                     self?.btnClickHandle!(sender, bgmData)
                     
@@ -299,12 +323,15 @@ extension PQSelecteMusicView: UICollectionViewDelegate, UICollectionViewDataSour
             musicDatas.forEach { item in
                 item.isSelected = false
             }
-            musicDatas[indexPath.item].isSelected = true
-            playStuckPointMusic(itemData: musicDatas[indexPath.item])
+            let music = musicDatas[indexPath.item]
+            music.isSelected = true
+            playStuckPointMusic(itemData:music)
             selectMusicCollection.reloadData()
+            
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicCategorySelect, pageSource: .sp_shanyinApp_main, extParams: ["categoryName":music.tagsInfo?.tagName,"categoryId":music.tagsInfo?.tagId], remindmsg: "")
 
             if didSelectItemHandle != nil {
-                didSelectItemHandle!(musicDatas[indexPath.item].isPlaying)
+                didSelectItemHandle!(music.isPlaying)
             }
          
         }else{
@@ -326,9 +353,13 @@ extension PQSelecteMusicView: UICollectionViewDelegate, UICollectionViewDataSour
    
     }
 
-    func collectionView(_: UICollectionView, willDisplay _: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        
+    func collectionView(_ collectionView: UICollectionView, willDisplay _: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         
+        if (collectionView == selectMusicCollection ){
+            let music = musicDatas[indexPath.item]
+            
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicView, pageSource: .sp_shanyinApp_main, extParams: ["musicName":music.musicName ?? "" ,"musicId":music.musicId ?? ""], remindmsg: "")
+        } 
     }
 }
 

BFFramework/Classes/Stuckpoint/View/PQStuckPointCuttingView.swift

@@ -315,6 +315,11 @@ class PQStuckPointCuttingView: UIView {
             videoDidEndDragging!(1,startTime,startTime + CGFloat(stuckPointEndTime - stuckPointStartTime),0)
         }
         resetDefaultsColor()
+        
+        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicPeriodSelect, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
+
+
+
     }
 }