Browse Source

1,打包机编译不过长语句 2, 选择音乐后的处理

jsonwang 3 years ago
parent
commit
74c65e70b4

+ 21 - 18
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -443,6 +443,8 @@ class PQStuckPointEditerController: PQBaseViewController {
         
         searchVC.btnClickHandle = { [weak self] _, bgmData in
             // 使用音乐
+            BFLog(message: "搜索音乐点击了使用")
+//            self?.musicEditBGView.insertSearchMusic(model: bgmData as! PQVoiceModel)
             self?.userstuckPointMusic(musicData: bgmData as? PQVoiceModel)
         }
         
@@ -478,10 +480,10 @@ class PQStuckPointEditerController: PQBaseViewController {
 //            cShowHUB(superView: self.view, msg: "1111")
 //            return
 //        }
-        if sender.isSelected {
-            BFLog(message: "已经是选中状态")
-            return
-        }
+//        if sender.isSelected {
+//            BFLog(message: "已经是选中状态")
+//            return
+//        }
         lastEditModelBtn?.isSelected = false
         sender.isSelected = !sender.isSelected
         lastEditModelBtn = sender
@@ -1425,7 +1427,9 @@ extension PQStuckPointEditerController {
             
             //拼接要使用的卡点信息
             for i in 0...clipNum {
-                finallyStuckPoints.append(stuckPointsTemp[i % stuckPointsTemp.count] + Float(i / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0))
+                let a = stuckPointsTemp[i % stuckPointsTemp.count]
+                let b = Float(i / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
+                finallyStuckPoints.append(a + b)
             }
    
             break
@@ -1440,7 +1444,9 @@ extension PQStuckPointEditerController {
        
         for i in 0...selectedImageDataCount {
  
-            finallyStuckPoints.append(stuckPointsTemp[(i + Int(pointIndex ?? 0))  % stuckPointsTemp.count] + Float((i + Int(pointIndex ?? 0)) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0))
+            let a = stuckPointsTemp[i % stuckPointsTemp.count]
+            let b = Float(i / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
+            finallyStuckPoints.append(a + b)
         }
         selectedTotalDuration = Float64(((finallyStuckPoints.last ?? 0) - (finallyStuckPoints.first ?? 0)))
          
@@ -1456,7 +1462,9 @@ extension PQStuckPointEditerController {
                     pointIndex = (pointIndex ?? 0) + 1
                     for i in 0...selectedImageDataCount {
                         
-                        finallyStuckPoints.append(stuckPointsTemp[(i + Int(pointIndex ?? 0))  % stuckPointsTemp.count] + Float((i + Int(pointIndex ?? 0)) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0))
+                        let a = stuckPointsTemp[i % stuckPointsTemp.count]
+                        let b = Float(i / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
+                        finallyStuckPoints.append(a + b)
                     }
                 }
             }else{
@@ -1541,13 +1549,9 @@ extension PQStuckPointEditerController {
                                 self?.stuckPointMusicData?.localPath = filePath?.replacingOccurrences(of: documensDirectory, with: "")
                                 // 处理所有数据完成
                                 self?.dealWithDataSuccess()
-                            } else {
-                                if self?.synchroMarskView.superview != nil {
-                                    self?.synchroMarskView.removeMarskView()
-                                }
-//                                PQUploadRemindView.showUploadRemindView(title: nil, attributedTitle: NSAttributedString(string: "加载音乐失败,请重新选择音乐"), summary: "", confirmTitle: nil) { [weak self] _, _ in
-//                                    self?.navigationController?.popViewController(animated: true)
-//                                }
+                            }
+                            if self?.synchroMarskView.superview != nil {
+                                self?.synchroMarskView.removeMarskView()
                             }
                         }
                     } else {
@@ -1556,14 +1560,13 @@ extension PQStuckPointEditerController {
                         self?.dealWithDataSuccess()
                     }
                     // 添加子视图
-                    self?.addSubViews()
+//                    if(playerView )
+//                    self?.addSubViews()
                 } else {
                     if self?.synchroMarskView.superview != nil {
                         self?.synchroMarskView.removeMarskView()
                     }
-//                    PQUploadRemindView.showUploadRemindView(title: nil, attributedTitle: NSAttributedString(string: "加载音乐失败,请重新选择音乐"), summary: "", confirmTitle: nil) { [weak self] _, _ in
-//                        self?.navigationController?.popViewController(animated: true)
-//                    }
+ 
                 }
             }
         } else if stuckPointMusicData?.localPath == nil || (stuckPointMusicData?.localPath?.count ?? 0) > 0 {