修复了snapkit警告

RainbowPlanet/RainbowPlanet/Manager/AliyunVodManager/AliyunVodUpToyoPublishManager/PublishUploadProgressView.swift

@@ -54,18 +54,18 @@ class PublishUploadProgressView: FWPopupView {
             make.size.equalTo(44)
         }
         progressLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(imageView.snp_right).offset(10)
+            make.left.equalTo(imageView.snp.right).offset(10)
             make.top.equalTo(14)
             make.height.equalTo(20)
         }
         progressView.snp.makeConstraints { (make) in
-            make.top.equalTo(progressLabel.snp_bottom).offset(10)
-            make.left.equalTo(imageView.snp_right).offset(10)
+            make.top.equalTo(progressLabel.snp.bottom).offset(10)
+            make.left.equalTo(imageView.snp.right).offset(10)
             make.right.equalTo(-15)
             make.height.equalTo(4)
         }
         failedLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(imageView.snp_right).offset(10)
+            make.left.equalTo(imageView.snp.right).offset(10)
             make.centerY.equalToSuperview()
             make.height.equalTo(20)
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Action/CardContentActionTableViewCell.swift

@@ -61,7 +61,7 @@ class CardContentActionTableViewCell: UITableViewCell {
         }
         collectButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.right.equalTo(shareButton.snp_left).offset(-17)
+            make.right.equalTo(shareButton.snp.left).offset(-17)
             make.size.equalTo(22)
         }
         collectAnimationView.snp.makeConstraints { (make) in
@@ -69,7 +69,7 @@ class CardContentActionTableViewCell: UITableViewCell {
         }
         praiseButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.right.equalTo(collectButton.snp_left).offset(-21)
+            make.right.equalTo(collectButton.snp.left).offset(-21)
         }
         praiseButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 7)
         praiseAnimationView.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Comment/CardContentCommnetTableViewCell.swift

@@ -46,15 +46,15 @@ class CardContentCommnetTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        avatarButton.snp_makeConstraints { (make) in
+        avatarButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(14)
             make.size.equalTo(28)
         }
-        addCommnetButton.snp_makeConstraints { (make) in
+        addCommnetButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarButton)
             make.height.equalTo(avatarButton)
-            make.left.equalTo(avatarButton.snp_right).offset(10)
+            make.left.equalTo(avatarButton.snp.right).offset(10)
             make.right.equalTo(-14)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListContentTableViewCell.swift

