huzhiqiang пре 3 година
родитељ
комит
32bd31a351

+ 8 - 1
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -973,7 +973,14 @@ class PQStuckPointEditerController: PQBaseViewController {
 
         // 更新裁剪时间条的的ui数据
         stuckPointCuttingView.videoDuration = max(CGFloat(finallyUserAudioTime), CGFloat(finallyStuckPoints.last!))
-        stuckPointCuttingView.updateEndTime(startTime: CGFloat(CMTimeGetSeconds(playeTimeRange.start)), endTime: CGFloat(CMTimeGetSeconds(playeTimeRange.end)))
+        let counn = (stuckPointMusicData?.rhythmSdata[0].pointTimes.count)! - 2
+        let suggestRhythmStartTime = CGFloat(stuckPointMusicData?.suggestRhythmStartTime ?? 0)
+        let suggestRhythmEndTime = max(suggestRhythmStartTime, CGFloat(stuckPointMusicData?.rhythmSdata[0].pointTimes[max(counn, 0)] ?? 0)/CGFloat(BASE_FILTER_TIMESCALE))
+        stuckPointCuttingView.updateEndTime(
+            startTime: CGFloat(CMTimeGetSeconds(playeTimeRange.start)),
+            endTime: CGFloat(CMTimeGetSeconds(playeTimeRange.end)),
+            suggestRhythmStartTime: suggestRhythmStartTime,
+            suggestRhythmEndTime: suggestRhythmEndTime)
 
         // 2,创建滤镜
         DispatchQueue.global().async {

+ 1 - 1
BFFramework/Classes/Stuckpoint/Model/PQVoiceModel.swift

@@ -13,7 +13,7 @@ public enum voiceStatue: Int {
     case isPlaying = 1 // 播放中
     case isNormal = 2 // 正常状态
     case isSelected = 3 // 选中状态,有红框 字红色 ,别的都没有
-    case isPause = 4 // 播放中
+    case isPause = 4 // 播放状态暂停
 }
 
 open class PQVoiceModel: NSObject, NSCopying {

+ 1 - 1
BFFramework/Classes/Stuckpoint/View/PQStuckPointCuttingView.swift

@@ -302,7 +302,7 @@ class PQStuckPointCuttingView: UIView {
         let selectIndex = Int(floor(startIndex + progress * CGFloat(wavSelectCount)))
         if(selectIndex < lineLayerArray.count){
             let drawLayer:CAShapeLayer = lineLayerArray[selectIndex]
-            BFLog(1, message: "progress is \(progress) i \(selectIndex) 命中的位置:\(CGFloat(selectIndex) * oneMarginTime)")
+//            BFLog(1, message: "progress is \(progress) i \(selectIndex) 命中的位置:\(CGFloat(selectIndex) * oneMarginTime)")
             if drawLayer.strokeColor != UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor{
                 drawLayer.strokeColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor
                 drawLayer.setNeedsDisplay()

+ 0 - 1
BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -361,7 +361,6 @@ public class PQGPUImagePlayerView: UIView {
         var composition: AVMutableComposition?
 
         let asset = AVURLAsset(url: url, options: nil)
-//        FilterLog(message: "播放器初始化的音频时长\(asset.duration.seconds)  url is \(url),最终使用时长\(originMusicDuration),裁剪范围\(CMTimeGetSeconds(clipAudioRange.start)) 到 \(CMTimeGetSeconds(clipAudioRange.end))")
         BFLog(1, message:  "播放器初始化的音频时长\(asset.duration.seconds)  url is \(url),最终使用时长\(originMusicDuration),裁剪范围\(CMTimeGetSeconds(clipAudioRange.start)) 到 \(CMTimeGetSeconds(clipAudioRange.end))")
 
         self.asset = asset

+ 1 - 1
BFFramework/Classes/Utils/PQCommonMethodUtil.swift

@@ -144,7 +144,7 @@ public func BFLog<T>( _ type : Int = 9, _ file:String = #file, _ line:Int = #lin
         logger.d(message as? String ?? "")
         
         BuglyLog.level(.warn, logs: message as? String)
-    }else if type == 1 {
+    }else if type == 3 {
         let file = (file as NSString).lastPathComponent;
         let dateFmt = DateFormatter()
         dateFmt.dateFormat = "HH:mm:ss:SSSS"

+ 1 - 1
BFFramework/Classes/Utils/PQThirdPlatformUtil.swift

@@ -24,7 +24,7 @@ public class PQSingletoBuglyUtil: NSObject {
         buglyConfig.reportLogLevel = .warn
         #if DEBUG
             buglyConfig.version = versionName + ".6666"
-            buglyConfig.debugMode = false
+            buglyConfig.debugMode = true
         #else
             if PQENVUtil.shared.envMode == .ENVModeOnline {
                 buglyConfig.version = versionName + "." + versionCode