huzhiqiang пре 3 година
родитељ
комит
4c674d6a33

+ 2 - 2
BFFramework/Classes/Base/View/PQAssetCategoryCell.swift

@@ -87,12 +87,12 @@ public class PQAssetCategoryCell: UICollectionViewCell {
             make.centerY.equalToSuperview()
         }
         categoryNameLab.snp.makeConstraints { make in
-            make.left.equalTo(videoImageView.snp_right).offset(margin)
+            make.left.equalTo(videoImageView.snp.right).offset(margin)
             make.width.lessThanOrEqualTo(maxW)
             make.centerY.equalToSuperview()
         }
         countLab.snp.remakeConstraints { make in
-            make.left.equalTo(categoryNameLab.snp_right)
+            make.left.equalTo(categoryNameLab.snp.right)
             make.centerY.equalToSuperview()
             make.width.equalTo(countW)
         }

+ 1 - 1
BFFramework/Classes/Base/View/PQBaseVideoInfoView.swift

@@ -75,7 +75,7 @@ open class PQBaseVideoInfoView: UIView {
         }
         titleLab.snp.makeConstraints { make in
             make.top.equalTo(imageView)
-            make.left.equalTo(imageView.snp_right).offset(margin)
+            make.left.equalTo(imageView.snp.right).offset(margin)
             make.right.equalToSuperview().offset(-margin)
         }
     }

+ 1 - 1
BFFramework/Classes/Base/View/PQSectionHeadView.swift

@@ -86,7 +86,7 @@ public class PQSectionHeadView: UIView {
             make.centerY.equalToSuperview()
         }
         titleLab.snp.makeConstraints { make in
-            make.left.equalTo(lineView.snp_right).offset(lineW * 4)
+            make.left.equalTo(lineView.snp.right).offset(lineW * 4)
             make.centerY.equalToSuperview()
         }
         clearBtn.snp.makeConstraints { make in

+ 14 - 14
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -620,7 +620,7 @@ class PQStuckPointEditerController: PQBaseViewController {
             speedSettingView.snp.remakeConstraints { make in
                 make.left.equalToSuperview().offset(16)
                 make.right.equalToSuperview()
-                make.top.equalTo(onlyMusicBtn.snp_bottom).offset(10)
+                make.top.equalTo(onlyMusicBtn.snp.bottom).offset(10)
                 make.height.equalTo(sender.tag == 1 ? 44 : 30)
             }
             speedSettingView.isHidden = false
@@ -640,7 +640,7 @@ class PQStuckPointEditerController: PQBaseViewController {
             speedSettingView.snp.remakeConstraints { make in
                 make.left.equalToSuperview().offset(16)
                 make.right.equalToSuperview()
-                make.top.equalTo(onlyMusicBtn.snp_bottom).offset(10)
+                make.top.equalTo(onlyMusicBtn.snp.bottom).offset(10)
                 make.height.equalTo(30)
             }
 
@@ -814,30 +814,30 @@ class PQStuckPointEditerController: PQBaseViewController {
 
         musicEditerBtn.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(-100)
-            make.top.equalTo(pointEditerBtn.snp_top)
+            make.top.equalTo(pointEditerBtn.snp.top)
             make.height.equalTo(24)
             make.width.equalTo(24)
         }
         pointEditBGView.snp.makeConstraints { make in
             make.left.right.equalTo(view)
-            make.bottom.equalTo(pointEditerBtn.snp_top).offset(-7)
+            make.bottom.equalTo(pointEditerBtn.snp.top).offset(-7)
             make.height.equalTo(290)
         }
         musicEditBGView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalTo(pointEditerBtn.snp_top).offset(-7)
+            make.bottom.equalTo(pointEditerBtn.snp.top).offset(-7)
             make.height.equalTo(290)
         }
         
         optionlineView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalTo(pointEditBGView.snp_bottom).offset(-1)
+            make.bottom.equalTo(pointEditBGView.snp.bottom).offset(-1)
             make.height.equalTo(1)
         }
 
         stuckPointCuttingView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalTo(musicEditBGView.snp_bottom).offset(-1)
+            make.bottom.equalTo(musicEditBGView.snp.bottom).offset(-1)
             make.height.equalTo(85)
         }
         pointEditRemindLab.snp.makeConstraints { make in
@@ -848,7 +848,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         }
         speedStuckBtn.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.top.equalTo(pointEditRemindLab.snp_bottom).offset(8)
