Merge branch 'dev' of https://git.yishihui.com/iOS/MusicVideoPlus into dev 合并代码

MusicVideoPlus/Classes/Modules/Base/Views/PQServerProtocalView.swift

@@ -225,7 +225,7 @@ public class PQBandingPhoneRemindView: UIView {
             make.bottom.equalToSuperview().offset(-15)
         }
         cancelBtn.snp.makeConstraints { make in
-            make.right.equalTo(confirmBtn.snp_left).offset(-normalH)
+            make.right.equalTo(confirmBtn.snp.left).offset(-normalH)
             make.centerY.height.equalTo(confirmBtn)
         }
     }

MusicVideoPlus/Classes/Modules/Home/Controllers/MVHomeController.swift

@@ -309,8 +309,8 @@ class MVHomeController: MVBaseController {
 
         viewListView.snp.remakeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalTo(categoryCollectionView.snp_bottom).offset(cDefaultMargin)
-            make.bottom.equalTo(stuckPointBtn.snp_top).offset(-cDefaultMargin * 2)
+            make.top.equalTo(categoryCollectionView.snp.bottom).offset(cDefaultMargin)
+            make.bottom.equalTo(stuckPointBtn.snp.top).offset(-cDefaultMargin * 2)
         }
     }
 

MusicVideoPlus/Classes/Modules/Home/Views/MVBannerCell.swift

@@ -265,23 +265,23 @@ class MVBannerCell: UICollectionViewCell {
             make.width.equalTo(106)
             make.height.equalTo(46)
             make.right.equalToSuperview().offset(-cDefaultMargin)
-            make.bottom.equalTo(progressView.snp_top).offset(-cDefaultMargin * 2)
+            make.bottom.equalTo(progressView.snp.top).offset(-cDefaultMargin * 2)
         }
 
         musicContenView.snp.remakeConstraints { make in
             make.centerY.equalTo(reCreateBtn)
             make.height.equalTo(32)
-            make.right.equalTo(reCreateBtn.snp_left).offset(-cDefaultMargin)
+            make.right.equalTo(reCreateBtn.snp.left).offset(-cDefaultMargin)
             make.left.equalToSuperview().offset(cDefaultMargin)
         }
 
         musicImageView.snp.makeConstraints { make in
             make.top.left.equalToSuperview()
-            make.width.height.equalTo(musicContenView.snp_height)
+            make.width.height.equalTo(musicContenView.snp.height)
         }
 
         musicBgView.snp.makeConstraints { make in
-            make.left.equalTo(musicImageView.snp_centerX)
+            make.left.equalTo(musicImageView.snp.centerX)
             make.right.top.height.equalToSuperview()
         }
         
@@ -289,42 +289,42 @@ class MVBannerCell: UICollectionViewCell {
             make.width.equalToSuperview().offset(-24)
 //            make.height.equalTo(textSize.height + 2)
             make.left.equalToSuperview().offset(12)
-            make.bottom.equalTo(musicContenView.snp_top).offset(-cDefaultMargin - 2)
+            make.bottom.equalTo(musicContenView.snp.top).offset(-cDefaultMargin - 2)
         }
 
 //        if(videoData?.title?.count ?? 0 > 0){
 //            typeImage.snp.remakeConstraints { make in
-//                make.left.equalTo(musicContenView.snp_left)
+//                make.left.equalTo(musicContenView.snp.left)
 //                make.height.width.equalTo(18)
-//                make.bottom.equalTo(titleLabel.snp_top).offset(-8)
+//                make.bottom.equalTo(titleLabel.snp.top).offset(-8)
 //            }
 //        }else{
 //            typeImage.snp.remakeConstraints { make in
-//                make.left.equalTo(musicContenView.snp_left)
+//                make.left.equalTo(musicContenView.snp.left)
 //                make.height.width.equalTo(18)
-//                make.bottom.equalTo(musicContenView.snp_top).offset(-cDefaultMargin)
+//                make.bottom.equalTo(musicContenView.snp.top).offset(-cDefaultMargin)
 //            }
 //        }
 //
 //        typeLab.snp.remakeConstraints { make in
