瀏覽代碼

保存重试按钮颜色更改,文案更改

harry 3 年之前
父節點
當前提交
f002c04c0e

+ 6 - 4
BFFramework/Classes/PQGPUImage/akfilters/PQMovieFilter.swift

@@ -401,8 +401,8 @@ class PQMovieFilter: PQBaseFilter {
             lastImageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer!)!
 //            }
 
-            sharedImageProcessingContext.runOperationSynchronously {
-                self.renderPixelBuffler(movieFrame: CMSampleBufferGetImageBuffer(sampleBuffer!)!, withSampleTime: currentTime)
+            sharedImageProcessingContext.runOperationSynchronously { [weak self] in
+                self?.renderPixelBuffler(movieFrame: CMSampleBufferGetImageBuffer(sampleBuffer!)!, withSampleTime: currentTime)
             }
             return
         } else {
@@ -423,8 +423,10 @@ class PQMovieFilter: PQBaseFilter {
                     BFLog(2, message: "处理显示定帧")
                     let currTime = CMTimeGetSeconds(currentTime)
                     BFLog(2, message: "process time is \(currTime)")
-                    sharedImageProcessingContext.runOperationSynchronously {
-                        renderPixelBuffler(movieFrame: lastImageBuffer!, withSampleTime: currentTime)
+                    sharedImageProcessingContext.runOperationSynchronously { [weak self] in
+                        if let imgBuffer = self?.lastImageBuffer {
+                            renderPixelBuffler(movieFrame: imgBuffer, withSampleTime: currentTime)
+                        }
                     }
                 }
             }

+ 4 - 4
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -443,7 +443,7 @@ class PQStuckPointPublicController: PQBaseViewController {
         finishedBtn.setTitle("重试", for: .normal)
         finishedBtn.setTitleColor(UIColor.white, for: .normal)
         finishedBtn.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .medium)
-        finishedBtn.backgroundColor = UIColor.green
+        finishedBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         finishedBtn.tag = 97
         finishedBtn.isHidden = true
         finishedBtn.addCorner(corner: 5)
@@ -952,7 +952,7 @@ extension PQStuckPointPublicController {
         
         if(saveMovieLocalURL == nil || isTestSaveFailed){
             BFLog(message: "保存相册的视频导出地址无效!!!")
-            saveVideoTipsLabel.text = "视频已经保存失败"
+            saveVideoTipsLabel.text = "视频保存失败"
             saveRetryBtn.isHidden = false
             saveVideoTipsBgView.isHidden = false
 //            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.8) { [weak self] in
@@ -969,14 +969,14 @@ extension PQStuckPointPublicController {
                 DispatchQueue.main.async { [weak self] in
                     if self?.view != nil {
                         if isFinished {
-                            self?.saveVideoTipsLabel.text = "视频已保存到相册"
+                            self?.saveVideoTipsLabel.text = "视频已保存到相册"
                             self?.saveRetryBtn.isHidden = true
                             DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.8) { [weak self] in
                                 self?.saveVideoTipsBgView.isHidden = true
                             }
                          
                         } else {
-                            self?.saveVideoTipsLabel.text = "视频已经保存失败"
+                            self?.saveVideoTipsLabel.text = "视频保存失败"
                             self?.saveRetryBtn.isHidden = false
 //                            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.8) { [weak self] in
 //                                self?.saveVideoTipsBgView.isHidden = true