做同款进入时 不经过音乐界面

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -254,14 +254,29 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         case 13:
             if confirmBtn.isSelected {
 //                reCreateMusicData?.endTime = (reCreateMusicData?.startTime ?? 0) + (reCreateMusicData?.stuckPointCuttingTime(videoCount: selectedDataCount - selectedImageDataCount, imageCount: selectedImageDataCount, totalDuration: photoMaterialVc.selectedTotalDuration) ?? 0)
-                let stuckPointMusicVc = PQStuckPointMusicController()
-                stuckPointMusicVc.selectedMusicData = reCreateMusicData
-                stuckPointMusicVc.selectedDataCount = selectedDataCount
-                stuckPointMusicVc.reCreateVideoData = reCreateVideoData
-                stuckPointMusicVc.selectedImageDataCount = selectedImageDataCount
-                stuckPointMusicVc.selectedTotalDuration = photoMaterialVc.selectedTotalDuration
-                stuckPointMusicVc.selectedPhotoData = photoMaterialVc.selectedPhotoData
-                navigationController?.pushViewController(stuckPointMusicVc, animated: true)
+                
+                if(reCreateMusicData != nil){
+                    let editerVC: PQStuckPointEditerController = PQStuckPointEditerController()
+                    editerVC.stuckPointMusicData = reCreateMusicData
+                    editerVC.selectedDataCount = selectedDataCount
+                    editerVC.selectedImageDataCount = selectedImageDataCount
+                    //mdf by ak 进入编辑界面的时候去掉图片的时长
+                    editerVC.selectedTotalDuration = photoMaterialVc.selectedTotalDuration - (Double(selectedImageDataCount) * 1.5)
+                    editerVC.selectedPhotoData = photoMaterialVc.selectedPhotoData
+                    editerVC.reCreateVideoData = reCreateVideoData
+                    editerVC.isReCreate = true
+                    navigationController?.pushViewController(editerVC, animated: true)
+                }else{
+                    let stuckPointMusicVc = PQStuckPointMusicController()
+                    stuckPointMusicVc.selectedMusicData = reCreateMusicData
+                    stuckPointMusicVc.selectedDataCount = selectedDataCount
+                    stuckPointMusicVc.reCreateVideoData = reCreateVideoData
+                    stuckPointMusicVc.selectedImageDataCount = selectedImageDataCount
+                    stuckPointMusicVc.selectedTotalDuration = photoMaterialVc.selectedTotalDuration
+                    stuckPointMusicVc.selectedPhotoData = photoMaterialVc.selectedPhotoData
+                    navigationController?.pushViewController(stuckPointMusicVc, animated: true)
+                }
+             
                 // 卡点视频素材确认按钮
                 PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_click_confirmMaterial, pageSource: .sp_stuck_selectMaterial, extParams: ["materialNumber": selectedDataCount], remindmsg: "卡点视频数据上报-（点击上报：卡点视频素材确认按钮）")
             }