@@ -44,7 +44,7 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        commentLabel.snp_makeConstraints { (make) in
+        commentLabel.snp.makeConstraints { (make) in
             make.top.equalToSuperview()
             make.left.equalTo(14)
             make.right.equalTo(likeButton.snp.left).offset(-10)
@@ -164,11 +164,11 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
             }else {
                 likeButton.isSelected = false
             }
-            likeCountLabel.snp_remakeConstraints { (make) in
+            likeCountLabel.snp.remakeConstraints { (make) in
                 make.top.equalTo(0)
                 make.right.equalTo(-14)
             }
-            likeButton.snp_remakeConstraints { (make) in
+            likeButton.snp.remakeConstraints { (make) in
                 make.right.equalTo(likeCountLabel.snp.left).offset(-5)
                 make.centerY.equalTo(likeCountLabel)
                 make.size.equalTo(20)
@@ -176,7 +176,7 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
             
             let likeCountWidth =  likeCount.widthForComment(font: kRegularFont14!, height: 25.5)
             
-            commentLabel.snp_remakeConstraints { (make) in
+            commentLabel.snp.remakeConstraints { (make) in
                 make.top.equalToSuperview()
                 make.left.equalTo(14)
                 make.width.equalTo(kScreenWidth-28-10-16-5-likeCountWidth)
@@ -206,17 +206,17 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
             }else {
                 likeButton.isSelected = false
             }
-            likeCountLabel.snp_remakeConstraints { (make) in
+            likeCountLabel.snp.remakeConstraints { (make) in
                 make.top.equalTo(0)
                 make.right.equalTo(-14)
             }
-            likeButton.snp_remakeConstraints { (make) in
+            likeButton.snp.remakeConstraints { (make) in
                 make.right.equalTo(likeCountLabel.snp.left).offset(-5)
                 make.centerY.equalTo(likeCountLabel)
                 make.size.equalTo(20)
             }
             let likeCountWidth =  likeCount.widthForComment(font: kRegularFont14!, height: 25.5)
-            commentLabel.snp_remakeConstraints { (make) in
+            commentLabel.snp.remakeConstraints { (make) in
                 make.top.equalToSuperview()
                 make.left.equalTo(14)
                 make.width.equalTo(kScreenWidth-28-10-16-5-likeCountWidth)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListFooterView.swift

@@ -18,7 +18,7 @@ class CardContentCommentListFooterView: BaseView {
     }
     
     override func setupLayouts() {
-        allCommentLabel.snp_makeConstraints { (make) in
+        allCommentLabel.snp.makeConstraints { (make) in
             make.top.equalToSuperview().offset(9)
             make.left.equalTo(14)
             make.right.equalTo(-14)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListTableViewCell.swift

@@ -45,7 +45,7 @@ class CardContentCommentListTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        tableView.snp_makeConstraints { (make) in
+        tableView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoCollectionViewCell.swift

@@ -44,10 +44,10 @@ class CardContentPicVideoCollectionViewCell: UICollectionViewCell {
     }
     
     private func setupLayouts() {
-        iconImageView.snp_makeConstraints { (make) in
+        iconImageView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
         }
-        pauseImageView.snp_makeConstraints { (make) in
+        pauseImageView.snp.makeConstraints { (make) in
             make.center.equalToSuperview()
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoTableViewCell.swift

@@ -138,7 +138,7 @@ class CardContentPicVideoTableViewCell: UITableViewCell {
         didSet {
             collectionViewLayout.cardContentPicVideoModel = cardContentPicVideoModel
             addSubview(collectionView)
-            collectionView.snp_makeConstraints { (make) in
+            collectionView.snp.makeConstraints { (make) in
                 make.top.equalToSuperview()
                 make.left.equalTo(14)
                 make.right.equalTo(-14)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/TitleContent/CardContentTitleTableViewCell.swift

@@ -49,15 +49,15 @@ class CardContentTitleTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        titleLabel.snp_remakeConstraints { (make) in
+        titleLabel.snp.remakeConstraints { (make) in
             make.top.equalToSuperview()
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(22)
         }
         
-        subtitleLabel.snp_remakeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(10)
+        subtitleLabel.snp.remakeConstraints { (make) in
+            make.top.equalTo(titleLabel.snp.bottom).offset(10)
             make.bottom.equalToSuperview()
             make.left.equalTo(14)
             make.right.equalTo(-14)
@@ -121,7 +121,7 @@ class CardContentTitleTableViewCell: UITableViewCell {
                 }else {
                     subtitleLabel.isHidden = true
                 }
-                subtitleLabel.snp_remakeConstraints { (make) in
+                subtitleLabel.snp.remakeConstraints { (make) in
                     make.top.bottom.equalToSuperview()
                     make.left.equalTo(14)
                     make.right.equalTo(-14)
@@ -137,7 +137,7 @@ class CardContentTitleTableViewCell: UITableViewCell {
                     subtitleLabel.isHidden = true
                 }
                
-                subtitleLabel.snp_remakeConstraints { (make) in
+                subtitleLabel.snp.remakeConstraints { (make) in
                     make.top.bottom.equalToSuperview()
                     make.left.equalTo(14)
                     make.right.equalTo(-14)
@@ -157,22 +157,22 @@ class CardContentTitleTableViewCell: UITableViewCell {
                         let attr = NSMutableAttributedString.init(string: str)
                         subtitleLabel.attributedText = attr
                     }
-                    titleLabel.snp_remakeConstraints { (make) in
+                    titleLabel.snp.remakeConstraints { (make) in
                         make.top.equalToSuperview()
                         make.left.equalTo(14)
                         make.right.equalTo(-14)
                         make.height.equalTo(22)
                     }
                     
-                    subtitleLabel.snp_remakeConstraints { (make) in
-                        make.top.equalTo(titleLabel.snp_bottom).offset(10)
+                    subtitleLabel.snp.remakeConstraints { (make) in
+                        make.top.equalTo(titleLabel.snp.bottom).offset(10)
                         make.bottom.equalToSuperview()
                         make.left.equalTo(14)
                         make.right.equalTo(-14)
                     }
                 }else {
                     subtitleLabel.isHidden = true
-                    titleLabel.snp_remakeConstraints { (make) in
+                    titleLabel.snp.remakeConstraints { (make) in
                         make.top.bottom.equalToSuperview()
                         make.left.equalTo(14)
                         make.right.equalTo(-14)
@@ -186,21 +186,21 @@ class CardContentTitleTableViewCell: UITableViewCell {
                 if PostType(rawValue: communityRecommendDataModel?.type ?? "image") != .html {
                     subtitleLabel.text = str
                     subtitleLabel.isHidden = false
-                    titleLabel.snp_remakeConstraints { (make) in
+                    titleLabel.snp.remakeConstraints { (make) in
                         make.top.equalToSuperview()
                         make.leading.equalTo(14)
                         make.trailing.equalTo(-14)
                         make.height.equalTo(22)
                     }
-                    subtitleLabel.snp_remakeConstraints { (make) in
-                        make.top.equalTo(titleLabel.snp_bottom).offset(10)
+                    subtitleLabel.snp.remakeConstraints { (make) in
+                        make.top.equalTo(titleLabel.snp.bottom).offset(10)
                         make.bottom.equalToSuperview()
                         make.leading.equalTo(14)
                         make.trailing.equalTo(-14)
                     }
                 }else {
                     subtitleLabel.isHidden = true
-                    titleLabel.snp_remakeConstraints { (make) in
+                    titleLabel.snp.remakeConstraints { (make) in
                         make.top.bottom.equalToSuperview()
                         make.left.equalTo(14)
                         make.right.equalTo(-14)
@@ -254,7 +254,7 @@ class CardContentTitleTableViewCell: UITableViewCell {
                 }else {
                     subtitleLabel.isHidden = true
                 }
-                subtitleLabel.snp_remakeConstraints { (make) in
+                subtitleLabel.snp.remakeConstraints { (make) in
                     make.top.bottom.equalToSuperview()
                     make.left.equalTo(14)
                     make.right.equalTo(-14)
@@ -270,7 +270,7 @@ class CardContentTitleTableViewCell: UITableViewCell {
                     subtitleLabel.isHidden = true
                 }
                 
-                subtitleLabel.snp_remakeConstraints { (make) in
+                subtitleLabel.snp.remakeConstraints { (make) in
                     make.top.bottom.equalToSuperview()
                     make.left.equalTo(14)
                     make.right.equalTo(-14)
@@ -290,22 +290,22 @@ class CardContentTitleTableViewCell: UITableViewCell {
                         let attr = NSMutableAttributedString.init(string: str)
                         subtitleLabel.attributedText = attr
                     }
-                    titleLabel.snp_remakeConstraints { (make) in
+                    titleLabel.snp.remakeConstraints { (make) in
                         make.top.equalToSuperview()
                         make.left.equalTo(14)
                         make.right.equalTo(-14)
                         make.height.equalTo(22)
                     }
                     
-                    subtitleLabel.snp_remakeConstraints { (make) in
-                        make.top.equalTo(titleLabel.snp_bottom).offset(10)
+                    subtitleLabel.snp.remakeConstraints { (make) in
+                        make.top.equalTo(titleLabel.snp.bottom).offset(10)
                         make.bottom.equalToSuperview()
                         make.left.equalTo(14)
                         make.right.equalTo(-14)
                     }
                 }else {
                     subtitleLabel.isHidden = true
-                    titleLabel.snp_remakeConstraints { (make) in
+                    titleLabel.snp.remakeConstraints { (make) in
                         make.top.bottom.equalToSuperview()
                         make.left.equalTo(14)
                         make.right.equalTo(-14)
@@ -319,21 +319,21 @@ class CardContentTitleTableViewCell: UITableViewCell {
                 if PostType(rawValue: communityFollowDataModel?.relateData?.type ?? "image") != .html {
                     subtitleLabel.text = str
                     subtitleLabel.isHidden = false
-                    titleLabel.snp_remakeConstraints { (make) in
+                    titleLabel.snp.remakeConstraints { (make) in
                         make.top.equalToSuperview()
                         make.leading.equalTo(14)
                         make.trailing.equalTo(-14)
                         make.height.equalTo(22)
                     }
-                    subtitleLabel.snp_remakeConstraints { (make) in
-                        make.top.equalTo(titleLabel.snp_bottom).offset(10)
+                    subtitleLabel.snp.remakeConstraints { (make) in
+                        make.top.equalTo(titleLabel.snp.bottom).offset(10)
                         make.bottom.equalToSuperview()
                         make.leading.equalTo(14)
                         make.trailing.equalTo(-14)
                     }
                 }else {
                     subtitleLabel.isHidden = true
-                    titleLabel.snp_remakeConstraints { (make) in
+                    titleLabel.snp.remakeConstraints { (make) in
                         make.top.bottom.equalToSuperview()
                         make.left.equalTo(14)
                         make.right.equalTo(-14)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift

@@ -56,32 +56,32 @@ class CardContentUserTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        avatarButton.snp_makeConstraints { (make) in
+        avatarButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.size.equalTo(40)
             make.left.equalTo(14)
         }
-        titleButton.snp_makeConstraints { (make) in
+        titleButton.snp.makeConstraints { (make) in
             make.top.equalTo(avatarButton).offset(2)
             make.height.equalTo(21)
-            make.left.equalTo(avatarButton.snp_right).offset(16)
-            make.right.equalTo(setButton.snp_left).offset(-80)
+            make.left.equalTo(avatarButton.snp.right).offset(16)
+            make.right.equalTo(setButton.snp.left).offset(-80)
         }
-        timeLabel.snp_makeConstraints { (make) in
+        timeLabel.snp.makeConstraints { (make) in
             make.bottom.equalTo(avatarButton).offset(4)
             make.left.equalTo(titleButton)
 
         }
-        setButton.snp_makeConstraints { (make) in
+        setButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.size.equalTo(22)
             make.right.equalTo(-14)
         }
-        followButton.snp_makeConstraints { (make) in
+        followButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.height.equalTo(28)
             make.width.equalTo(60)
-            make.right.equalTo(setButton.snp_left).offset(-11)
+            make.right.equalTo(setButton.snp.left).offset(-11)
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FeaturedTopics/FeaturedTopicsCollectionViewCell.swift

@@ -43,22 +43,22 @@ class FeaturedTopicsCollectionViewCell: UICollectionViewCell {
     }
     
     private func setupLayouts() {
-        picImageView.snp_makeConstraints { (make) in
+        picImageView.snp.makeConstraints { (make) in
             make.top.left.right.equalToSuperview()
             make.height.equalTo(130)
         }
-        iconImageView.snp_makeConstraints { (make) in
+        iconImageView.snp.makeConstraints { (make) in
             make.left.equalToSuperview()
-            make.top.equalTo(picImageView.snp_bottom).offset(10)
+            make.top.equalTo(picImageView.snp.bottom).offset(10)
             make.size.equalTo(20)
         }
-        topicLabel.snp_makeConstraints { (make) in
+        topicLabel.snp.makeConstraints { (make) in
             make.centerY.equalTo(iconImageView)
-            make.left.equalTo(iconImageView.snp_right).offset(2)
-            make.right.lessThanOrEqualTo(numberPeopleLable.snp_left).offset(-10)
+            make.left.equalTo(iconImageView.snp.right).offset(2)
+            make.right.lessThanOrEqualTo(numberPeopleLable.snp.left).offset(-10)
             make.height.equalTo(23)
         }
-        numberPeopleLable.snp_makeConstraints { (make) in
+        numberPeopleLable.snp.makeConstraints { (make) in
             make.centerY.equalTo(iconImageView)
             make.right.equalToSuperview()
             make.height.equalTo(23)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FeaturedTopics/FeaturedTopicsTableViewCell.swift

@@ -41,7 +41,7 @@ class FeaturedTopicsTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        collectionView.snp_makeConstraints { (make) in
+        collectionView.snp.makeConstraints { (make) in
             make.top.left.right.bottom.equalToSuperview()
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FollowStatus/CommunityFollowStatusTableViewCell.swift

@@ -66,82 +66,82 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        avatarButton.snp_makeConstraints { (make) in
+        avatarButton.snp.makeConstraints { (make) in
             make.top.equalTo(27)
             make.left.equalTo(14)
             make.size.equalTo(28)
         }
-        titleButton.snp_makeConstraints { (make) in
+        titleButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarButton)
-            make.left.equalTo(avatarButton.snp_right).offset(7)
+            make.left.equalTo(avatarButton.snp.right).offset(7)
         }
-        timeStatusLabel.snp_makeConstraints { (make) in
+        timeStatusLabel.snp.makeConstraints { (make) in
             make.centerY.equalTo(titleButton)
-            make.left.equalTo(titleButton.snp_right).offset(10)
+            make.left.equalTo(titleButton.snp.right).offset(10)
         }
         
-        oneCardView.snp_makeConstraints { (make) in
-            make.top.equalTo(avatarButton.snp_bottom).offset(10)
+        oneCardView.snp.makeConstraints { (make) in
+            make.top.equalTo(avatarButton.snp.bottom).offset(10)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(64)
         }
         
-        avatarOtherButton.snp_makeConstraints { (make) in
+        avatarOtherButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(15)
             make.size.equalTo(40)
         }
         
-        titleOtherButton.snp_makeConstraints { (make) in
+        titleOtherButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarOtherButton)
-            make.left.equalTo(avatarOtherButton.snp_right).offset(16)
+            make.left.equalTo(avatarOtherButton.snp.right).offset(16)
             make.right.equalTo(followButton.snp.left).offset(-5)
         }
         
-        followButton.snp_makeConstraints { (make) in
+        followButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarOtherButton)
             make.right.equalToSuperview().offset(-15)
             make.height.equalTo(28)
             make.width.equalTo(60)
         }
         
-        twoCardView.snp_makeConstraints { (make) in
-            make.top.equalTo(avatarButton.snp_bottom).offset(10)
+        twoCardView.snp.makeConstraints { (make) in
+            make.top.equalTo(avatarButton.snp.bottom).offset(10)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(70)
         }
         
-        twoTitleLabel.snp_makeConstraints { (make) in
+        twoTitleLabel.snp.makeConstraints { (make) in
             make.top.left.equalTo(15)
             make.right.equalTo(-45)
             make.height.equalTo(16)
         }
-        twoSubtitleLabel.snp_makeConstraints { (make) in
+        twoSubtitleLabel.snp.makeConstraints { (make) in
             make.bottom.equalTo(-15)
             make.left.equalTo(15)
             make.right.equalTo(-37)
             make.height.equalTo(14)
         }
-        twoGoImageView.snp_makeConstraints { (make) in
+        twoGoImageView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalTo(-15)
         }
         
-        threeCardView.snp_makeConstraints { (make) in
-            make.top.equalTo(avatarButton.snp_bottom).offset(10)
+        threeCardView.snp.makeConstraints { (make) in
+            make.top.equalTo(avatarButton.snp.bottom).offset(10)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(60)
         }
         
-        threeTitleLabel.snp_makeConstraints { (make) in
+        threeTitleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(15)
             make.right.equalTo(-45)
         }
-        threeGoImageView.snp_makeConstraints { (make) in
+        threeGoImageView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalTo(-15)
         }
@@ -351,13 +351,13 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 }else {
                     skittlesImageView.isHidden = false
                     skittlesTitleLabel.isHidden = false
-                    skittlesImageView.snp_remakeConstraints { (make) in
+                    skittlesImageView.snp.remakeConstraints { (make) in
                         make.left.equalTo(15)
-                        make.top.equalTo(twoCardView.snp_bottom).offset(12)
+                        make.top.equalTo(twoCardView.snp.bottom).offset(12)
                         make.size.equalTo(16)
                     }
-                    skittlesTitleLabel.snp_remakeConstraints { (make) in
-                        make.left.equalTo(skittlesImageView.snp_right).offset(2)
+                    skittlesTitleLabel.snp.remakeConstraints { (make) in
+                        make.left.equalTo(skittlesImageView.snp.right).offset(2)
                         make.top.equalTo(skittlesImageView)
                     }
                 }
@@ -377,13 +377,13 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 }else {
                     skittlesImageView.isHidden = false
                     skittlesTitleLabel.isHidden = false
-                    skittlesImageView.snp_remakeConstraints { (make) in
+                    skittlesImageView.snp.remakeConstraints { (make) in
                         make.left.equalTo(15)
-                        make.top.equalTo(twoCardView.snp_bottom).offset(12)
+                        make.top.equalTo(twoCardView.snp.bottom).offset(12)
                         make.size.equalTo(16)
                     }
-                    skittlesTitleLabel.snp_remakeConstraints { (make) in
-                        make.left.equalTo(skittlesImageView.snp_right).offset(2)
+                    skittlesTitleLabel.snp.remakeConstraints { (make) in
+                        make.left.equalTo(skittlesImageView.snp.right).offset(2)
                         make.top.equalTo(skittlesImageView)
                     }
                 }
@@ -402,13 +402,13 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 }else {
                     skittlesImageView.isHidden = false
                     skittlesTitleLabel.isHidden = false
-                    skittlesImageView.snp_remakeConstraints { (make) in
+                    skittlesImageView.snp.remakeConstraints { (make) in
                         make.left.equalTo(15)
-                        make.top.equalTo(twoCardView.snp_bottom).offset(12)
+                        make.top.equalTo(twoCardView.snp.bottom).offset(12)
                         make.size.equalTo(16)
                     }
-                    skittlesTitleLabel.snp_remakeConstraints { (make) in
-                        make.left.equalTo(skittlesImageView.snp_right).offset(2)
+                    skittlesTitleLabel.snp.remakeConstraints { (make) in
+                        make.left.equalTo(skittlesImageView.snp.right).offset(2)
                         make.top.equalTo(skittlesImageView)
                     }
                 }
@@ -427,13 +427,13 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 }else {
                     skittlesImageView.isHidden = false
                     skittlesTitleLabel.isHidden = false
-                    skittlesImageView.snp_remakeConstraints { (make) in
+                    skittlesImageView.snp.remakeConstraints { (make) in
                         make.left.equalTo(15)
-                        make.top.equalTo(twoCardView.snp_bottom).offset(12)
+                        make.top.equalTo(twoCardView.snp.bottom).offset(12)
                         make.size.equalTo(16)
                     }
-                    skittlesTitleLabel.snp_remakeConstraints { (make) in
-                        make.left.equalTo(skittlesImageView.snp_right).offset(2)
+                    skittlesTitleLabel.snp.remakeConstraints { (make) in
+                        make.left.equalTo(skittlesImageView.snp.right).offset(2)
                         make.top.equalTo(skittlesImageView)
                     }
                 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/PopularVideo/PopularVideoCollectionViewCell.swift

@@ -42,16 +42,16 @@ class PopularVideoCollectionViewCell: UICollectionViewCell {
     }
     
     private func setupLayouts() {
-        picImageView.snp_makeConstraints { (make) in
+        picImageView.snp.makeConstraints { (make) in
             make.top.left.right.bottom.equalToSuperview()
         }
-        avatarImageView.snp_makeConstraints { (make) in
+        avatarImageView.snp.makeConstraints { (make) in
             make.centerX.equalToSuperview()
             make.top.equalTo(136)
             make.size.equalTo(54)
         }
-        nameLabel.snp_makeConstraints { (make) in
-            make.top.equalTo(avatarImageView.snp_bottom).offset(10)
+        nameLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(avatarImageView.snp.bottom).offset(10)
             make.height.equalTo(17)
             make.left.equalTo(5)
             make.right.equalTo(-5)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/PopularVideo/PopularVideoTableViewCell.swift

@@ -40,7 +40,7 @@ class PopularVideoTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        collectionView.snp_makeConstraints { (make) in
+        collectionView.snp.makeConstraints { (make) in
             make.top.left.right.bottom.equalToSuperview()
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/RecommendFollow/CommunityRecommendFollowCollectionViewCell.swift

@@ -53,27 +53,27 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     }
     
     private func setupLayouts() {
-        avatarButton.snp_makeConstraints { (make) in
+        avatarButton.snp.makeConstraints { (make) in
             make.top.equalTo(16)
             make.centerX.equalToSuperview()
             make.size.equalTo(60)
         }
-        titleButton.snp_makeConstraints { (make) in
-            make.top.equalTo(avatarButton.snp_bottom).offset(12)
+        titleButton.snp.makeConstraints { (make) in
+            make.top.equalTo(avatarButton.snp.bottom).offset(12)
             make.left.equalTo(10)
             make.right.equalTo(-10)
             make.height.equalTo(23)
         }
         
-        topicLabel.snp_makeConstraints { (make) in
-            make.top.equalTo(titleButton.snp_bottom).offset(4)
+        topicLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(titleButton.snp.bottom).offset(4)
             make.left.equalTo(10)
             make.right.equalTo(-10)
             make.height.equalTo(19)
         }
         
-        followButton.snp_makeConstraints { (make) in
-            make.top.equalTo(topicLabel.snp_bottom).offset(16)
+        followButton.snp.makeConstraints { (make) in
+            make.top.equalTo(topicLabel.snp.bottom).offset(16)
             make.centerX.equalToSuperview()
             make.height.equalTo(28)
             make.width.equalTo(60)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -82,14 +82,14 @@ class CommunityNavigationBarView: BaseView {
             }else {
                 self?.scrollNumberLabel?.isHidden  = false
                 self?.scrollNumberLabel?.change(to: totalBeanModel?.todayBean as NSNumber?, animated: true)
-                self?.scrollNumberLabel!.snp_remakeConstraints { (make) in
+                self?.scrollNumberLabel!.snp.remakeConstraints { (make) in
                     make.centerY.equalToSuperview()
                     make.size.equalTo((self?.scrollNumberLabel!.frame.size)!)
                     make.right.equalToSuperview().offset(-14)
                 }
                 self?.rightButton.snp.remakeConstraints { (make) in
                     make.centerY.equalToSuperview()
-                    make.right.equalTo((self?.scrollNumberLabel!.snp_left)!).offset(-2)
+                    make.right.equalTo((self?.scrollNumberLabel!.snp.left)!).offset(-2)
                     make.size.equalTo(25)
 
                 }
@@ -111,12 +111,12 @@ class CommunityNavigationBarView: BaseView {
             if UserModel.isTokenNil() {
                 make.right.equalTo(-14)
             }else {
-                make.right.equalTo(scrollNumberLabel!.snp_left).offset(-2)
+                make.right.equalTo(scrollNumberLabel!.snp.left).offset(-2)
             }
             make.size.equalTo(25)
         }
         
-        scrollNumberLabel!.snp_makeConstraints { (make) in
+        scrollNumberLabel!.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.size.equalTo(scrollNumberLabel!.frame.size)
             make.right.equalToSuperview().offset(-14)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Header/CommunityCommonSectionHeaderView.swift

@@ -29,7 +29,7 @@ class CommunityCommonSectionHeaderView: BaseView {
     }
     
     override func setupLayouts() {
-        titleLabel.snp_makeConstraints { (make) in
+        titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(14)
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Header/CommunityFollowTableHeaderView.swift

@@ -18,20 +18,20 @@ class CommunityFollowTableHeaderView: BaseView {
     }
     
     override func setupLayouts() {
-        bgView.snp_makeConstraints { (make) in
+        bgView.snp.makeConstraints { (make) in
             make.top.equalTo(12)
             make.left.right.bottom.equalToSuperview()
         }
-        iconImageView.snp_makeConstraints { (make) in
+        iconImageView.snp.makeConstraints { (make) in
             make.top.equalTo(20)
             make.centerX.equalToSuperview()
         }
-        infoLabel.snp_makeConstraints { (make) in
-            make.top.equalTo(iconImageView.snp_bottom).offset(5)
+        infoLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(iconImageView.snp.bottom).offset(5)
             make.left.right.equalToSuperview()
         }
-        findFriendsButton.snp_makeConstraints { (make) in
-            make.top.equalTo(infoLabel.snp_bottom).offset(15)
+        findFriendsButton.snp.makeConstraints { (make) in
+            make.top.equalTo(infoLabel.snp.bottom).offset(15)
             make.centerX.equalToSuperview()
             make.height.equalTo(34)
             make.width.equalTo(100)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/View/CommunityFeaturedTopicsHeaderView.swift

@@ -19,19 +19,19 @@ class CommunityFeaturedTopicsHeaderView: BaseView {
     }
     
     override func setupLayouts() {
-        numberPeopleLabel.snp_makeConstraints { (make) in
+        numberPeopleLabel.snp.makeConstraints { (make) in
             make.top.equalTo(92+kSafeStatusBarHeight)
             make.left.equalTo(14)
             make.height.equalTo(19)
             make.right.equalTo(-14)
         }
-        topicLabel.snp_makeConstraints { (make) in
-            make.top.equalTo(numberPeopleLabel.snp_bottom).offset(8)
+        topicLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(numberPeopleLabel.snp.bottom).offset(8)
             make.left.equalTo(14)
-            make.right.lessThanOrEqualTo(focusButton.snp_left).offset(-5)
+            make.right.lessThanOrEqualTo(focusButton.snp.left).offset(-5)
             make.height.equalTo(33)
         }
-        focusButton.snp_makeConstraints { (make) in
+        focusButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(topicLabel)
             make.right.equalTo(-14)
             make.height.equalTo(28)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -73,7 +73,7 @@ class CommunityFeaturedTopicsViewController: BaseViewController {
     }
     
     override func setupLayouts() {
-        bgImageView.snp_makeConstraints { (make) in
+        bgImageView.snp.makeConstraints { (make) in
             make.top.left.right.equalToSuperview()
             make.height.equalTo(kScreenWidth)
         }
@@ -84,14 +84,14 @@ class CommunityFeaturedTopicsViewController: BaseViewController {
         tableView.snp.makeConstraints { (make) in
             make.top.left.right.bottom.equalToSuperview()
         }
-        navigationBgView.snp_makeConstraints { (make) in
+        navigationBgView.snp.makeConstraints { (make) in
             make.edges.equalTo(navigationBar)
         }
-        topicLable.snp_makeConstraints { (make) in
+        topicLable.snp.makeConstraints { (make) in
             make.centerY.equalTo(navigationBar.leftButton)
-            make.left.equalTo(navigationBar.leftButton.snp_right)
+            make.left.equalTo(navigationBar.leftButton.snp.right)
         }
-        focusButton.snp_makeConstraints { (make) in
+        focusButton.snp.makeConstraints { (make) in
             make.right.equalTo(-14)
             make.centerY.equalTo(navigationBar.leftButton)
             make.width.equalTo(60)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFindFriends/View/CommunityFindFriendsView.swift

@@ -19,18 +19,18 @@ class CommunityFindFriendsView: BaseView {
     }
     
     override func setupLayouts() {
-        bgView.snp_makeConstraints { (make) in
+        bgView.snp.makeConstraints { (make) in
             make.top.equalTo(10)
             make.left.right.bottom.equalToSuperview()
         }
-        picButton.snp_makeConstraints { (make) in
+        picButton.snp.makeConstraints { (make) in
             make.top.equalTo(20)
             make.left.equalTo(15)
             make.right.equalTo(-15)
             make.height.equalTo(100 * kScaleWidth)
         }
-        titleLabel.snp_makeConstraints { (make) in
-            make.top.equalTo(picButton.snp_bottom).offset(20)
+        titleLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(picButton.snp.bottom).offset(20)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(25)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityMyFollowTopic/View/CommunityMyFollowTopicCell.swift

@@ -62,8 +62,8 @@ class CommunityMyFollowTopicCell: UITableViewCell {
             make.height.equalTo(28)
         }
         sepView.snp.makeConstraints { (make) in
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(focusButton.snp_right)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(focusButton.snp.right)
             make.bottom.equalToSuperview()
             make.height.equalTo(1)
         }        

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -74,17 +74,17 @@ class CommunityRecommendController: BaseViewController {
         navigationBar.wr_setRightButton(image: kImage(name: "nav_share_black")!)
 
         avatarButton.snp.makeConstraints { (make) in
-            make.left.equalTo(navigationBar.leftButton.snp_right)
+            make.left.equalTo(navigationBar.leftButton.snp.right)
             make.size.equalTo(30)
             make.centerY.equalTo(navigationBar.leftButton)
         }
         nameButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarButton)
-            make.left.equalTo(avatarButton.snp_right).offset(4)
-            make.right.lessThanOrEqualTo(followButton.snp_left).offset(-10)
+            make.left.equalTo(avatarButton.snp.right).offset(4)
+            make.right.lessThanOrEqualTo(followButton.snp.left).offset(-10)
         }
-        followButton.snp_makeConstraints { (make) in
-            make.right.equalTo(navigationBar.rightButton.snp_left)
+        followButton.snp.makeConstraints { (make) in
+            make.right.equalTo(navigationBar.rightButton.snp.left)
             make.height.equalTo(24)
             make.width.equalTo(60)
             make.centerY.equalTo(navigationBar.leftButton)
@@ -96,7 +96,7 @@ class CommunityRecommendController: BaseViewController {
             make.bottom.equalToSuperview()
         }
         sharedButton.snp.makeConstraints { (make) in
-            make.bottom.equalTo(commentView.snp_top).offset(-20)
+            make.bottom.equalTo(commentView.snp.top).offset(-20)
             make.height.equalTo(99.5)
             make.width.equalTo(82)
             make.right.equalTo(-14)
@@ -362,7 +362,7 @@ extension CommunityRecommendController {
             self?.tableView.snp.remakeConstraints {[weak self] (make) in
                 make.top.equalToSuperview().offset(kNavBarTotalHeight)
                 make.left.right.equalToSuperview()
-                make.bottom.equalTo((self?.commentView.snp_top)!).offset(0)
+                make.bottom.equalTo((self?.commentView.snp.top)!).offset(0)
             }
             
             DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, imageStr: .three, detailStr: .three, btnTitleStr: .two, btnClickBlock: {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendMajorCommentCell.swift

@@ -63,21 +63,21 @@ class RecommendMajorCommentCell: UITableViewCell {
             make.size.equalTo(38)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(iconButton.snp_right).offset(10)
+            make.left.equalTo(iconButton.snp.right).offset(10)
             make.right.equalToSuperview().offset(-26)
             make.top.equalTo(iconButton)
             make.height.equalTo(17)
         }
         
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(8)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
             make.left.equalTo(titleLabel)
             make.right.equalToSuperview().offset(-14)
         }
         timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(contentLabel.snp.bottom).offset(8)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(15)
         }
         likeCountLabel.snp.makeConstraints { (make) in
@@ -90,9 +90,9 @@ class RecommendMajorCommentCell: UITableViewCell {
 
         }
         tableView.snp.remakeConstraints { (make) in
-            make.top.equalTo(timeLabel.snp_bottom).offset(10)
-            make.left.equalTo(contentLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(timeLabel.snp.bottom).offset(10)
+            make.left.equalTo(contentLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(20)
         }
     }
@@ -201,9 +201,9 @@ class RecommendMajorCommentCell: UITableViewCell {
         let contentSize = self.tableView.contentSize
         tableViewHeight = contentSize.height
         tableView.snp.remakeConstraints { (make) in
-            make.top.equalTo(timeLabel.snp_bottom).offset(10)
-            make.left.equalTo(contentLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(timeLabel.snp.bottom).offset(10)
+            make.left.equalTo(contentLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(contentSize.height)
         }
         let contentLabelHeight = communityPostCommentModel?.content?.heightForComment(font: kRegularFont14!, width: kScreenWidth - 14 - 48)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendSubCommentTableViewCell.swift

@@ -63,22 +63,22 @@ class RecommendSubCommentTableViewCell: UITableViewCell {
             make.size.equalTo(24)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(iconButton.snp_right).offset(10)
+            make.left.equalTo(iconButton.snp.right).offset(10)
             make.right.equalToSuperview().offset(-10)
             make.centerY.equalTo(iconButton)
             make.height.equalTo(17)
         }
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
+            make.left.equalTo(titleLabel.snp.left)
             make.right.equalToSuperview().offset(-10)
             make.width.equalTo(kScreenWidth-62-54)
         }
         
         timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(contentLabel.snp.bottom).offset(8)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(15)
         }
         

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/CommunityTagCollectionCell.swift

@@ -58,7 +58,7 @@ class CommunityTagCollectionCell: UICollectionViewCell {
         }
         titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalTo(iconImageView)
-            make.left.equalTo(iconImageView.snp_right).offset(5)
+            make.left.equalTo(iconImageView.snp.right).offset(5)
             make.right.equalTo(-6)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/HTMLCell/CommunityRecommendDetailHTMLTableViewCell.swift

@@ -68,7 +68,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
             make.left.equalTo(14)
         }
         avatarbgView.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(10)
+            make.top.equalTo(titleLabel.snp.bottom).offset(10)
             make.left.right.equalToSuperview()
             make.height.equalTo(44)
         }
@@ -93,8 +93,8 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
             make.left.equalTo(14)
         }
         beanLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(avatarbgView.snp_bottom).offset(5)
-            make.left.equalTo(beanImageView.snp_right).offset(5)
+            make.top.equalTo(avatarbgView.snp.bottom).offset(5)
+            make.left.equalTo(beanImageView.snp.right).offset(5)
             make.height.equalTo(16)
         }
         timeReadLabel.snp.makeConstraints { (make) in
@@ -102,20 +102,20 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
             make.left.equalTo(beanLabel.snp.right)
         }
         webView.snp.makeConstraints { (make) in
-            make.top.equalTo(beanLabel.snp_bottom).offset(20)
+            make.top.equalTo(beanLabel.snp.bottom).offset(20)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(10)
         }
         collectionView.snp.makeConstraints { (make) in
-            make.top.equalTo(webView.snp_bottom).offset(15)
+            make.top.equalTo(webView.snp.bottom).offset(15)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(10)
         }
         locationButton.snp.makeConstraints { (make) in
             make.left.equalTo(-14)
-            make.top.equalTo(collectionView.snp_bottom).offset(15)
+            make.top.equalTo(collectionView.snp.bottom).offset(15)
             make.height.equalTo(15)
         }
     }
@@ -252,7 +252,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
         self.collectionView.reloadData()
         
         webView.snp.remakeConstraints { (make) in
-            make.top.equalTo(beanLabel.snp_bottom).offset(20)
+            make.top.equalTo(beanLabel.snp.bottom).offset(20)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(webViewCellHeight ?? 0)
@@ -261,7 +261,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
         let contentSize = self.collectionView.collectionViewLayout.collectionViewContentSize
         collectionViewheight = contentSize.height
         collectionView.snp.remakeConstraints {[weak self] (make) in
-            make.top.equalTo((self?.webView.snp_bottom)!).offset(15)
+            make.top.equalTo((self?.webView.snp.bottom)!).offset(15)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(contentSize.height)
@@ -300,7 +300,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
                     make.left.equalTo(14)
                 }
                 avatarbgView.snp.makeConstraints { (make) in
-                    make.top.equalTo(titleLabel.snp_bottom).offset(10)
+                    make.top.equalTo(titleLabel.snp.bottom).offset(10)
                     make.left.right.equalToSuperview()
                     make.height.equalTo(44)
                 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendBottomCommentView.swift

@@ -38,7 +38,7 @@ class RecommendBottomCommentView: BaseView {
     }
     
     override func setupLayouts() {
-        bgView.snp_makeConstraints { (make) in
+        bgView.snp.makeConstraints { (make) in
             make.top.left.right.equalToSuperview()
             make.height.equalTo(48)
         }
@@ -50,7 +50,7 @@ class RecommendBottomCommentView: BaseView {
         commentBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
         
         collectBtn.snp.makeConstraints { (make) in
-            make.right.equalTo(commentBtn.snp_left).offset(-15)
+            make.right.equalTo(commentBtn.snp.left).offset(-15)
             make.centerY.equalToSuperview()
             make.height.equalTo(37)
         }
@@ -60,7 +60,7 @@ class RecommendBottomCommentView: BaseView {
         }
 
         likeBtn.snp.makeConstraints { (make) in
-            make.right.equalTo(collectBtn.snp_left).offset(-15)
+            make.right.equalTo(collectBtn.snp.left).offset(-15)
             make.centerY.equalToSuperview()
             make.height.equalTo(37)
         }
@@ -71,7 +71,7 @@ class RecommendBottomCommentView: BaseView {
         commentView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalToSuperview().offset(14)
-            make.right.equalTo(likeBtn.snp_left).offset(-10)
+            make.right.equalTo(likeBtn.snp.left).offset(-10)
             make.height.equalTo(28)
         }
         commentLabel.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendDefaultBackCell.swift

@@ -57,12 +57,12 @@ class RecommendDefaultBackCell: UITableViewCell {
             make.size.equalTo(120)
         }
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(backImageView.snp_bottom).offset(20)
+            make.top.equalTo(backImageView.snp.bottom).offset(20)
             make.centerX.equalToSuperview()
             make.height.equalTo(20)
         }
         jumpBtn.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(20)
+            make.top.equalTo(contentLabel.snp.bottom).offset(20)
             make.centerX.equalToSuperview()
             make.width.equalTo(180)
             make.height.equalTo(32)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendNoneCommentCell.swift

@@ -62,14 +62,14 @@ class RecommendNoneCommentCell: UITableViewCell {
             make.size.equalTo(30)
         }
         triangleView.snp.makeConstraints { (make) in
-            make.left.equalTo(iconButton.snp_right).offset(11)
-            make.centerY.equalTo(iconButton.snp_centerY)
+            make.left.equalTo(iconButton.snp.right).offset(11)
+            make.centerY.equalTo(iconButton.snp.centerY)
             make.width.equalTo(8)
             make.height.equalTo(14)
         }
         titleView.snp.makeConstraints { (make) in
-            make.left.equalTo(triangleView.snp_right)
-            make.centerY.equalTo(triangleView.snp_centerY)
+            make.left.equalTo(triangleView.snp.right)
+            make.centerY.equalTo(triangleView.snp.centerY)
             make.right.equalToSuperview().offset(-14)
             make.height.equalTo(40)
         }
@@ -79,7 +79,7 @@ class RecommendNoneCommentCell: UITableViewCell {
             make.height.equalTo(20)
         }
         commentBtn.snp.makeConstraints { (make) in
-            make.top.equalTo(titleView.snp_bottom).offset(20)
+            make.top.equalTo(titleView.snp.bottom).offset(20)
             make.centerX.equalToSuperview()
             make.width.equalTo(110)
             make.height.equalTo(34)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/imageCell/RecommendDetailContentCell.swift

@@ -63,8 +63,8 @@ class RecommendDetailContentCell: UITableViewCell {
             make.right.equalTo(-14)
         }
         rainbowBeanView.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(10)
-            make.left.equalTo(titleLabel.snp_left)
+            make.top.equalTo(titleLabel.snp.bottom).offset(10)
+            make.left.equalTo(titleLabel.snp.left)
             make.height.equalTo(24)
         }
         beanImageView.snp.makeConstraints { (make) in
@@ -73,34 +73,34 @@ class RecommendDetailContentCell: UITableViewCell {
             make.size.equalTo(19)
         }
         beanLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(beanImageView.snp_right).offset(5)
+            make.left.equalTo(beanImageView.snp.right).offset(5)
             make.centerY.equalToSuperview()
             make.height.equalTo(19)
             make.right.equalToSuperview().offset(-10)
         }
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(rainbowBeanView.snp_bottom).offset(10)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(titleLabel.snp_right)
+            make.top.equalTo(rainbowBeanView.snp.bottom).offset(10)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(titleLabel.snp.right)
         }
         collectionView.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(15)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(titleLabel.snp_right)
+            make.top.equalTo(contentLabel.snp.bottom).offset(15)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(titleLabel.snp.right)
         }
         timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(collectionView.snp_bottom).offset(15)
-            make.left.equalTo(titleLabel.snp_left)
+            make.top.equalTo(collectionView.snp.bottom).offset(15)
+            make.left.equalTo(titleLabel.snp.left)
             make.height.equalTo(15)
             make.bottom.equalToSuperview().offset(-20)
         }
         locationButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(timeLabel)
-            make.left.equalTo(timeLabel.snp_right).offset(8)
+            make.left.equalTo(timeLabel.snp.right).offset(8)
         }
         readLabel.snp.makeConstraints { (make) in
-            make.right.equalTo(titleLabel.snp_right)
-            make.centerY.equalTo(timeLabel.snp_centerY)
+            make.right.equalTo(titleLabel.snp.right)
+            make.centerY.equalTo(timeLabel.snp.centerY)
             make.height.equalTo(15)
         }
     }
@@ -201,7 +201,7 @@ class RecommendDetailContentCell: UITableViewCell {
         let contentSize = self.collectionView.collectionViewLayout.collectionViewContentSize
         collectionViewheight = contentSize.height
         collectionView.snp.remakeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(15)
+            make.top.equalTo(contentLabel.snp.bottom).offset(15)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(contentSize.height)
@@ -233,8 +233,8 @@ class RecommendDetailContentCell: UITableViewCell {
                     make.right.equalTo(-14)
                 }
                 rainbowBeanView.snp.makeConstraints { (make) in
-                    make.top.equalTo(titleLabel.snp_bottom).offset(10)
-                    make.left.equalTo(titleLabel.snp_left)
+                    make.top.equalTo(titleLabel.snp.bottom).offset(10)
+                    make.left.equalTo(titleLabel.snp.left)
                     make.height.equalTo(24)
                 }
             }else {
@@ -244,7 +244,7 @@ class RecommendDetailContentCell: UITableViewCell {
                     make.right.equalTo(-14)
                 }
                 rainbowBeanView.snp.makeConstraints { (make) in
-                    make.top.equalTo(titleLabel.snp_bottom).offset(10)
+                    make.top.equalTo(titleLabel.snp.bottom).offset(10)
                     make.left.equalTo(14)
                     make.height.equalTo(24)
                 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/View/CommunityMajorCommentCell.swift

@@ -56,21 +56,21 @@ class CommunityMajorCommentCell: UITableViewCell {
             make.size.equalTo(38)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(iconButton.snp_right).offset(10)
+            make.left.equalTo(iconButton.snp.right).offset(10)
             make.right.equalToSuperview().offset(-26)
             make.top.equalTo(iconButton)
             make.height.equalTo(17)
         }
         
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(8)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
             make.left.equalTo(titleLabel)
             make.right.equalToSuperview().offset(-14)
         }
         timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(contentLabel.snp.bottom).offset(8)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(15)
         }
         likeCountLabel.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/View/CommunityReplyCommentCell.swift

@@ -58,21 +58,21 @@ class CommunityReplyCommentCell: UITableViewCell {
             make.size.equalTo(38)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(iconButton.snp_right).offset(10)
+            make.left.equalTo(iconButton.snp.right).offset(10)
             make.right.equalToSuperview().offset(-26)
             make.top.equalTo(iconButton)
             make.height.equalTo(17)
         }
         
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(8)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
             make.left.equalTo(titleLabel)
             make.right.equalToSuperview().offset(-14)
         }
         timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(contentLabel.snp.bottom).offset(8)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(15)
         }
         likeCountLabel.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityAllCommentView.swift

@@ -77,12 +77,12 @@ class CommunityAllCommentView: FWPopupView {
         }
         
         tableView.snp.makeConstraints { (make) in
-            make.top.equalTo(topView.snp_bottom)
+            make.top.equalTo(topView.snp.bottom)
             make.left.right.equalToSuperview()
             make.bottom.equalTo(-48-kSafeTabBarHeight)
         }
         commentInputView.snp.makeConstraints { (make) in
-            make.top.equalTo(tableView.snp_bottom)
+            make.top.equalTo(tableView.snp.bottom)
             make.height.equalTo(48 + kSafeTabBarHeight)
             make.left.right.equalToSuperview()
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift

@@ -234,7 +234,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         commentBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
         
         collectBtn.snp.makeConstraints { (make) in
-            make.right.equalTo(commentBtn.snp_left).offset(-15)
+            make.right.equalTo(commentBtn.snp.left).offset(-15)
             make.centerY.equalToSuperview()
             make.height.equalTo(37)
         }
@@ -244,7 +244,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         }
         
         likeBtn.snp.makeConstraints { (make) in
-            make.right.equalTo(collectBtn.snp_left).offset(-15)
+            make.right.equalTo(collectBtn.snp.left).offset(-15)
             make.centerY.equalToSuperview()
             make.height.equalTo(37)
         }
@@ -256,7 +256,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         commentView.snp.makeConstraints { (make) in
             make.top.equalTo(16)
             make.left.equalToSuperview().offset(14)
-            make.right.equalTo(likeBtn.snp_left).offset(-10)
+            make.right.equalTo(likeBtn.snp.left).offset(-10)
             make.height.equalTo(28)
         }
         commentLabel.snp.makeConstraints { (make) in
@@ -271,14 +271,14 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         
         // 话题View
         topicView.snp.makeConstraints { (make) in
-            make.bottom.equalTo(bottomCommentView.snp_top)
+            make.bottom.equalTo(bottomCommentView.snp.top)
             make.left.right.equalToSuperview()
             make.height.equalTo(45)
         }
         
         // 视频内容
         contentScrollView.snp.makeConstraints { (make) in
-            make.bottom.equalTo(topicView.snp_top)
+            make.bottom.equalTo(topicView.snp.top)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(44)
@@ -294,26 +294,26 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         videoTitleLabel.snp.makeConstraints { (make) in
             make.left.equalTo(14)
             make.right.equalTo(-14)
-            make.bottom.equalTo(contentScrollView.snp_top).offset(-5)
+            make.bottom.equalTo(contentScrollView.snp.top).offset(-5)
         }
         
         // personView
         personBackView.snp.makeConstraints { (make) in
             make.left.equalTo(14)
             make.height.equalTo(30)
-            make.bottom.equalTo(videoTitleLabel.snp_top).offset(-titleTopSpace)
+            make.bottom.equalTo(videoTitleLabel.snp.top).offset(-titleTopSpace)
         }
         avatarButton.snp.makeConstraints { (make) in
             make.left.top.equalToSuperview()
             make.size.equalTo(30)
         }
         personLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(avatarButton.snp_right).offset(10)
+            make.left.equalTo(avatarButton.snp.right).offset(10)
             make.centerY.equalToSuperview()
             make.height.equalTo(18)
         }
         followButton.snp.makeConstraints { (make) in
-            make.left.equalTo(personLabel.snp_right).offset(10)
+            make.left.equalTo(personLabel.snp.right).offset(10)
             make.centerY.equalToSuperview()
             make.width.equalTo(54)
             make.height.equalTo(24)
@@ -324,7 +324,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         rainbowBeanView.snp.makeConstraints { (make) in
             make.left.equalTo(14)
             make.height.equalTo(24)
-            make.bottom.equalTo(personBackView.snp_top).offset(-10)
+            make.bottom.equalTo(personBackView.snp.top).offset(-10)
         }
         beanIconImageView.snp.makeConstraints { (make) in
             make.left.equalTo(6)
@@ -332,7 +332,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             make.size.equalTo(19)
         }
         beanLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(beanIconImageView.snp_right).offset(5)
+            make.left.equalTo(beanIconImageView.snp.right).offset(5)
             make.top.bottom.equalToSuperview()
             make.right.equalTo(-6)
         }
@@ -396,7 +396,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             }
             
             contentScrollView.snp.remakeConstraints { (make) in
-                make.bottom.equalTo(topicView.snp_top).offset(-40)
+                make.bottom.equalTo(topicView.snp.top).offset(-40)
                 make.left.equalTo(14)
                 make.right.equalTo(-14)
                 make.height.equalTo(scrollViewHeight!)
@@ -408,7 +408,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             }
             
             unfoldButton.snp.remakeConstraints { (make) in
-                make.bottom.equalTo(topicView.snp_top).offset(-10)
+                make.bottom.equalTo(topicView.snp.top).offset(-10)
                 make.right.equalTo(-4)
                 make.width.equalTo(48)
                 make.height.equalTo(20)
@@ -714,7 +714,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
                 self?.contentScrollView.contentSize = CGSize.init(width: kScreenWidth-28.0, height: 40)
                 
                 self?.contentScrollView.snp.remakeConstraints { (make) in
-                    make.bottom.equalTo((self?.topicView.snp_top)!)
+                    make.bottom.equalTo((self?.topicView.snp.top)!)
                     make.left.equalTo(14)
                     make.right.equalTo(-14)
                     make.height.equalTo(44)
@@ -729,7 +729,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
                 self?.contentScrollView.contentSize = CGSize.init(width: kScreenWidth-28.0, height: size.height)
                 
                 self?.contentScrollView.snp.remakeConstraints { (make) in
-                    make.bottom.equalTo((self?.topicView.snp_top)!)
+                    make.bottom.equalTo((self?.topicView.snp.top)!)
                     make.left.equalTo(14)
                     make.right.equalTo(-14)
                     make.height.equalTo(size.height)
@@ -1014,7 +1014,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             contentScrollView.contentSize = CGSize.init(width: kScreenWidth-28.0, height: size.height)
             
             contentScrollView.snp.remakeConstraints { (make) in
-                make.bottom.equalTo(topicView.snp_top)
+                make.bottom.equalTo(topicView.snp.top)
                 make.left.equalTo(14)
                 make.right.equalTo(-14)
                 make.height.equalTo(size.height)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoMajorCommentCell.swift

@@ -63,21 +63,21 @@ class CommunityVideoMajorCommentCell: UITableViewCell {
             make.size.equalTo(38)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(iconButton.snp_right).offset(10)
+            make.left.equalTo(iconButton.snp.right).offset(10)
             make.right.equalToSuperview().offset(-26)
             make.top.equalTo(iconButton)
             make.height.equalTo(17)
         }
         
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(8)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
             make.left.equalTo(titleLabel)
             make.right.equalToSuperview().offset(-14)
         }
         timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(contentLabel.snp.bottom).offset(8)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(15)
         }
         likeCountLabel.snp.makeConstraints { (make) in
@@ -90,9 +90,9 @@ class CommunityVideoMajorCommentCell: UITableViewCell {
             make.size.equalTo(20)
         }
         tableView.snp.remakeConstraints { (make) in
-            make.top.equalTo(timeLabel.snp_bottom).offset(10)
-            make.left.equalTo(contentLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(timeLabel.snp.bottom).offset(10)
+            make.left.equalTo(contentLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(20)
         }
     }
@@ -201,9 +201,9 @@ class CommunityVideoMajorCommentCell: UITableViewCell {
         let contentSize = self.tableView.contentSize
         tableViewHeight = contentSize.height
         tableView.snp.remakeConstraints { (make) in
-            make.top.equalTo(timeLabel.snp_bottom).offset(10)
-            make.left.equalTo(contentLabel.snp_left)
-            make.right.equalTo(contentLabel.snp_right)
+            make.top.equalTo(timeLabel.snp.bottom).offset(10)
+            make.left.equalTo(contentLabel.snp.left)
+            make.right.equalTo(contentLabel.snp.right)
             make.height.equalTo(contentSize.height)
         }
         let contentLabelHeight = communityPostCommentModel?.content?.heightForComment(font: kRegularFont14!, width: kScreenWidth - 14 - 48)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoSelTopicCell.swift

@@ -58,7 +58,7 @@ class CommunityVideoSelTopicCell: UICollectionViewCell {
         }
         titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(iconImageView.snp_right).offset(5)
+            make.left.equalTo(iconImageView.snp.right).offset(5)
             make.right.equalTo(-6)
             make.height.equalTo(19)
         }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/View/MessageListTableCell.swift

@@ -60,22 +60,22 @@ class MessageListTableCell: UITableViewCell {
         }
         titleLabel.snp.makeConstraints { (make) in
             make.top.equalTo(16)
-            make.left.equalTo(typeImageView.snp_right).offset(16)
-            make.right.equalTo(contentImageView.snp_left).offset(-16)
+            make.left.equalTo(typeImageView.snp.right).offset(16)
+            make.right.equalTo(contentImageView.snp.left).offset(-16)
             make.height.greaterThanOrEqualTo(20)
         }
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(titleLabel.snp_right)
+            make.top.equalTo(titleLabel.snp.bottom).offset(8)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(titleLabel.snp.right)
         }
         timeLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(contentLabel.snp_bottom).offset(8)
-            make.left.equalTo(titleLabel.snp_left)
+            make.top.equalTo(contentLabel.snp.bottom).offset(8)
+            make.left.equalTo(titleLabel.snp.left)
             make.height.equalTo(17)
         }
         sepView.snp.makeConstraints { (make) in
-            make.top.equalTo(timeLabel.snp_bottom).offset(16)
+            make.top.equalTo(timeLabel.snp.bottom).offset(16)
             make.right.equalToSuperview()
             make.left.equalToSuperview().offset(54)
             make.height.equalTo(1)

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessageHomeOneCollectionViewCell.swift

@@ -54,7 +54,7 @@ class MessageHomeOneCollectionViewCell: UICollectionViewCell {
             make.size.equalTo(50)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(iconImageView.snp_bottom).offset(4)
+            make.top.equalTo(iconImageView.snp.bottom).offset(4)
             make.centerX.equalToSuperview()
             make.height.equalTo(20)
         }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessageHomeTwoCollectionViewCell.swift

@@ -60,7 +60,7 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
         }
         titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(iconImageView.snp_right).offset(8)
+            make.left.equalTo(iconImageView.snp.right).offset(8)
             make.width.equalTo(67)
             make.height.equalTo(23)
         }
@@ -132,7 +132,7 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
             if messageModel?.view?.title == nil || messageModel?.view?.title == "" {
                 titleLabel.snp.remakeConstraints { (make) in
                     make.centerY.equalToSuperview()
-                    make.left.equalTo(iconImageView.snp_right).offset(8)
+                    make.left.equalTo(iconImageView.snp.right).offset(8)
                     make.width.equalTo(67)
                     make.height.equalTo(23)
                 }
@@ -148,7 +148,7 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
                 subLabel.isHidden = false
                 titleLabel.snp.remakeConstraints { (make) in
                     make.top.equalTo(12)
-                    make.left.equalTo(iconImageView.snp_right).offset(8)
+                    make.left.equalTo(iconImageView.snp.right).offset(8)
                     make.width.equalTo(67)
                     make.height.equalTo(23)
                 }
@@ -160,7 +160,7 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
                 
                 subLabel.snp.remakeConstraints { (make) in
                     make.top.equalTo(titleLabel.snp.bottom).offset(4)
-                    make.left.equalTo(titleLabel.snp_left)
+                    make.left.equalTo(titleLabel.snp.left)
                     make.right.equalToSuperview().offset(-52)
                     make.height.equalTo(19)
                 }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/View/MessageActivityTableCell.swift

@@ -72,9 +72,9 @@ class MessageActivityTableCell: UITableViewCell {
             make.height.equalTo(21)
         }
         subLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(6)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(titleLabel.snp_right)
+            make.top.equalTo(titleLabel.snp.bottom).offset(6)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(titleLabel.snp.right)
             make.height.equalTo(17)
         }
     }
@@ -164,9 +164,9 @@ class MessageActivityTableCell: UITableViewCell {
                     make.height.equalTo(21)
                 }
                 subLabel.snp.remakeConstraints { (make) in
-                    make.top.equalTo(titleLabel.snp_bottom).offset(6)
-                    make.left.equalTo(titleLabel.snp_left)
-                    make.right.equalTo(titleLabel.snp_right)
+                    make.top.equalTo(titleLabel.snp.bottom).offset(6)
+                    make.left.equalTo(titleLabel.snp.left)
+                    make.right.equalTo(titleLabel.snp.right)
                     make.height.equalTo(17)
                 }
             }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/View/MessagePlanetNotiTableCell.swift

@@ -63,7 +63,7 @@ class MessagePlanetNotiTableCell: UITableViewCell {
             make.height.equalTo(20)
         }
         notiView.snp.makeConstraints { (make) in
-            make.top.equalTo(timeLabel.snp_bottom).offset(16)
+            make.top.equalTo(timeLabel.snp.bottom).offset(16)
             make.left.equalTo(23)
             make.right.equalTo(-23)
             make.bottom.equalToSuperview()
@@ -75,7 +75,7 @@ class MessagePlanetNotiTableCell: UITableViewCell {
         }
         organizerLabel.snp.makeConstraints { (make) in
             make.top.equalTo(14)
-            make.left.equalTo(iconImageView.snp_right).offset(6)
+            make.left.equalTo(iconImageView.snp.right).offset(6)
             make.width.equalTo(60)
             make.height.equalTo(20)
         }
@@ -86,15 +86,15 @@ class MessagePlanetNotiTableCell: UITableViewCell {
             make.height.equalTo(0.5)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(sepView.snp_bottom).offset(14)
+            make.top.equalTo(sepView.snp.bottom).offset(14)
             make.left.equalTo(14)
             make.right.equalTo(-14)
             make.height.equalTo(21)
         }
         contentLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(10)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(titleLabel.snp_right)
+            make.top.equalTo(titleLabel.snp.bottom).offset(10)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(titleLabel.snp.right)
             make.bottom.equalToSuperview().offset(-14)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/MineModule/ModifyData/View/ModifyDataAvatarView.swift

@@ -23,13 +23,13 @@ class ModifyDataAvatarView: BaseView {
     }
     
     override func setupLayouts() {
-        avatarButton.snp_makeConstraints { (make) in
+        avatarButton.snp.makeConstraints { (make) in
             make.top.equalTo(20)
             make.centerX.equalToSuperview()
             make.size.equalTo(80)
         }
-        editButton.snp_makeConstraints { (make) in
-            make.top.equalTo(avatarButton.snp_bottom).offset(4)
+        editButton.snp.makeConstraints { (make) in
+            make.top.equalTo(avatarButton.snp.bottom).offset(4)
             make.width.equalTo(64)
             make.height.equalTo(24)
             make.centerX.equalToSuperview()

RainbowPlanet/RainbowPlanet/Modules/MineModule/ModifyData/View/ModifyDataNickNameSignView.swift

@@ -31,42 +31,42 @@ class ModifyDataNickNameSignView: BaseView {
     }
     
     override func setupLayouts() {
-        nickBgView.snp_makeConstraints { (make) in
+        nickBgView.snp.makeConstraints { (make) in
             make.left.right.top.equalToSuperview()
             make.height.equalTo(56)
         }
-        nickNameLabel.snp_makeConstraints { (make) in
+        nickNameLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(14)
             make.width.equalTo(32)
             make.height.equalTo(23)
         }
-        nickNameTextView.snp_makeConstraints { (make) in
+        nickNameTextView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(nickNameLabel.snp_right).offset(16)
+            make.left.equalTo(nickNameLabel.snp.right).offset(16)
             make.right.equalTo(-14)
             make.height.equalTo(23)
         }
-        lineLabel.snp_makeConstraints { (make) in
+        lineLabel.snp.makeConstraints { (make) in
             make.top.equalTo(nickBgView.snp.bottom)
             make.left.equalTo(nickNameLabel)
             make.right.equalToSuperview()
             make.height.equalTo(1)
         }
-        signBgView.snp_makeConstraints { (make) in
-            make.top.equalTo(lineLabel.snp_bottom)
+        signBgView.snp.makeConstraints { (make) in
+            make.top.equalTo(lineLabel.snp.bottom)
             make.left.right.equalTo(nickBgView)
             make.height.equalTo(56)
         }
-       signNameLabel.snp_makeConstraints { (make) in
+       signNameLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(14)
             make.width.equalTo(32)
             make.height.equalTo(23)
         }
-        signNameTextView.snp_makeConstraints { (make) in
+        signNameTextView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(signNameLabel.snp_right).offset(16)
+            make.left.equalTo(signNameLabel.snp.right).offset(16)
             make.right.equalTo(-14)
             make.height.equalTo(23)
         }
@@ -110,7 +110,7 @@ class ModifyDataNickNameSignView: BaseView {
             }
             self?.nickNameTextView.snp.remakeConstraints { (make) in
                 make.centerY.equalToSuperview()
-                make.left.equalTo((self?.nickNameLabel.snp_right)!).offset(16)
+                make.left.equalTo((self?.nickNameLabel.snp.right)!).offset(16)
                 make.right.equalTo(-14)
                 make.height.equalTo((self?.nickNameTextViewSize?.height ?? 23))
             }
@@ -163,13 +163,13 @@ class ModifyDataNickNameSignView: BaseView {
             self?.frame = CGRect(x: 0, y: 10 + 148 + 10 + kNavBarTotalHeight, width: kScreenWidth, height: height)
             
             self?.signBgView.snp.remakeConstraints { (make) in
-                make.top.equalTo((self?.lineLabel.snp_bottom)!)
+                make.top.equalTo((self?.lineLabel.snp.bottom)!)
                 make.left.right.equalTo((self?.nickBgView)!)
                 make.height.equalTo(33 + (self?.signNameTextViewSize?.height ?? 23))
             }
             self?.signNameTextView.snp.remakeConstraints { (make) in
                 make.centerY.equalToSuperview()
-                make.left.equalTo((self?.signNameLabel.snp_right)!).offset(16)
+                make.left.equalTo((self?.signNameLabel.snp.right)!).offset(16)
                 make.right.equalTo(-14)
                 make.height.equalTo((self?.signNameTextViewSize?.height ?? 23))
             }

RainbowPlanet/RainbowPlanet/Modules/MineModule/MyFollowAndFan/View/MyFollowAndFanHeaderView.swift

@@ -16,7 +16,7 @@ class MyFollowAndFanHeaderView: BaseView {
     }
     
     override func setupLayouts() {
-        titleLabel.snp_makeConstraints { (make) in
+        titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(14)
             make.right.equalTo(-14)

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift

@@ -70,13 +70,13 @@ class OtherPersonalCenterViewController: BaseViewController {
             make.edges.equalToSuperview()
         }
         avatarButton.snp.makeConstraints { (make) in
-            make.left.equalTo(navigationBar.leftButton.snp_right)
+            make.left.equalTo(navigationBar.leftButton.snp.right)
             make.size.equalTo(20)
             make.centerY.equalTo(navigationBar.rightButton)
         }
         nameButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarButton)
-            make.left.equalTo(avatarButton.snp_right).offset(4)
+            make.left.equalTo(avatarButton.snp.right).offset(4)
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherHeaderView.swift

@@ -45,37 +45,37 @@ class PersonViewUserAndOtherHeaderView: BaseView {
     }
     
     override func setupLayouts() {
-        titleLabel.snp_makeConstraints { (make) in
-            make.bottom.equalTo(subtitleLabel.snp_top).offset(-10)
+        titleLabel.snp.makeConstraints { (make) in
+            make.bottom.equalTo(subtitleLabel.snp.top).offset(-10)
             make.left.equalTo(14)
             make.right.equalTo(avatarButton.snp.left).offset(-15)
         }
-        subtitleLabel.snp_makeConstraints { (make) in
-            make.bottom.equalTo(followNumberButton.snp_top).offset(-30)
+        subtitleLabel.snp.makeConstraints { (make) in
+            make.bottom.equalTo(followNumberButton.snp.top).offset(-30)
             make.left.equalTo(14)
             make.right.equalTo(-100)
         }
-        followNumberButton.snp_makeConstraints { (make) in
+        followNumberButton.snp.makeConstraints { (make) in
             make.bottom.equalTo(-23)
             make.left.equalTo(14)
             make.height.equalTo(20)
         }
-        fanNumberButton.snp_makeConstraints { (make) in
+        fanNumberButton.snp.makeConstraints { (make) in
             make.centerY.height.equalTo(followNumberButton)
-            make.left.equalTo(followNumberButton.snp_right).offset(20)
+            make.left.equalTo(followNumberButton.snp.right).offset(20)
         }
-        avatarButton.snp_makeConstraints { (make) in
+        avatarButton.snp.makeConstraints { (make) in
             make.bottom.equalTo(-66)
             make.right.equalTo(-20)
             make.size.equalTo(60)
         }
-        editButton.snp_makeConstraints { (make) in
+        editButton.snp.makeConstraints { (make) in
             make.centerX.equalTo(avatarButton)
             make.bottom.equalTo(-23)
             make.width.equalTo(64)
             make.height.equalTo(24)
         }
-        followButton.snp_makeConstraints { (make) in
+        followButton.snp.makeConstraints { (make) in
             make.centerX.equalTo(avatarButton)
             make.bottom.equalTo(-23)
             make.width.equalTo(60)

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherListView.swift

@@ -22,7 +22,7 @@ class PersonViewUserAndOtherListView: BaseView {
     
     var jumpModeType : JumpModeType? {
         didSet {
-            collectionView.snp_makeConstraints { (make) in
+            collectionView.snp.makeConstraints { (make) in
                 make.top.right.left.equalToSuperview()
                 if jumpModeType == JumpModeType.none {
                     make.height.equalTo(kScreenHeight-kNavBarTotalHeight-kTabBarTotalHeight-44)

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/View/RainbowBeanPhysical/RainbowBeanPhysicalView.swift

@@ -15,7 +15,7 @@ class RainbowBeanPhysicalView: BaseView {
     }
     
     override func setupLayouts() {
-        collectionView.snp_makeConstraints { (make) in
+        collectionView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
         }
     }

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/View/UserPersonalCenterHeaderView/UserPersonalCenterHeaderView.swift

@@ -23,12 +23,12 @@ class UserPersonalCenterHeaderView: BaseView {
             make.height.equalTo(140+kNavBarTotalHeight)
         }
         rainbowBeanPhysicalView.snp.makeConstraints { (make) in
-            make.top.equalTo(personViewUserAndOtherHeaderView.snp_bottom)
+            make.top.equalTo(personViewUserAndOtherHeaderView.snp.bottom)
             make.left.right.equalToSuperview()
             make.height.equalTo(109)
         }
 //        userPersonalCenterOrderView.snp.makeConstraints { (make) in
-//            make.top.equalTo(rainbowBeanPhysicalView.snp_bottom)
+//            make.top.equalTo(rainbowBeanPhysicalView.snp.bottom)
 //            make.left.equalTo(14)
 //            make.right.equalTo(-14)
 //            make.height.equalTo(90)

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -82,18 +82,18 @@ class UserPersonalCenterViewController: BaseViewController {
             if jumpModeType == JumpModeType.none {
                 make.left.equalTo(14)
             }else {
-                make.left.equalTo(navigationBar.leftButton.snp_right)
+                make.left.equalTo(navigationBar.leftButton.snp.right)
             }
             make.size.equalTo(20)
             make.centerY.equalTo(navigationBar.rightButton)
         }
         nameButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarButton)
-            make.left.equalTo(avatarButton.snp_right).offset(4)
+            make.left.equalTo(avatarButton.snp.right).offset(4)
         }
-        setButton.snp_makeConstraints { (make) in
+        setButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(navigationBar.rightButton)
-            make.right.equalTo(navigationBar.rightButton.snp_left)
+            make.right.equalTo(navigationBar.rightButton.snp.left)
             make.size.equalTo(34)
         }
         iconImageView.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddAddress/View/PublishAddressPOICell.swift

@@ -93,8 +93,8 @@ class PublishAddressPOICell: UITableViewCell {
         
         bottomLineLabel.snp.makeConstraints { (make) in
             make.bottom.equalToSuperview()
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalTo(titleLabel.snp_right)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalTo(titleLabel.snp.right)
             make.height.equalTo(0.5)
         }
         

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddAddress/View/SearchAddrNavigationbarView.swift

@@ -36,7 +36,7 @@ class SearchAddrNavigationbarView: BaseView {
         }
         searchbgView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(backBtn.snp_right).offset(5)
+            make.left.equalTo(backBtn.snp.right).offset(5)
             make.right.equalTo(-14)
             make.height.equalTo(30)
         }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishSelTopicCollectionCell.swift

@@ -64,12 +64,12 @@ class PublishSelTopicCollectionCell: UICollectionViewCell {
         }
         titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(iconImageView.snp_right).offset(5)
+            make.left.equalTo(iconImageView.snp.right).offset(5)
             make.right.equalTo(-26)
             make.height.equalTo(19)
         }
         deleteButton.snp.makeConstraints { (make) in
-            make.left.equalTo(titleLabel.snp_right).offset(2)
+            make.left.equalTo(titleLabel.snp.right).offset(2)
             make.right.equalTo(-2)
             make.centerY.equalToSuperview()
         }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishTopicItemCell.swift

@@ -72,8 +72,8 @@ class PublishTopicItemCell: UITableViewCell {
         }
         joinLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(titleLabel.snp_right).offset(15)
-            make.right.lessThanOrEqualTo(selImageView.snp_left).offset(-15)
+            make.left.equalTo(titleLabel.snp.right).offset(15)
+            make.right.lessThanOrEqualTo(selImageView.snp.left).offset(-15)
             make.height.equalTo(17)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishTopicTypeItemCollectionCell.swift

@@ -68,7 +68,7 @@ class PublishTopicTypeItemCollectionCell: UICollectionViewCell {
             make.centerX.equalToSuperview()
         }
         focusView.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(3)
+            make.top.equalTo(titleLabel.snp.bottom).offset(3)
             make.width.equalTo(20)
             make.height.equalTo(3)
             make.centerX.equalToSuperview()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditAddAddressCell.swift

@@ -79,14 +79,14 @@ class PublishEditAddAddressCell: UITableViewCell {
         }
         titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(iconImageView.snp_right).offset(6)
+            make.left.equalTo(iconImageView.snp.right).offset(6)
             make.width.equalTo(56)
             make.height.equalTo(20)
         }
         subLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(titleLabel.snp_right).offset(10)
-            make.right.equalTo(arrowImageView.snp_left).offset(-10)
+            make.left.equalTo(titleLabel.snp.right).offset(10)
+            make.right.equalTo(arrowImageView.snp.left).offset(-10)
             make.height.equalTo(17)
         }
     }
@@ -124,7 +124,7 @@ class PublishEditAddAddressCell: UITableViewCell {
         subLabel.snp.remakeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalToSuperview().offset(leading)
-            make.right.equalTo(arrowImageView.snp_left).offset(-10)
+            make.right.equalTo(arrowImageView.snp.left).offset(-10)
             make.height.equalTo(17)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditAddTopicCell.swift

@@ -79,14 +79,14 @@ class PublishEditAddTopicCell: UITableViewCell {
         }
         titleLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(iconImageView.snp_right).offset(6)
+            make.left.equalTo(iconImageView.snp.right).offset(6)
             make.width.equalTo(56)
             make.height.equalTo(20)
         }
         subLabel.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(titleLabel.snp_right).offset(10)
-            make.right.equalTo(arrowImageView.snp_left).offset(-10)
+            make.left.equalTo(titleLabel.snp.right).offset(10)
+            make.right.equalTo(arrowImageView.snp.left).offset(-10)
             make.height.equalTo(17)
         }
     }
@@ -125,7 +125,7 @@ class PublishEditAddTopicCell: UITableViewCell {
         subLabel.snp.remakeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalToSuperview().offset(leading)
-            make.right.equalTo(arrowImageView.snp_left).offset(-10)
+            make.right.equalTo(arrowImageView.snp.left).offset(-10)
             make.height.equalTo(17)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditDefaultCollectionCell.swift

@@ -59,7 +59,7 @@ class PublishEditDefaultCollectionCell: UICollectionViewCell {
             make.size.equalTo(24)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(addImgView.snp_bottom).offset(6)
+            make.top.equalTo(addImgView.snp.bottom).offset(6)
             make.centerX.equalToSuperview()
             make.height.equalTo(17)
         }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditTitleCell.swift

@@ -61,9 +61,9 @@ class PublishEditTitleCell: UITableViewCell {
             make.right.equalTo(-14)
         }
         h_lineLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(editTextField.snp_left)
-            make.right.equalTo(editTextField.snp_right)
-            make.top.equalTo(editTextField.snp_top)
+            make.left.equalTo(editTextField.snp.left)
+            make.right.equalTo(editTextField.snp.right)
+            make.top.equalTo(editTextField.snp.top)
             make.height.equalTo(0.5)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicChooseView.swift

@@ -92,13 +92,13 @@ class PublishMusicChooseView: BaseView {
         
         recommendLabel.snp.makeConstraints { (make) in
             make.centerX.equalTo(kScreenWidth*0.5-20)
-            make.bottom.equalTo(sepLineView.snp_top).offset(-20)
+            make.bottom.equalTo(sepLineView.snp.top).offset(-20)
             make.height.equalTo(20)
         }
         recommendButton.snp.makeConstraints { (make) in
-            make.left.equalTo(recommendLabel.snp_right)
+            make.left.equalTo(recommendLabel.snp.right)
             make.height.equalTo(30)
-            make.centerY.equalTo(recommendLabel.snp_centerY)
+            make.centerY.equalTo(recommendLabel.snp.centerY)
             make.width.equalTo(60)
         }
         
@@ -115,7 +115,7 @@ class PublishMusicChooseView: BaseView {
             make.height.equalTo(21)
         }
         v_lineLabel.snp.makeConstraints { (make) in
-            make.centerX.equalTo(musicButton.snp_centerX)
+            make.centerX.equalTo(musicButton.snp.centerX)
             make.width.equalTo(20)
             make.height.equalTo(3)
             make.bottom.equalTo(-11-kSafeTabBarHeight)

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicListCell.swift

@@ -92,7 +92,7 @@ class PublishMusicListCell: UITableViewCell {
         }
         
         titleLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(iconImageView.snp_right).offset(8)
+            make.left.equalTo(iconImageView.snp.right).offset(8)
             make.centerY.equalToSuperview()
             make.height.equalTo(20)
             make.right.equalTo(-86)

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicVolumnView.swift

@@ -98,16 +98,16 @@ class PublishMusicVolumnView: FWPopupView {
             make.height.equalTo(21)
         }
         originSlider.snp.makeConstraints { (make) in
-            make.left.equalTo(originLabel.snp_right).offset(6)
-            make.right.equalTo(backLabel.snp_left).offset(-20)
+            make.left.equalTo(originLabel.snp.right).offset(6)
+            make.right.equalTo(backLabel.snp.left).offset(-20)
             make.height.equalTo(10)
-            make.centerY.equalTo(originLabel.snp_centerY)
+            make.centerY.equalTo(originLabel.snp.centerY)
         }
         backSlider.snp.makeConstraints { (make) in
-            make.left.equalTo(backLabel.snp_right).offset(6)
+            make.left.equalTo(backLabel.snp.right).offset(6)
             make.right.equalTo(-14)
             make.height.equalTo(10)
-            make.centerY.equalTo(backLabel.snp_centerY)
+            make.centerY.equalTo(backLabel.snp.centerY)
         }
         
         musicButton.snp.makeConstraints { (make) in
@@ -123,7 +123,7 @@ class PublishMusicVolumnView: FWPopupView {
             make.height.equalTo(21)
         }
         v_lineLabel.snp.makeConstraints { (make) in
-            make.centerX.equalTo(volumnButton.snp_centerX)
+            make.centerX.equalTo(volumnButton.snp.centerX)
             make.width.equalTo(20)
             make.height.equalTo(3)
             make.bottom.equalTo(-11-kSafeTabBarHeight)
@@ -230,8 +230,7 @@ class PublishMusicVolumnView: FWPopupView {
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ChangeAudioVolumnNoti"), object: paraDic)
     }
     
-    override func tapGesClick(tap: UITapGestureRecognizer) {
-        super.tapGesClick(tap: tap)
+    func tapGesClick(tap: UITapGestureRecognizer) {
         var paraDic = Dictionary<String, Any>()
         paraDic.updateValue(originVolumn!, forKey: "origin")
         paraDic.updateValue(backVolumn!, forKey: "back")

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishRecommendMusicController.swift

@@ -88,9 +88,9 @@ class PublishRecommendMusicController: BaseViewController {
             make.height.equalTo(20)
         }
         recommendButton.snp.makeConstraints { (make) in
-            make.left.equalTo(recommendLabel.snp_right).offset(2)
+            make.left.equalTo(recommendLabel.snp.right).offset(2)
             make.height.equalTo(30)
-            make.centerY.equalTo(recommendLabel.snp_centerY)
+            make.centerY.equalTo(recommendLabel.snp.centerY)
             make.width.equalTo(75)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishRecordMusicView.swift

@@ -77,9 +77,9 @@ class PublishRecordMusicView: BaseView {
             make.height.equalTo(20)
         }
         recommendButton.snp.makeConstraints { (make) in
-            make.left.equalTo(recommendLabel.snp_right)
+            make.left.equalTo(recommendLabel.snp.right)
             make.height.equalTo(30)
-            make.centerY.equalTo(recommendLabel.snp_centerY)
+            make.centerY.equalTo(recommendLabel.snp.centerY)
             make.width.equalTo(60)
         }
         

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakePhoto/PublishConfirmPhotoController.swift

@@ -49,13 +49,13 @@ class PublishConfirmPhotoController: BaseViewController {
             make.edges.equalToSuperview()
         }
         retakeBtn.snp.makeConstraints { (make) in
-            make.left.equalTo(photoImageView.snp_left)
+            make.left.equalTo(photoImageView.snp.left)
             make.bottom.equalTo(-kSafeTabBarHeight)
             make.width.equalTo(125)
             make.height.equalTo(48)
         }
         usePhotoBtn.snp.makeConstraints { (make) in
-            make.right.equalTo(photoImageView.snp_right)
+            make.right.equalTo(photoImageView.snp.right)
             make.bottom.equalTo(-kSafeTabBarHeight)
             make.width.equalTo(125)
             make.height.equalTo(48)

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakePhoto/PublishTakePhotoController.swift

@@ -76,8 +76,8 @@ class PublishTakePhotoController: BaseViewController {
         reverseButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 6)
         
         flashButton.snp.makeConstraints { (make) in
-            make.top.equalTo(reverseButton.snp_bottom).offset(20)
-            make.centerX.equalTo(reverseButton.snp_centerX)
+            make.top.equalTo(reverseButton.snp.bottom).offset(20)
+            make.centerX.equalTo(reverseButton.snp.centerX)
             make.width.equalTo(40)
             make.height.equalTo(46)
         }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishFilterCollectionCell.swift

@@ -57,9 +57,9 @@ class PublishFilterCollectionCell: UICollectionViewCell {
             make.size.equalTo(52)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(typeImageView.snp_bottom).offset(12)
-            make.left.equalTo(typeImageView.snp_left)
-            make.right.equalTo(typeImageView.snp_right)
+            make.top.equalTo(typeImageView.snp.bottom).offset(12)
+            make.left.equalTo(typeImageView.snp.left)
+            make.right.equalTo(typeImageView.snp.right)
             make.height.equalTo(16)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishFilterView.swift

@@ -38,7 +38,7 @@ class PublishFilterView: BaseView {
         }
         titleLabel.snp.makeConstraints { (make) in
             make.height.equalTo(48)
-            make.bottom.equalTo(collectionView.snp_top)
+            make.bottom.equalTo(collectionView.snp.top)
             make.left.right.equalToSuperview()
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishVideoView.swift

@@ -87,7 +87,7 @@ class PublishVideoView: BaseView {
             make.height.equalTo(40)
             make.left.equalTo(14)
             make.right.equalTo(-14)
-            make.bottom.equalTo(recordButton.snp_top).offset(-21)
+            make.bottom.equalTo(recordButton.snp.top).offset(-21)
         }
         
         /***** 翻转、音乐、滤镜 *****/
@@ -104,14 +104,14 @@ class PublishVideoView: BaseView {
         reverseButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
         
         musicButton.snp.makeConstraints { (make) in
-            make.top.equalTo(reverseButton.snp_bottom).offset(20)
+            make.top.equalTo(reverseButton.snp.bottom).offset(20)
             make.left.right.equalToSuperview()
             make.height.equalTo(46)
         }
         musicButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
         
         filterButton.snp.makeConstraints { (make) in
-            make.top.equalTo(musicButton.snp_bottom).offset(20)
+            make.top.equalTo(musicButton.snp.bottom).offset(20)
             make.left.right.equalToSuperview()
             make.height.equalTo(46)
             make.bottom.equalToSuperview()
@@ -120,7 +120,7 @@ class PublishVideoView: BaseView {
         
         /***** 拍摄时长 *****/
         timeBackView.snp.makeConstraints { (make) in
-            make.bottom.equalTo(recordButton.snp_top).offset(-20)
+            make.bottom.equalTo(recordButton.snp.top).offset(-20)
             make.centerX.equalToSuperview()
             make.height.equalTo(20)
         }
@@ -132,7 +132,7 @@ class PublishVideoView: BaseView {
         }
         
         timeLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(timeDotView.snp_right).offset(4)
+            make.left.equalTo(timeDotView.snp.right).offset(4)
             make.top.bottom.equalToSuperview()
             make.width.equalTo(40)
             make.right.equalToSuperview()
@@ -152,7 +152,7 @@ class PublishVideoView: BaseView {
         confirmButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
         
         delButton.snp.makeConstraints { (make) in
-            make.right.equalTo(confirmButton.snp_left).offset(-30*kScaleWidth)
+            make.right.equalTo(confirmButton.snp.left).offset(-30*kScaleWidth)
             make.top.bottom.equalToSuperview()
             make.width.equalTo(30)
             make.left.equalToSuperview()

RainbowPlanet/RainbowPlanet/Modules/PublishNewModule/PublishConfirmPhotoNew/PublishConfirmPhotoNewViewController.swift

@@ -54,13 +54,13 @@ class PublishConfirmPhotoNewViewController: BaseViewController {
             make.height.equalTo(kScreenWidth * 16 / 9)
         }
         retakeBtn.snp.makeConstraints { (make) in
-            make.left.equalTo(photoImageView.snp_left)
+            make.left.equalTo(photoImageView.snp.left)
             make.bottom.equalTo(-kSafeTabBarHeight)
             make.width.equalTo(125)
             make.height.equalTo(48)
         }
         usePhotoBtn.snp.makeConstraints { (make) in
-            make.right.equalTo(photoImageView.snp_right)
+            make.right.equalTo(photoImageView.snp.right)
             make.bottom.equalTo(-kSafeTabBarHeight)
             make.width.equalTo(125)
             make.height.equalTo(48)

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/GenderSelection/ViewController/GenderSelectionViewController.swift

@@ -54,12 +54,12 @@ class GenderSelectionViewController: BaseViewController {
         }
         
 //        maleTitleButton.snp.makeConstraints { (make) in
-//            make.top.equalTo(maleButton.snp_bottom).offset(15 * kScaleWidth)
+//            make.top.equalTo(maleButton.snp.bottom).offset(15 * kScaleWidth)
 //            make.centerX.equalTo(maleButton)
 //        }
 //
 //        femaleTitleButton.snp.makeConstraints { (make) in
-//            make.top.equalTo(femaleButton.snp_bottom).offset(15 * kScaleWidth)
+//            make.top.equalTo(femaleButton.snp.bottom).offset(15 * kScaleWidth)
 //            make.centerX.equalTo(femaleButton)
 //        }
     }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/Search/View/SearchHeaderCollectionReusableView.swift

@@ -64,7 +64,7 @@ class SearchHeaderCollectionReusableView: UICollectionReusableView {
             make.left.equalToSuperview().offset(14)
             make.height.equalTo(21)
         }
-        deleteButton.snp_makeConstraints { (make) in
+        deleteButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(titleLabel)
             make.right.equalTo(-14)
         }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/View/SearchContentListCollectionCell.swift

@@ -77,22 +77,22 @@ class SearchContentListCollectionCell: UICollectionViewCell {
             make.top.left.right.equalToSuperview()
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(contentImageView.snp_bottom).offset(15)
-            make.left.equalTo(contentImageView.snp_left).offset(10)
-            make.right.equalTo(contentImageView.snp_right).offset(-10)
+            make.top.equalTo(contentImageView.snp.bottom).offset(15)
+            make.left.equalTo(contentImageView.snp.left).offset(10)
+            make.right.equalTo(contentImageView.snp.right).offset(-10)
             make.height.lessThanOrEqualTo(37)
         }
         avatarButton.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(10)
+            make.top.equalTo(titleLabel.snp.bottom).offset(10)
             make.left.equalToSuperview().offset(10)
             make.size.equalTo(18)
         }
         
         nameButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarButton)
-            make.left.equalTo(avatarButton.snp_right).offset(5)
+            make.left.equalTo(avatarButton.snp.right).offset(5)
             make.height.equalTo(18)
-            make.right.equalTo(likeBtn.snp_left).offset(-5)
+            make.right.equalTo(likeBtn.snp.left).offset(-5)
         }
 
         
@@ -113,7 +113,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
         praiseAnimationView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
         }
-        pauseImageView.snp_makeConstraints { (make) in
+        pauseImageView.snp.makeConstraints { (make) in
             make.center.equalToSuperview()
         }
         
@@ -250,7 +250,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
             likeLabel.sizeToFit()
             nameButton.snp.remakeConstraints { (make) in
                 make.centerY.equalTo(avatarButton)
-                make.left.equalTo(avatarButton.snp_right).offset(5)
+                make.left.equalTo(avatarButton.snp.right).offset(5)
                 make.height.equalTo(18)
                 make.width.equalTo((((kScreenWidth - 15)/2) - 20)-18-likeLabel.width-13-28)
             }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/View/SearchTopicListTableViewCell.swift

@@ -45,29 +45,29 @@ class SearchTopicListTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        iconButton.snp_makeConstraints { (make) in
+        iconButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalToSuperview().offset(14)
             make.size.equalTo(70)
         }
-        titleLabel.snp_makeConstraints { (make) in
-            make.left.equalTo(iconButton.snp_right).offset(15)
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(iconButton.snp.right).offset(15)
             make.right.equalToSuperview().offset(-14)
             make.height.equalTo(23)
             make.top.equalTo(iconButton).offset(11)
         }
-        subtitleLabel.snp_makeConstraints { (make) in
-            make.left.equalTo(iconButton.snp_right).offset(15)
+        subtitleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(iconButton.snp.right).offset(15)
             make.right.equalToSuperview().offset(-14)
             make.height.equalTo(23)
             make.bottom.equalTo(iconButton).offset(-11)
         }
-        goButton.snp_makeConstraints { (make) in
+        goButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalTo(-14)
         }
         
-        lineLabel.snp_makeConstraints { (make) in
+        lineLabel.snp.makeConstraints { (make) in
             make.bottom.equalToSuperview()
             make.right.equalToSuperview()
             make.height.equalTo(1)

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchUser/View/SearchUserLitTableViewCell.swift

@@ -54,30 +54,30 @@ class SearchUserLitTableViewCell: UITableViewCell {
     }
     
     private func setupLayouts() {
-        avatarButton.snp_makeConstraints { (make) in
+        avatarButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalTo(14)
             make.size.equalTo(44)
         }
-        titleButton.snp_makeConstraints { (make) in
+        titleButton.snp.makeConstraints { (make) in
             make.top.equalTo(avatarButton).offset(-3)
-            make.left.equalTo(avatarButton.snp_right).offset(10)
+            make.left.equalTo(avatarButton.snp.right).offset(10)
             make.right.equalTo(-88)
             make.height.equalTo(23)
         }
-        topicLabel.snp_makeConstraints { (make) in
+        topicLabel.snp.makeConstraints { (make) in
             make.bottom.equalTo(avatarButton).offset(3)
-            make.left.equalTo(avatarButton.snp_right).offset(10)
+            make.left.equalTo(avatarButton.snp.right).offset(10)
             make.right.equalTo(-88)
             make.height.equalTo(23)
         }
-        followButton.snp_makeConstraints { (make) in
+        followButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalTo(-14)
             make.height.equalTo(28)
             make.width.equalTo(60)
         }
-        lineLabel.snp_makeConstraints { (make) in
+        lineLabel.snp.makeConstraints { (make) in
             make.bottom.equalToSuperview()
             make.left.equalTo(titleButton)
             make.right.equalToSuperview()

RainbowPlanet/RainbowPlanet/Tools/AlertSheetView/SheetSureView.swift

@@ -56,22 +56,22 @@ class SheetSureView: FWPopupView {
             make.height.equalTo(20)
         }
         lineLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(14)
+            make.top.equalTo(titleLabel.snp.bottom).offset(14)
             make.right.left.equalToSuperview()
             make.height.equalTo(1)
         }
         sureButton.snp.makeConstraints { (make) in
-            make.top.equalTo(lineLabel.snp_bottom)
+            make.top.equalTo(lineLabel.snp.bottom)
             make.left.right.equalToSuperview()
             make.height.equalTo(48)
         }
         specLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(sureButton.snp_bottom)
+            make.top.equalTo(sureButton.snp.bottom)
             make.left.right.equalToSuperview()
             make.height.equalTo(5)
         }
         cancelButton.snp.makeConstraints { (make) in
-            make.top.equalTo(specLabel.snp_bottom)
+            make.top.equalTo(specLabel.snp.bottom)
             make.left.right.equalToSuperview()
             make.height.equalTo(48)
         }

RainbowPlanet/RainbowPlanet/Tools/CommentInputView/CommentReplyView.swift

@@ -66,35 +66,35 @@ class CommentReplyView: FWPopupView {
             make.height.equalTo(20)
         }
         lineLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp_bottom).offset(14)
+            make.top.equalTo(titleLabel.snp.bottom).offset(14)
             make.right.left.equalToSuperview()
             make.height.equalTo(1)
         }
         replyButton.snp.makeConstraints { (make) in
-            make.top.equalTo(lineLabel.snp_bottom)
+            make.top.equalTo(lineLabel.snp.bottom)
             make.left.right.equalToSuperview()
             make.height.equalTo(48)
         }
         
         if isDelete {
             twoLineLabel.snp.makeConstraints { (make) in
-                make.top.equalTo(replyButton.snp_bottom)
+                make.top.equalTo(replyButton.snp.bottom)
                 make.right.left.equalToSuperview()
                 make.height.equalTo(1)
             }
             deleteButton.snp.makeConstraints { (make) in
-                make.top.equalTo(twoLineLabel.snp_bottom)
+                make.top.equalTo(twoLineLabel.snp.bottom)
                 make.left.right.equalToSuperview()
                 make.height.equalTo(48)
             }
             specLabel.snp.makeConstraints { (make) in
-                make.top.equalTo(deleteButton.snp_bottom)
+                make.top.equalTo(deleteButton.snp.bottom)
                 make.left.right.equalToSuperview()
                 make.height.equalTo(5)
             }
         }else {
             specLabel.snp.makeConstraints { (make) in
-                make.top.equalTo(replyButton.snp_bottom)
+                make.top.equalTo(replyButton.snp.bottom)
                 make.left.right.equalToSuperview()
                 make.height.equalTo(5)
             }
@@ -102,7 +102,7 @@ class CommentReplyView: FWPopupView {
         
 
         cancelButton.snp.makeConstraints { (make) in
-            make.top.equalTo(specLabel.snp_bottom)
+            make.top.equalTo(specLabel.snp.bottom)
             make.left.right.equalToSuperview()
             make.height.equalTo(48)
         }