Browse Source

1.修改部分bugs

wenweiwei 3 năm trước cách đây
mục cha
commit
617e4c9a28

+ 6 - 2
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicController.swift

@@ -108,7 +108,7 @@ class PQStuckPointMusicController: PQBaseViewController {
     lazy var topCategoryController: PQStuckPointMusicContentController = {
         let topCategoryController = PQStuckPointMusicContentController()
         addChild(topCategoryController)
-        view.addSubview(topCategoryController.view)
+        view.insertSubview(topCategoryController.view, belowSubview: searchController.view)
         topCategoryController.updateViewFrame(newFrame: CGRect(x: 0, y: searchTF.frame.maxY + cDefaultMargin * 2, width: cDefaultMargin * 12, height: view.frame.height - (searchTF.frame.maxY + cDefaultMargin * 2)))
         // 一级分类点击
         topCategoryController.didSelectedHandle = { [weak self] _, _, _, itemData in
@@ -130,7 +130,7 @@ class PQStuckPointMusicController: PQBaseViewController {
         let musicPageController = PQStuckPointMusicContentController()
         musicPageController.cellHight = cDefaultMargin * 8
         addChild(musicPageController)
-        view.addSubview(musicPageController.view)
+        view.insertSubview(musicPageController.view, belowSubview: searchController.view)
         musicPageController.updateViewFrame(newFrame: CGRect(x: topCategoryController.view.frame.maxX, y: topCategoryController.view.frame.minY, width: view.frame.width - topCategoryController.view.frame.maxX, height: topCategoryController.view.frame.height))
         musicPageController.contentType = .page
         musicPageController.didSelectedHandle = { [weak self] isTagsClick, _, _, itemData in
@@ -220,6 +220,10 @@ class PQStuckPointMusicController: PQBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        // 拦截侧滑返回
+        disablePopGesture().popGestureHandle = { [weak self] in
+            self?.backBtnClick()
+        }
         leftButton(image: "icon_detail_back", tintColor: PQBFConfig.shared.styleTitleColor)
         setTitle(title: "选择音乐主题", color: PQBFConfig.shared.styleTitleColor)
         view.addSubview(searchTF)

+ 4 - 1
BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicContentCell.swift

@@ -159,7 +159,10 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
         let imageW: CGFloat = bgmData is PQVoiceModel ? 55 : 22
         if bgmData is PQVoiceModel {
             var nameW: CGFloat = sizeWithText(text: (bgmData as? PQVoiceModel)?.musicName ?? "", font: UIFont.systemFont(ofSize: 16), size: CGSize(width: frame.width - leftmargin - imageW - margin * 2, height: cDefaultMargin * 3)).width
-            if nameW < cDefaultMargin * 6 {
+            if nameW < cDefaultMargin * 3 {
+                musicNameLab.text = "\((bgmData as? PQVoiceModel)?.musicName ?? "")              "
+                nameW = cDefaultMargin * 6
+            } else if nameW < cDefaultMargin * 6 {
                 musicNameLab.text = "\((bgmData as? PQVoiceModel)?.musicName ?? "")        "
                 nameW = cDefaultMargin * 6
             } else {