-//            make.left.equalTo(typeImage.snp_right).offset(5)
+//            make.left.equalTo(typeImage.snp.right).offset(5)
 //            make.centerY.equalTo(typeImage)
 //            make.right.equalTo(musicContenView)
 //        }
         wxIV.snp.makeConstraints { make in
             make.right.equalTo(-12)
-            make.bottom.equalTo(titleLabel.snp_top).offset(-9)
+            make.bottom.equalTo(titleLabel.snp.top).offset(-9)
             make.width.height.equalTo(44)
         }
         friendIV.snp.makeConstraints { make in
-            make.right.equalTo(wxIV.snp_left).offset(-8)
+            make.right.equalTo(wxIV.snp.left).offset(-8)
             make.width.height.bottom.equalTo(wxIV)
         }
         usageAmountL.snp.remakeConstraints { make in
             make.left.equalTo(12)
             make.height.equalTo(26)
-            make.bottom.equalTo(titleLabel.snp_top).offset(-13)
-            make.right.lessThanOrEqualTo(friendIV.snp_left).offset(-8)
+            make.bottom.equalTo(titleLabel.snp.top).offset(-13)
+            make.right.lessThanOrEqualTo(friendIV.snp.left).offset(-8)
         }
     }
 

MusicVideoPlus/Classes/Modules/Home/Views/MVTagsCell.swift

@@ -81,7 +81,7 @@ class MVTagsCell: UICollectionViewCell {
         }
      
         titleLab.snp.remakeConstraints { make in
-            make.left.equalTo(audioImageView.snp_right).offset(0)
+            make.left.equalTo(audioImageView.snp.right).offset(0)
             make.right.equalToSuperview().offset(-margin)
             make.centerY.equalToSuperview()
         }

MusicVideoPlus/Classes/Modules/Login/Controllers/MVLoginController.swift

@@ -149,7 +149,7 @@ class MVLoginController: MVBaseController {
 //            make.width.equalTo(cDefaultMargin * 13)
             make.height.equalTo(cDefaultMargin * 4)
             make.centerX.equalTo(IconView)
-            make.top.equalTo(IconView.snp_bottom).offset(cDefaultMargin * 4)
+            make.top.equalTo(IconView.snp.bottom).offset(cDefaultMargin * 4)
         }
         let isInstallWX = PQSingletoWXApiUtil.shared.isInstallWX()
 
@@ -159,24 +159,24 @@ class MVLoginController: MVBaseController {
                     loginBtn.snp.makeConstraints { make in
                         make.centerX.equalToSuperview()
                         make.height.width.equalTo(nomalH)
-                        make.bottom.equalTo(protocolLab.snp_top).offset(-cDefaultMargin * 3)
+                        make.bottom.equalTo(protocolLab.snp.top).offset(-cDefaultMargin * 3)
                     }
                     phoneLoginBtn.snp.makeConstraints { make in
-                        make.left.equalTo(loginBtn.snp_right).offset(cDefaultMargin * 4)
+                        make.left.equalTo(loginBtn.snp.right).offset(cDefaultMargin * 4)
                         make.height.centerY.width.equalTo(loginBtn)
                     }
                     appleSignBtn.snp.makeConstraints { make in
-                        make.right.equalTo(loginBtn.snp_left).offset(-cDefaultMargin * 4)
+                        make.right.equalTo(loginBtn.snp.left).offset(-cDefaultMargin * 4)
                         make.height.centerY.width.equalTo(loginBtn)
                     }
                 } else {
                     appleSignBtn.snp.makeConstraints { make in
                         make.centerX.equalToSuperview().offset(-35)
                         make.height.width.equalTo(nomalH)
-                        make.bottom.equalTo(protocolLab.snp_top).offset(-cDefaultMargin * 3)
+                        make.bottom.equalTo(protocolLab.snp.top).offset(-cDefaultMargin * 3)
                     }
                     phoneLoginBtn.snp.makeConstraints { make in
-                        make.left.equalTo(appleSignBtn.snp_right).offset(cDefaultMargin * 4)
+                        make.left.equalTo(appleSignBtn.snp.right).offset(cDefaultMargin * 4)
                         make.height.centerY.width.equalTo(appleSignBtn)
                     }
                 }
@@ -185,18 +185,18 @@ class MVLoginController: MVBaseController {
                     loginBtn.snp.makeConstraints { make in
                         make.left.right.equalTo(protocolLab)
                         make.height.equalTo(nomalH)
-                        make.bottom.equalTo(protocolLab.snp_top).offset(-cDefaultMargin * 3)
+                        make.bottom.equalTo(protocolLab.snp.top).offset(-cDefaultMargin * 3)
                     }
                     phoneLoginBtn.snp.makeConstraints { make in
                         make.left.right.equalTo(protocolLab)
                         make.height.equalTo(nomalH)
-                        make.bottom.equalTo(loginBtn.snp_top).offset(-cDefaultMargin)
+                        make.bottom.equalTo(loginBtn.snp.top).offset(-cDefaultMargin)
                     }
                 } else {
                     phoneLoginBtn.snp.makeConstraints { make in
                         make.left.right.equalTo(protocolLab)
                         make.height.equalTo(nomalH)
-                        make.bottom.equalTo(protocolLab.snp_top).offset(-cDefaultMargin * 3)
+                        make.bottom.equalTo(protocolLab.snp.top).offset(-cDefaultMargin * 3)
                     }
                 }
             }
