Browse Source

1,推荐卡点结束时间不再处理使用服务器原有值,2,图片默认时长修改为1.5s

jsonwang 3 years ago
parent
commit
2a882691f6

+ 1 - 1
BFFramework/Classes/Base/ViewModel/PQBaseViewModel.swift

@@ -42,7 +42,7 @@ public class PQBaseViewModel: NSObject {
                         tempModel.volume = 30
                         tempModel.voiceType = VOICETYPT.BGM.rawValue
                         if tempModel.rhythmSdata.count > 0 && (videoCount > 0 || imageCount > 0 ||  totalDuration > 0)  {
-                            tempModel.endTime = tempModel.startTime + tempModel.stuckPointCuttingTime(videoCount: videoCount, imageCount: imageCount, totalDuration: totalDuration)
+//                            tempModel.endTime = tempModel.startTime + tempModel.stuckPointCuttingTime(videoCount: videoCount, imageCount: imageCount, totalDuration: totalDuration)
                         }
                         bgmList.append(tempModel)
                     }

+ 2 - 2
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -163,7 +163,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
     lazy var photoMaterialVc: PQPhotoMaterialController = {
         let photoMaterialVc = PQPhotoMaterialController()
         photoMaterialVc.isShowMediaTag = false
-        photoMaterialVc.imageDuration = 1
+        photoMaterialVc.imageDuration = 1.5
         addChild(photoMaterialVc)
         view.insertSubview(photoMaterialVc.view, belowSubview: bottomRemindView)
 //        photoMaterialVc.updateFrame(newFrame: CGRect(x: 0, y: materialHeadView.frame.maxY + margin / 2, width: view.frame.width, height: view.frame.height - (materialHeadView.frame.maxY + margin + bottomRemindView.frame.height)))
@@ -248,7 +248,7 @@ 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)
+//                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

+ 1 - 1
BFFramework/Classes/Stuckpoint/ViewModel/PQStuckPointViewModel.swift

@@ -88,7 +88,7 @@ public class PQStuckPointViewModel: NSObject {
                 for (_,dict) in tempArr!.enumerated() {
                     let tempMusic = PQVoiceModel(jsonDict: dict)
                     if tempMusic.rhythmSdata.count > 0 && (videoCount > 0 || imageCount > 0 ||  totalDuration > 0)  {
-                        tempMusic.endTime = tempMusic.startTime + tempMusic.stuckPointCuttingTime(videoCount: videoCount, imageCount: imageCount, totalDuration: totalDuration)
+//                        tempMusic.endTime = tempMusic.startTime + tempMusic.stuckPointCuttingTime(videoCount: videoCount, imageCount: imageCount, totalDuration: totalDuration)
                         BFLog(message: "music:\(tempMusic.musicName ?? ""),\(tempMusic.startTime),\(tempMusic.endTime)")
                     }
                     if tempMusic.endTime <= tempMusic.startTime {