+            make.top.equalTo(pointEditRemindLab.snp.bottom).offset(8)
             make.height.equalTo(80)
             make.width.equalTo(80)
         }
@@ -859,8 +859,8 @@ class PQStuckPointEditerController: PQBaseViewController {
         }
 
         jumpPointBtn.snp.makeConstraints { make in
-            make.left.equalTo(speedStuckBtn.snp_right).offset(10)
-            make.top.equalTo(speedStuckBtn.snp_top)
+            make.left.equalTo(speedStuckBtn.snp.right).offset(10)
+            make.top.equalTo(speedStuckBtn.snp.top)
             make.height.equalTo(80)
             make.width.equalTo(80)
         }
@@ -871,8 +871,8 @@ class PQStuckPointEditerController: PQBaseViewController {
         }
 
         onlyMusicBtn.snp.makeConstraints { make in
-            make.left.equalTo(jumpPointBtn.snp_right).offset(10)
-            make.top.equalTo(speedStuckBtn.snp_top)
+            make.left.equalTo(jumpPointBtn.snp.right).offset(10)
+            make.top.equalTo(speedStuckBtn.snp.top)
             make.height.equalTo(80)
             make.width.equalTo(64)
         }
@@ -880,7 +880,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         speedSettingView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
             make.right.equalToSuperview()
-            make.top.equalTo(onlyMusicBtn.snp_bottom).offset(10)
+            make.top.equalTo(onlyMusicBtn.snp.bottom).offset(10)
             make.height.equalTo(44)
         }
         speedTitleLab.snp.makeConstraints { make in
@@ -891,7 +891,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         }
         sustomSwitchView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.top.equalTo(speedTitleLab.snp_bottom).offset(8)
+            make.top.equalTo(speedTitleLab.snp.bottom).offset(8)
             make.height.equalTo(30)
             make.width.equalTo(180)
         }

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

@@ -532,19 +532,19 @@ class PQStuckPointPublicController: PQBaseViewController {
             make.height.equalTo(22)
         }
         shareWechatBtn.snp.makeConstraints { make in
-            make.right.equalTo(view.snp_centerX).offset(-cDefaultMargin)
+            make.right.equalTo(view.snp.centerX).offset(-cDefaultMargin)
             make.width.equalTo(164)
             make.height.equalTo(52)
-            make.bottom.equalTo(finishedBtn.snp_top).offset(-32)
+            make.bottom.equalTo(finishedBtn.snp.top).offset(-32)
         }
         shareFriendBtn.snp.makeConstraints { make in
-            make.left.equalTo(view.snp_centerX).offset(cDefaultMargin)
+            make.left.equalTo(view.snp.centerX).offset(cDefaultMargin)
             make.width.bottom.height.equalTo(shareWechatBtn)
         }
 
         inputBackView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.bottom.equalTo(shareWechatBtn.snp_top).offset(-16)
+            make.bottom.equalTo(shareWechatBtn.snp.top).offset(-16)
             make.width.equalTo(343)
             make.height.equalTo(109)
         }
