Ver Fonte

1.fix swift 16.0

wenweiwei há 2 anos atrás
pai
commit
81d41e62a4

+ 1 - 1
BFStuckPointKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'BFStuckPointKit'
-  s.version          = '0.1.1'
+  s.version          = '0.1.2'
   s.summary          = '卡点视频库'
   s.swift_version    = '5.0'
   s.description      = <<-DESC

+ 5 - 2
BFStuckPointKit/Classes/Controller/PQStuckPointEditerController.swift

@@ -503,8 +503,11 @@ class PQStuckPointEditerController: BFBaseViewController {
 
     /// 音乐歌曲名称
     lazy var musicNameLab: LMJHorizontalScrollText = {
-        let nameWidth: CGFloat = sizeWithText(text: "\(stuckPointMusicData?.musicName ?? "")", font: UIFont.systemFont(ofSize: 13), size: CGSize(width: view.frame.width - ((cDefaultMargin * 6 + 16 * 2) * 2) - (25 + cDefaultMargin * 3), height: cDefaultMargin * 3)).width
-        let musicNameLab = LMJHorizontalScrollText(frame: CGRect(x: 0, y: 0, width: nameWidth < cDefaultMargin * 4 ? cDefaultMargin * 4 : nameWidth, height: cDefaultMargin * 3))
+        let maxW : CGFloat = ((cDefaultMargin * 6 + 16 * 2) * 2) + (25 + cDefaultMargin * 3)
+        let size : CGSize = CGSize(width: view.frame.width - maxW, height: cDefaultMargin * 3)
+        var nameWidth: CGFloat = sizeWithText(text: "\(stuckPointMusicData?.musicName ?? "")", font: UIFont.systemFont(ofSize: 13), size: size).width
+        nameWidth = nameWidth < cDefaultMargin * 4 ? cDefaultMargin * 4 : nameWidth
+        let musicNameLab = LMJHorizontalScrollText(frame: CGRect(x: 0, y: 0, width: nameWidth , height: cDefaultMargin * 3))
         musicNameLab.textColor = BFConfig.shared.styleTitleColor
         musicNameLab.textFont = UIFont.systemFont(ofSize: 13)
         musicNameLab.speed = 0.03