| 
					
				 | 
			
			
				@@ -258,7 +258,7 @@ class PQStuckPointEditerController: PQBaseViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 快慢速卡点模式 btn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     lazy var speedStuckBtn: UIButton = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         let speedStuckBtn = UIButton(type: .custom) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        speedStuckBtn.addTarget(self, action: #selector(editModelClick(sender:)), for: .touchUpInside) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        speedStuckBtn.addTarget(self, action: #selector(editModelClick1(sender:)), for: .touchUpInside) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         speedStuckBtn.setBackgroundImage(UIImage().BF_Image(named: "speedstuck_n"), for: .normal) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         speedStuckBtn.setBackgroundImage(UIImage().BF_Image(named: "speedstuck_h"), for: .selected) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -281,7 +281,7 @@ class PQStuckPointEditerController: PQBaseViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_n"), for: .normal) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_h"), for: .selected) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         jumpPointBtn.tag = 2 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        jumpPointBtn.addTarget(self, action: #selector(editModelClick(sender:)), for: .touchUpInside) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        jumpPointBtn.addTarget(self, action: #selector(editModelClick1(sender:)), for: .touchUpInside) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         jumpPointBtn.adjustsImageWhenHighlighted = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return jumpPointBtn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -299,7 +299,7 @@ class PQStuckPointEditerController: PQBaseViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         onlyMusicBtn.setImage(UIImage().BF_Image(named: "onlyMusic_n"), for: .normal) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         onlyMusicBtn.setImage(UIImage().BF_Image(named: "onlyMusic_h"), for: .selected) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         onlyMusicBtn.tag = 3 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        onlyMusicBtn.addTarget(self, action: #selector(editModelClick(sender:)), for: .touchUpInside) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        onlyMusicBtn.addTarget(self, action: #selector(editModelClick1(sender:)), for: .touchUpInside) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         onlyMusicBtn.adjustsImageWhenHighlighted = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return onlyMusicBtn 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -500,13 +500,17 @@ class PQStuckPointEditerController: PQBaseViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         sender.isSelected = !sender.isSelected 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pointEditerBtn.isSelected = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pointEditBGView.isHidden = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        musicEditBGView.isHidden = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        musicEditBGView.showData() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_musicTab, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @objc func editModelClick1(sender: UIButton){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        editModelClick(sender: sender) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 三种模式修改 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    @objc func editModelClick(sender: UIButton) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @objc func editModelClick(sender: UIButton , reportLog:Bool = true) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //        if sender.isSelected { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //            BFLog(message: "已经是选中状态") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //            return  “” 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -579,22 +583,28 @@ class PQStuckPointEditerController: PQBaseViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             speedStuckBtnGifName = "speedstuck_h" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             jumpPointBtnGifName = "jumpPoint_n" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             currentCreateStickersModel = .createStickersModelSpeed 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(reportLog){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             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 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(reportLog){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             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 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(reportLog){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_selectPatternBgm, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         settingPlayerView() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1772,14 +1782,14 @@ extension PQStuckPointEditerController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             BFLog(message: "是再创作进来的 \(reCreateVideoData!.rhythmMode)") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             switch reCreateVideoData!.rhythmMode { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             case 1: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                editModelClick(sender: jumpPointBtn) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                editModelClick(sender: jumpPointBtn,reportLog: false) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             case 2: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                editModelClick(sender: speedStuckBtn) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                editModelClick(sender: speedStuckBtn,reportLog: false) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             case 3: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                editModelClick(sender: onlyMusicBtn) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                editModelClick(sender: onlyMusicBtn,reportLog: false) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             default: break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 |