Browse Source

图片录音删除第0个录音对齐问题;撤回UI更新

harry 3 years ago
parent
commit
54ead6b191

+ 13 - 13
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -309,13 +309,9 @@ public class BFRecordScreenController: BFBaseViewController {
                 if isStart {
                     sself.events.append(WithDrawModel(type: 0, timestamp: sself.currentAssetProgress.seconds))
                 }
-                if !sself.isDragingProgressSlder {
-                    BFLog(1, message: "isDragingProgressSlder 进行中")
-                }
-                sself.isDragingProgressSlder = true
-                
-                BFLog(1, message: "isDragingProgressSlder 进行中")
                 
+                sself.isDragingProgressSlder = true
+                                
                 sself.changeProgress(progress: process)
             }
         }
@@ -830,11 +826,13 @@ public class BFRecordScreenController: BFBaseViewController {
                 // 更新进度
                 resetCurrentProgress()
                 for (index, item) in itemModels[currItemModelIndex].voiceStickers.enumerated() {
-                    if index >= isStopAtRecordRange, index > 0 {
+                    if index >= isStopAtRecordRange {
                         // 注:开始时间减去duration or 等一前一段录音的结束时间
                         //                        item.startTime = item.startTime - currDuration
-                        item.startTime = itemModels[currItemModelIndex].voiceStickers[index - 1].endTime
-                        item.endTime = item.startTime + (Double(item.duration ?? "0") ?? 0)
+//                        item.startTime = itemModels[currItemModelIndex].voiceStickers[index - 1].endTime
+//                        item.endTime = item.startTime + (Double(item.duration ?? "0") ?? 0)
+                        item.startTime -= currDuration
+                        item.endTime -= currDuration
                     }
                 }
                 // 重绘录音进度视图
@@ -977,11 +975,13 @@ public class BFRecordScreenController: BFBaseViewController {
             let dur = itemModels[currItemModelIndex].materialDuraion
             if dur > 0 {
                 changeProgress(progress: Float(jumpTime / dur))
-                isDragingProgressSlder = false
-                currentPlayRecordIndex = -1
-                hadPrepareToPlayRecord = false
-                progressThumV.progress = jumpTime
+            }else {
+                changeProgress(progress: Float(0))
             }
+            isDragingProgressSlder = false
+            currentPlayRecordIndex = -1
+            hadPrepareToPlayRecord = false
+            progressThumV.progress = jumpTime
             
             if let event = events.last, event.type == 2 {
                 changeWithDrawBtnLayout(true)

+ 1 - 1
BFRecordScreenKit/Classes/RecordScreen/View/BFVideoThumbProgressView.swift

@@ -83,7 +83,7 @@ class BFVideoThumbProgressView: UIView {
             make.right.equalTo(width * -0.5)
             make.bottom.equalToSuperview()
             make.height.equalTo(6)
-            make.width.equalTo(1)
+            make.width.equalTo(1).priority(.high)
         }
     }