@@ -566,21 +566,21 @@ class PQStuckPointPublicController: PQBaseViewController {
         coverImageTitle.snp.makeConstraints { make in
             make.left.equalToSuperview()
             make.width.equalTo(50)
-            make.top.equalTo(coverImageView.snp_bottom).offset(isWidth ? 0 : -23)
+            make.top.equalTo(coverImageView.snp.bottom).offset(isWidth ? 0 : -23)
             make.height.equalTo(23)
         }
 
         remindLab.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.bottom.equalTo(inputBackView.snp_top).offset(-16).priorityHigh()
+            make.bottom.equalTo(inputBackView.snp.top).offset(-16).priorityHigh()
             make.height.equalTo(44)
             make.top.greaterThanOrEqualTo(5)
-            make.bottom.lessThanOrEqualTo(inputBackView.snp_top).offset(-5)
+            make.bottom.lessThanOrEqualTo(inputBackView.snp.top).offset(-5)
         }
 
         titleLabel.snp.makeConstraints { make in
             make.height.equalTo(48)
-            make.left.equalTo(coverImageView.snp_right).offset(12)
+            make.left.equalTo(coverImageView.snp.right).offset(12)
             make.right.equalToSuperview().offset(-14)
             make.top.equalToSuperview().offset(10)
         }
