Merge branch 'dev' of https://git.yishihui.com/iOS/MusicVideoPlus into dev

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

@@ -216,7 +216,7 @@ class MVHomeController: MVBaseController {
                 }
                 // 移除继续播放
                 if sender != nil {
-                    PQSingletoVideoPlayer.shared.resetPlayer()
+                    self?.playVideo(page: 0)
                 }
             }
             UIApplication.shared.keyWindow?.addSubview(protocalView)
@@ -240,7 +240,7 @@ class MVHomeController: MVBaseController {
         stuckPointBtn.snp.remakeConstraints { make in
             make.width.height.equalTo(60)
             make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-(cDefaultMargin * 2 + cSafeAreaHeight))
+            make.bottom.equalToSuperview().offset(-(cDefaultMargin +  cAKSafeAreaHeight))
         }
 
         settingBtn.snp.remakeConstraints { make in

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

@@ -16,7 +16,6 @@ class MVBannerCell: UICollectionViewCell {
     // 封面
     lazy var converView: UIImageView = {
         let iv = UIImageView()
-//        iv.backgroundColor = .black
         iv.contentMode = .scaleAspectFill
         iv.clipsToBounds = true
         iv.addCorner(corner: 8)
@@ -73,6 +72,17 @@ class MVBannerCell: UICollectionViewCell {
         let musicBgView = UIImageView(image: UIImage(named: "musicName_bg"))
         return musicBgView
     }()
+    
+    /// 标题
+    lazy var titleLabel:  UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textAlignment = .left
+        titleLabel.textColor = .white
+        titleLabel.numberOfLines=0
+        titleLabel.lineBreakMode = .byCharWrapping
+        titleLabel.font = UIFont.systemFont(ofSize: 16, weight: .bold)
+        return titleLabel
+    }()
 
     /// 音乐歌曲名称
     lazy var musicNameLab: LMJHorizontalScrollText = {
@@ -135,6 +145,9 @@ class MVBannerCell: UICollectionViewCell {
         contentView.addSubview(pauseView)
         bottmMaskView.addSubview(progressView)
         bottmMaskView.addSubview(typeImage)
+        bottmMaskView.addSubview(titleLabel)
+        
+        
         bottmMaskView.addSubview(typeLab)
         bottmMaskView.addSubview(reCreateBtn)
         bottmMaskView.addSubview(musicContenView)
@@ -145,6 +158,18 @@ class MVBannerCell: UICollectionViewCell {
 
     func addData() {
         typeLab.text = "\(videoData?.categoryName ?? "")"
+        BFLog(message: "videoDatavideoData \(String(describing: videoData?.title))")
+        
+        titleLabel.snp.remakeConstraints { make in
+//            make.width.equalTo(cScreenWidth - 80)
+            make.right.equalTo(reCreateBtn.snp_right)
+            make.height.equalTo(videoData?.titleH ?? 0)
+            make.left.equalToSuperview().offset(12)
+            make.bottom.equalTo(musicContenView.snp_top).offset(-cDefaultMargin)
+        }
+        titleLabel.text = videoData?.title ?? ""
+
+        
         if videoData?.categoryImage != nil {
             typeImage.setNetImage(url: "\(videoData?.categoryImage ?? "")", placeholder: UIImage(named: "categary_icon")!)
         } else {
@@ -222,11 +247,20 @@ class MVBannerCell: UICollectionViewCell {
             make.right.top.height.equalToSuperview()
         }
 
-        typeImage.snp.remakeConstraints { make in
-            make.left.equalTo(musicContenView.snp_left)
-            make.height.width.equalTo(22)
-            make.bottom.equalTo(musicContenView.snp_top).offset(-cDefaultMargin)
+        if(videoData?.title?.count ?? 0 > 0){
+            typeImage.snp.remakeConstraints { make in
+                make.left.equalTo(musicContenView.snp_left)
+                make.height.width.equalTo(18)
+                make.bottom.equalTo(titleLabel.snp_top).offset(-8)
+            }
+        }else{
+            typeImage.snp.remakeConstraints { make in
+                make.left.equalTo(musicContenView.snp_left)
+                make.height.width.equalTo(18)
+                make.bottom.equalTo(musicContenView.snp_top).offset(-cDefaultMargin)
+            }
         }
+   
         typeLab.snp.remakeConstraints { make in
             make.left.equalTo(typeImage.snp_right).offset(5)
             make.centerY.equalTo(typeImage)