@@ -205,7 +205,7 @@ class MVLoginController: MVBaseController {
             loginBtn.snp.makeConstraints { make in
                 make.left.right.equalTo(protocolLab)
                 make.height.equalTo(nomalH)
-                make.bottom.equalTo(protocolLab.snp_top).offset(-cDefaultMargin * 3)
+                make.bottom.equalTo(protocolLab.snp.top).offset(-cDefaultMargin * 3)
             }
         }
     }

MusicVideoPlus/Classes/Modules/Login/Controllers/PQPhoneLoginController.swift

@@ -95,30 +95,30 @@ class PQPhoneLoginController: MVBaseController {
             make.top.equalTo(view).offset(cDefaultMargin * 10)
         }
         phoneTextField.snp.makeConstraints { make in
-            make.top.equalTo(titleLab.snp_bottom).offset(cDefaultMargin * 8)
+            make.top.equalTo(titleLab.snp.bottom).offset(cDefaultMargin * 8)
             make.left.equalTo(view).offset(cDefaultMargin * 4)
             make.right.equalTo(view).offset(-cDefaultMargin * 4)
             make.height.equalTo(cDefaultMargin * 4)
         }
         phoneLineView.snp.makeConstraints { make in
             make.left.right.equalTo(phoneTextField)
-            make.top.equalTo(phoneTextField.snp_bottom)
+            make.top.equalTo(phoneTextField.snp.bottom)
             make.height.equalTo(0.5)
         }
         passTextField.snp.makeConstraints { make in
-            make.top.equalTo(phoneLineView.snp_bottom).offset(cDefaultMargin)
+            make.top.equalTo(phoneLineView.snp.bottom).offset(cDefaultMargin)
             make.left.right.height.equalTo(phoneTextField)
         }
         passLineView.snp.makeConstraints { make in
             make.left.right.equalTo(phoneTextField)
-            make.top.equalTo(passTextField.snp_bottom)
+            make.top.equalTo(passTextField.snp.bottom)
             make.height.equalTo(0.5)
         }
         phoneLoginBtn.snp.makeConstraints { make in
             make.left.equalTo(view).offset(cDefaultMargin * 2)
             make.right.equalTo(view).offset(-cDefaultMargin * 2)
             make.height.equalTo(cDefaultMargin * 5)
-            make.top.equalTo(passLineView.snp_bottom).offset(cDefaultMargin * 4)
+            make.top.equalTo(passLineView.snp.bottom).offset(cDefaultMargin * 4)
         }
         phoneLoginBtn.addCorner(corner: 25)
     }

MusicVideoPlus/Classes/Modules/Mine/Controllers/MVMineProductController.swift

@@ -98,7 +98,9 @@ class MVMineProductController: PQBaseViewController {
                     } else {
                         self?.itemsList = self!.itemsList + videoList!
                     }
