ソースを参照

fix:绘制第一条波形纹

huzhiqiang 3 年 前
コミット
7d0592a827

+ 3 - 7
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -1024,17 +1024,13 @@ class PQStuckPointEditerController: PQBaseViewController {
                 let end3: TimeInterval = Date().timeIntervalSince1970
 
                 self.playerView.play(pauseFirstFrame: false, playeTimeRange: CMTimeRange(start: self.playeTimeRange.start, end: self.playeTimeRange.end))
-
+                self.stuckPointCuttingView.updateProgress(progress: 0)
+                
                 let end4: TimeInterval = Date().timeIntervalSince1970
                 BFLog(message: " playerView.play tiskskskskme  \(end4 - end3)")
 
                 // 6,进度回调
-                self.playerView.progress = { [weak self] currentTime, tatolTime, percent in
-                    if percent == 1 {
-                        self?.stuckPointCuttingView.resetDefaultsColor(clearData: false)
-
-                        return
-                    }
+                self.playerView.progress = { [weak self] currentTime, tatolTime, _ in
                     if(CMTimeGetSeconds(self?.playeTimeRange.duration ?? .zero) <= 0.0){
                         BFLog(message: "时长错误!!!!")
                         return

+ 0 - 15
BFFramework/Classes/Stuckpoint/View/PQStuckPointCuttingView.swift

@@ -58,7 +58,6 @@ class PQStuckPointCuttingView: UIView {
     private var oneMarginTime: CGFloat = 0
 
     private var isDrawLine: Bool = false
-    private var startDraw = true
 
     // 保存已经绘制的竖线用于变色使用
     var lineLayerArray: Array = Array<CAShapeLayer>.init()
@@ -297,18 +296,6 @@ class PQStuckPointCuttingView: UIView {
         }
         
         let startIndex = scrollView.contentOffset.x / (frequencyWidth + frequencyMargin)
-        if startDraw { // 第一个波纹
-            startDraw = false
-            let selectIndex = Int(ceil(startIndex))
-            if(selectIndex < lineLayerArray.count){
-                let drawLayer:CAShapeLayer = lineLayerArray[selectIndex]
-                if drawLayer.strokeColor != UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor{
-                    drawLayer.strokeColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor
-                    drawLayer.setNeedsDisplay()
-                    drawLayer.layoutIfNeeded()
-                }
-            }
-        }
         let selectIndex = Int(ceil(startIndex + progress * CGFloat(wavSelectCount)))
         if(selectIndex < lineLayerArray.count){
             let drawLayer:CAShapeLayer = lineLayerArray[selectIndex]
@@ -330,8 +317,6 @@ class PQStuckPointCuttingView: UIView {
 
     // 竖线恢复到原有色值
     func resetDefaultsColor(clearData:Bool = true) {
-        startDraw = false
-
         for layer in lineLayerArray {
             layer.strokeColor = UIColor.hexColor(hexadecimal: "#999999").cgColor
             layer.setNeedsDisplay()

+ 2 - 2
BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -454,7 +454,7 @@ public class PQGPUImagePlayerView: UIView {
                 strongSelf.status = .stop
                 strongSelf.finishedClosure?()
                 strongSelf.showPlayBtn(isHidden: false)
-                strongSelf.progress!(0,0,1)
+
             }
         }
         speaker = SpeakerOutput()
@@ -568,7 +568,7 @@ public class PQGPUImagePlayerView: UIView {
           
             FilterLog(message: "缓存没有查找到?出现数据错误!!!!")
             for (index,bsFilter )in cacheFilters.enumerated() {
-                BFLog(2, message: "22222缓存操作   没要查找到要查找的显示是为:\(currTime) 缓存数据timeline in :\(bsFilter.stickerInfo?.timelineIn ?? 0.0)) timelineOut:\(bsFilter.stickerInfo?.timelineOut ?? 0.0) 缓存数 \(cacheFilters.count) index: \(index)")
+//                BFLog(1, message: "22222缓存操作   没要查找到要查找的显示是为:\(currTime) 缓存数据timeline in :\(bsFilter.stickerInfo?.timelineIn ?? 0.0)) timelineOut:\(bsFilter.stickerInfo?.timelineOut ?? 0.0) 缓存数 \(cacheFilters.count) index: \(index)")
             }
             
             return