@@ -588,7 +588,7 @@ class PQStuckPointPublicController: PQBaseViewController {
         pinView.snp.makeConstraints { make in
             make.height.width.equalTo(72)
             make.right.equalToSuperview()
-            make.bottom.equalTo(inputBackView.snp_bottom)
+            make.bottom.equalTo(inputBackView.snp.bottom)
         }
 
         publicTitleView.snp.makeConstraints { make in
@@ -867,7 +867,7 @@ extension PQStuckPointPublicController {
             }
         }
         exporter.completion = { [weak self] url in
-            BFLog(message: "无水印的视频导出完成: \(url) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url).duration))")
+            BFLog(message: "无水印的视频导出完成: \(String(describing: url)) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: (url ?? URL(string: "https://media.w3.org/2010/05/sintel/trailer.mp4")!)).duration))")
 
             // 导出完成后取消导出
             if self?.exporter != nil {
@@ -1648,12 +1648,12 @@ extension PQStuckPointPublicController {
             watermarkMovieExporter.start(playeTimeRange: playeTimeRange)
             BFLog(message: "开始导出")
         }
-        watermarkMovieExporter.progressClosure = { [weak self] _, _, progress in
+        watermarkMovieExporter.progressClosure = { _, _, progress in
             BFLog(message: "带水印的合成进度 \(progress) ")
           
         }
         watermarkMovieExporter.completion = { [weak self] url in
-            BFLog(message: "有水印的视频导出完成: \(url) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url).duration))")
+            BFLog(message: "有水印的视频导出完成: \(String(describing: url)) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url ?? URL(string: "https://media.w3.org/2010/05/sintel/trailer.mp4")!).duration))")
 
             // 导出完成后取消导出
             if self?.watermarkMovieExporter != nil {
@@ -1794,12 +1794,12 @@ extension PQStuckPointPublicController {
                        self.endMovieExporter.start(playeTimeRange: CMTimeRange.init(start: CMTime.zero, duration: CMTimeMakeWithSeconds(Float64(bgMovieInfo.out), preferredTimescale: BASE_FILTER_TIMESCALE)))
                        BFLog(message: "开始导出")
                    }
-                   self.endMovieExporter.progressClosure = { [weak self] _, _, progress in
+                   self.endMovieExporter.progressClosure = { _, _, progress in
                        BFLog(message: "片尾合成进度 \(progress) ")
                      
                    }
                 self.endMovieExporter.completion = { [weak self] url in
-                       BFLog(message: "片尾的视频导出完成: \(url) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url).duration))")
+                    BFLog(message: "片尾的视频导出完成: \(String(describing: url)) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url ?? URL(string: "https://media.w3.org/2010/05/sintel/trailer.mp4")!).duration))")
 
                        // 导出完成后取消导出
                        if self?.endMovieExporter != nil {

+ 6 - 6
BFFramework/Classes/Stuckpoint/View/PQCustomSpeedSettingView.swift

@@ -209,7 +209,7 @@ class PQCustomSpeedSettingView: UIView {
             make.height.equalTo(50)
             make.width.equalTo(254)
             make.right.equalToSuperview().offset(-30)
-            make.top.equalTo(cancleBtn.snp_top)
+            make.top.equalTo(cancleBtn.snp.top)
         }
 
         customSpeedFastView.snp.makeConstraints { make in
@@ -220,25 +220,25 @@ class PQCustomSpeedSettingView: UIView {
 
         customSpeedSlowView.snp.makeConstraints { make in
             make.height.width.equalTo(30)
-            make.left.equalTo(customSpeedFastView.snp_left)
-            make.top.equalTo(customSpeedFastView.snp_bottom).offset(31)
+            make.left.equalTo(customSpeedFastView.snp.left)
+            make.top.equalTo(customSpeedFastView.snp.bottom).offset(31)
         }
 
         fastSlider.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(65)
             make.right.equalToSuperview().offset(-36)
-            make.centerY.equalTo(customSpeedFastView.snp_centerY)
+            make.centerY.equalTo(customSpeedFastView.snp.centerY)
         }
         slowSlider.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(65)
             make.right.equalToSuperview().offset(-36)
-            make.centerY.equalTo(customSpeedSlowView.snp_centerY)
+            make.centerY.equalTo(customSpeedSlowView.snp.centerY)
         }
 
         jumpSpeedSlider.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(30)
             make.right.equalToSuperview().offset(-36)
-            make.top.equalTo(titleLab.snp_bottom).offset(104)
+            make.top.equalTo(titleLab.snp.bottom).offset(104)
         }
     }
 

+ 2 - 2
BFFramework/Classes/Stuckpoint/View/PQEditPublicCoverImageView.swift

@@ -126,10 +126,10 @@ class PQEditPublicCoverImageView: UIView {
         }
 
         compliteBtn.snp.makeConstraints { make in
-            make.left.equalTo(selectPhotoBtn.snp_right).offset(14.0 * cAdaptatWidth)
+            make.left.equalTo(selectPhotoBtn.snp.right).offset(14.0 * cAdaptatWidth)
             make.width.equalTo(164 * cAdaptatWidth)
             make.height.equalTo(54 * cAdaptatWidth)
-            make.top.equalTo(selectPhotoBtn.snp_top)
+            make.top.equalTo(selectPhotoBtn.snp.top)
         }
     }
 

+ 2 - 2
BFFramework/Classes/Stuckpoint/View/PQEditPublicTitleView.swift

@@ -155,7 +155,7 @@ class PQEditPublicTitleView: UIView {
         }
 
         titleCollectionView.snp.makeConstraints { make in
-            make.top.equalTo(inputBgView.snp_bottom).offset(10)
+            make.top.equalTo(inputBgView.snp.bottom).offset(10)
             make.width.right.equalToSuperview()
             make.bottom.equalTo(0 - cAKSafeAreaHeight)
 //            make.width.equalTo(cScreenWidth)
@@ -300,7 +300,7 @@ class PQEditPublicTitleViewContentCell: UICollectionViewCell {
         iconView.snp.remakeConstraints { make in
             make.width.height.equalTo(24)
             make.right.equalToSuperview().offset(-16)
-            make.top.equalTo(contentView.snp_top).offset(14)
+            make.top.equalTo(contentView.snp.top).offset(14)
         }
     }
 }

+ 6 - 6
BFFramework/Classes/Stuckpoint/View/PQSelecteMusicView.swift

@@ -183,9 +183,9 @@ class PQSelecteMusicView: UIView {
  
     }
     func autolayout() {
-        categoryCollection.snp_removeConstraints()
-        selectMusicCollection.snp_removeConstraints()
-        musicSearchBtn.snp_removeConstraints()
+        categoryCollection.snp.removeConstraints()
+        selectMusicCollection.snp.removeConstraints()
+        musicSearchBtn.snp.removeConstraints()
 
         categoryCollection.snp.makeConstraints { make in
             make.height.equalTo(20)
@@ -700,14 +700,14 @@ class PQSelectMusicCell: UICollectionViewCell {
         musicNameLab.snp.remakeConstraints { make in
             make.width.equalTo(60)
             make.height.equalTo(30)
-            make.top.equalTo(audioImageView.snp_bottom).offset(6)
+            make.top.equalTo(audioImageView.snp.bottom).offset(6)
         }
  
         confirmBtn.snp.remakeConstraints { make in
             make.width.equalTo(54)
             make.height.equalTo(29)
-            make.top.equalTo(musicNameLab.snp_bottom).offset(6)
-            make.centerX.equalTo(audioImageView.snp_centerX)
+            make.top.equalTo(musicNameLab.snp.bottom).offset(6)
+            make.centerX.equalTo(audioImageView.snp.centerX)
           
         }
         audioImageView.addCorner(corner: 60 / 2)

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

@@ -197,8 +197,8 @@ class PQStuckPointCuttingView: UIView {
         tatalTimeLabel.snp.remakeConstraints { make in
             make.width.equalTo(40)
             make.height.equalTo(15)
-            make.top.equalTo(videoCropView.snp_top).offset(6)
-            make.right.equalTo(videoCropView.snp_right).offset(-6)
+            make.top.equalTo(videoCropView.snp.top).offset(6)
+            make.right.equalTo(videoCropView.snp.right).offset(-6)
         }
         
       

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

@@ -54,7 +54,7 @@ class PQStuckPointMaterialHeadView: UIView {
             make.centerY.equalToSuperview()
         }
         titleLab.snp.makeConstraints { make in
-            make.left.equalTo(iconImageView.snp_right).offset(cDefaultMargin)
+            make.left.equalTo(iconImageView.snp.right).offset(cDefaultMargin)
             make.right.equalToSuperview().offset(-cDefaultMargin)
             make.top.equalTo(iconImageView)
         }

+ 2 - 2
BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicContentCell.swift

@@ -198,7 +198,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
             }
 
             musicNameLab.snp.remakeConstraints { make in
-                make.left.equalTo(audioImageView.snp_right).offset(margin)
+                make.left.equalTo(audioImageView.snp.right).offset(margin)
                 make.width.equalTo(nameW)
                 make.height.equalTo(cDefaultMargin * 3)
                 make.centerY.equalToSuperview()
@@ -230,7 +230,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
                 make.centerY.equalToSuperview()
             }
             titleLab.snp.remakeConstraints { make in
-                make.left.equalTo(audioImageView.snp_right)
+                make.left.equalTo(audioImageView.snp.right)
                 make.right.equalToSuperview().offset(-margin)
                 make.centerY.equalToSuperview()
             }

+ 3 - 3
BFFramework/Classes/Stuckpoint/View/PQStuckPointSearchEmptyCell.swift

@@ -88,7 +88,7 @@ class PQStuckPointSearchEmptyCell: UICollectionViewCell {
             make.top.equalToSuperview().offset(imageH)
         }
         remindLab.snp.makeConstraints { make in
-            make.top.equalTo(emptyImageView.snp_bottom).offset(margin)
+            make.top.equalTo(emptyImageView.snp.bottom).offset(margin)
             make.centerX.equalToSuperview()
         }
         hotRemindLab.snp.makeConstraints { make in
@@ -100,13 +100,13 @@ class PQStuckPointSearchEmptyCell: UICollectionViewCell {
             make.left.equalToSuperview().offset(leftMargin)
             make.height.equalTo(1)
             make.centerY.equalTo(hotRemindLab)
-            make.right.equalTo(hotRemindLab.snp_left).offset(-leftMargin)
+            make.right.equalTo(hotRemindLab.snp.left).offset(-leftMargin)
         }
         rightLineView.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(-leftMargin)
             make.height.equalTo(1)
             make.centerY.equalTo(hotRemindLab)
-            make.left.equalTo(hotRemindLab.snp_right).offset(leftMargin)
+            make.left.equalTo(hotRemindLab.snp.right).offset(leftMargin)
         }
     }