|
@@ -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
|