-                    self?.flowLayout.findList = self?.itemsList as! [Any]
+                    if self?.itemsList != nil {
+                        self?.flowLayout.findList = self?.itemsList as! [Any]
+                    }
                     self?.collectionView.reloadData()
                     self?.emptyView.isHidden = true
                 } else {

MusicVideoPlus/Classes/Modules/Mine/Views/MVMineHeadInfoView.swift

@@ -72,7 +72,7 @@ class MVMineHeadInfoView: UIView {
             make.left.equalToSuperview().offset(leftMargin)
         }
         nickNameLab.snp.makeConstraints { make in
-            make.left.equalTo(iconImageView.snp_right).offset(margin)
+            make.left.equalTo(iconImageView.snp.right).offset(margin)
             make.right.equalToSuperview().offset(-leftMargin)
             make.centerY.equalTo(iconImageView).offset(-margin)
         }

MusicVideoPlus/Classes/Modules/Mine/Views/MVMineProductCell.swift

@@ -118,7 +118,7 @@ class MVMineProductCell: UICollectionViewCell {
         titleLabel.snp.remakeConstraints { make in
             make.centerY.equalTo(moreBtn)
             make.left.equalToSuperview().offset(margin)
-            make.right.equalTo(moreBtn.snp_left).offset(cDefaultMargin / 2)
+            make.right.equalTo(moreBtn.snp.left).offset(cDefaultMargin / 2)
         }
     }
 

MusicVideoPlus/Classes/Modules/Mine/Views/MVPlayControlViewCell.swift

@@ -267,46 +267,46 @@ class MVPlayControlViewCell: UICollectionViewCell {
         }
 
         wechatFriLab.snp.remakeConstraints { make in
-            make.bottom.equalTo(reCreateBtn.snp_top).offset(-cDefaultMargin * 2)
+            make.bottom.equalTo(reCreateBtn.snp.top).offset(-cDefaultMargin * 2)
             make.right.equalTo(reCreateBtn)
             make.width.equalTo(shareW)
         }
 
         wechatFriImage.snp.remakeConstraints { make in
-            make.bottom.equalTo(wechatFriLab.snp_top)
+            make.bottom.equalTo(wechatFriLab.snp.top)
             make.width.height.equalTo(shareW)
             make.right.equalTo(wechatFriLab)
         }
 
         wechatLab.snp.remakeConstraints { make in
-            make.bottom.equalTo(wechatFriImage.snp_top).offset(-margin)
+            make.bottom.equalTo(wechatFriImage.snp.top).offset(-margin)
             make.width.height.right.equalTo(wechatFriLab)
         }
         wechatImage.snp.remakeConstraints { make in
-            make.bottom.equalTo(wechatLab.snp_top)
+            make.bottom.equalTo(wechatLab.snp.top)
             make.width.height.equalTo(shareW)
             make.right.equalTo(wechatFriLab)
         }
 
         musicContenView.snp.remakeConstraints { make in
             make.height.equalTo(musicH)
-            make.right.equalTo(wechatFriLab.snp_left).offset(-margin)
+            make.right.equalTo(wechatFriLab.snp.left).offset(-margin)
             make.left.equalTo(reCreateBtn)
-            make.bottom.equalTo(reCreateBtn.snp_top).offset(-cDefaultMargin * 2)
+            make.bottom.equalTo(reCreateBtn.snp.top).offset(-cDefaultMargin * 2)
         }
 
         musicImageView.snp.makeConstraints { make in
             make.top.left.equalToSuperview()
-            make.width.height.equalTo(musicContenView.snp_height)
+            make.width.height.equalTo(musicContenView.snp.height)
         }
 
         musicBgView.snp.makeConstraints { make in
-            make.left.equalTo(musicImageView.snp_centerX)
+            make.left.equalTo(musicImageView.snp.centerX)
             make.right.top.height.equalToSuperview()
         }
 
         titleLabel.snp.remakeConstraints { make in
-            make.bottom.equalTo(musicContenView.snp_top).offset(-margin)
+            make.bottom.equalTo(musicContenView.snp.top).offset(-margin)
             make.left.equalTo(reCreateBtn)
             make.right.equalTo(musicContenView)
         }
@@ -314,13 +314,13 @@ class MVPlayControlViewCell: UICollectionViewCell {
         nickNameBtn.snp.remakeConstraints { make in
             make.left.equalTo(reCreateBtn)
             make.right.equalTo(musicContenView)
-            make.bottom.equalTo(titleLabel.snp_top).offset(-margin / 2)
+            make.bottom.equalTo(titleLabel.snp.top).offset(-margin / 2)
         }
 
         watchCountLab.snp.remakeConstraints { make in
             make.left.equalTo(reCreateBtn)
             make.right.equalTo(musicContenView)
-            make.bottom.equalTo(nickNameBtn.snp_top).offset(-margin / 2)
+            make.bottom.equalTo(nickNameBtn.snp.top).offset(-margin / 2)
         }
 
         progressView.snp.remakeConstraints { make in

MusicVideoPlus/Classes/Modules/Mine/Views/MVProductEmptyView.swift

@@ -66,7 +66,7 @@ class MVProductEmptyView: UIView {
         }
         titleLabel.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalTo(emptyImageView.snp_bottom).offset(cDefaultMargin)
+            make.top.equalTo(emptyImageView.snp.bottom).offset(cDefaultMargin)
         }
     }
 

MusicVideoPlus/Classes/Modules/Setting/Controllers/MVSettingController.swift

@@ -112,7 +112,7 @@ class MVSettingController: MVBaseController{
         }
         
         logoutBtn.snp.makeConstraints { make in
-            make.bottom.equalTo(protocolLab.snp_top).offset(-30)
+            make.bottom.equalTo(protocolLab.snp.top).offset(-30)
             make.centerX.equalToSuperview()
             make.height.equalTo(50)
             make.width.equalTo(335)