1.改变跳转方式

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

@@ -159,10 +159,10 @@ public class PQBandingPhoneRemindView: UIView {
         protocolLab.delegate = self
         protocolLab.numberOfLines = 0
         protocolLab.font = UIFont.systemFont(ofSize: 18)
-        protocolLab.text = "应"
+        protocolLab.text = "绑定手机号，防止视频丢失"
         protocolLab.textColor = UIColor.black
-        protocolLab.appendLink(withText: "《互联网跟帖评论服务管理规定》", linkFont: UIFont.systemFont(ofSize: 18), linkColor: UIColor.hexColor(hexadecimal: "#07C160"), underLineStyle: CTUnderlineStyle(), linkData: cNetManagePrivacy)
-        protocolLab.appendLink(withText: "，上传视频需绑定手机号", linkFont: UIFont.systemFont(ofSize: 18), linkColor: UIColor.black, underLineStyle: CTUnderlineStyle(), linkData: nil)
+//        protocolLab.appendLink(withText: "《互联网跟帖评论服务管理规定》", linkFont: UIFont.systemFont(ofSize: 18), linkColor: UIColor.hexColor(hexadecimal: "#07C160"), underLineStyle: CTUnderlineStyle(), linkData: cNetManagePrivacy)
+//        protocolLab.appendLink(withText: "，上传视频需绑定手机号", linkFont: UIFont.systemFont(ofSize: 18), linkColor: UIColor.black, underLineStyle: CTUnderlineStyle(), linkData: nil)
         return protocolLab
     }()
 

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

@@ -9,7 +9,7 @@ import BFFramework
 class MVHomeController: MVBaseController {
     // 视频播放列表
     private var viewListView: MVBanner = {
-        let videoListView = MVBanner(frame: .zero, margin: 30, lineSpacing: 12, minScale: MVBanner.Scale(scale: 1))
+        let videoListView = MVBanner(frame: .zero, margin: 30, lineSpacing: 0, minScale: MVBanner.Scale(scale: 1))
         videoListView.backgroundColor = UIColor.white
 
         videoListView.register(classCellType: MVBannerCell.self)
@@ -77,12 +77,9 @@ class MVHomeController: MVBaseController {
     var mVideos: Array = Array<MVHotVideoModel>.init()
 
     var mAllVideos: Array = Array<PQVideoListModel>.init()
-
-    var lastBnnerSelectIndex: IndexPath = IndexPath()
-
-    // 是否点击的再创作
-    var isCreateVideo: Bool = false
-
+    var lastBnnerSelectIndex: IndexPath = IndexPath.init(row: 0, section: 0)
+    //是否点击的再创作
+    var isCreateVideo:Bool = false
     deinit {
         PQNotification.removeObserver(self)
     }
@@ -126,11 +123,8 @@ class MVHomeController: MVBaseController {
                 }
                 BFLog(message: " self?.mAllVideos count is \(String(describing: self?.mAllVideos.count))")
             }
-
             self?.viewListView.reloadData()
-
-            // 自动播放第一个视频 确保 reloaddata 完成
-
+            //自动播放第一个视频 确保 reloaddata 完成
             self?.playVideo(page: 0)
         }
     }
@@ -183,7 +177,6 @@ class MVHomeController: MVBaseController {
             protocalView.remindBlock = { [weak self] sender, webUrl in
                 if sender == nil, webUrl != nil {
                     let detail = PQBaseWebViewController()
-                    detail.evaluateJavaScript = "document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust='210%'"
                     detail.baseUrl = webUrl
                     self?.navigationController?.pushViewController(detail, animated: true)
                 }
@@ -310,7 +303,7 @@ class MVHomeController: MVBaseController {
 
     // 再创作视频
     func createVideo(indexPath: IndexPath) {
-        if enableLogin() {
+        if(enableLogin() && mAllVideos.count > indexPath.row){
             PQStuckPointViewModel.stuckPointProjectMusicInfo(projectId: mAllVideos[indexPath.row].reCreateVideoData?.projectId ?? "") { musicData, _ in
                 if musicData != nil {
                     let vc = PQStuckPointMaterialController()
@@ -331,10 +324,7 @@ extension MVHomeController: MVBannerDataSource, MVBannerDelegate {
 
     func banner(_ banner: MVBanner, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell: MVBannerCell = banner.dequeueReusableCell(for: indexPath)
-        cell.contentView.layer.masksToBounds = true
-        cell.contentView.layer.cornerRadius = 10
-        cell.contentView.backgroundColor = UIColor.white
-
+ 
         cell.videoData = mAllVideos[indexPath.row]
         cell.reCreateBtnClicHandle = { [weak self] _, _ in
             BFLog(message: "点击了创同款")
@@ -367,16 +357,18 @@ extension MVHomeController: MVBannerDataSource, MVBannerDelegate {
         changePlayerStatus(indexPath: indexPath)
     }
 
-    func playVideo(page: Int) {
+    func playVideo(page: Int){
         DispatchQueue.main.async {
             let cell: MVBannerCell? = self.viewListView.collectionView.cellForItem(at: IndexPath(row: page, section: 0)) as? MVBannerCell
             let showProtocal: String? = getUserDefaults(key: cShowProtocal) as? String
             if self.mVideos.count > 0, cell != nil, showProtocal != nil, showProtocal == "1" {
                 cell?.pauseView.isHidden = true
-                PQSingletoVideoPlayer.shared.configPlyer(videoData: self.mAllVideos[page], controllerView: cell!.converView)
+                let videoInfo = self.mAllVideos[page]
+                videoInfo.playProgress = 0
+                PQSingletoVideoPlayer.shared.configPlyer(videoData:videoInfo, controllerView: cell!.converView)
 
                 let hotVideoIndex = self.mVideos.firstIndex(where: { (items) -> Bool in
-                    items.categoryName == self.mAllVideos[page].categoryName
+                    items.categoryName == videoInfo.categoryName
                 })
 
                 BFLog(message: "播放的视频分类为:\(String(describing: self.mVideos[hotVideoIndex ?? 0].categoryName)) page is :\(page)")
@@ -395,6 +387,7 @@ extension MVHomeController: MVBannerDataSource, MVBannerDelegate {
                 BFLog(message: "播放不成功: cell:\(String(describing: cell)) mVideos:\(self.mVideos.count) showProtocal: is \(String(describing: showProtocal))")
             }
         }
+
     }
 
     func pageControl(currentPage page: Int) {
@@ -444,6 +437,9 @@ extension MVHomeController: UICollectionViewDelegate, UICollectionViewDataSource
         }
         viewListView.scrollToItem(at: videosCount, animated: false)
 
-        playVideo(page: videosCount)
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1) {
+            self.playVideo(page: videosCount)
+        }
+ 
     }
 }

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

@@ -14,16 +14,10 @@ class MVBannerCell: UICollectionViewCell {
     //封面
     lazy var converView: UIImageView = {
         let iv = UIImageView()
-//        iv.image = UIImage.init(named: "1024x1024px")
-        iv.frame = CGRect.init(x: 0, y: 0, width: self.bounds.size.width, height: self.bounds.size.height-4)
-//      iv.frame = CGRect.init(x: 4, y: 4, width: 100, height: 100)
-        iv.backgroundColor = .white
-        iv.contentMode = .scaleAspectFill
-        iv.layer.masksToBounds = false
-        iv.layer.shadowColor = UIColor.black.cgColor
-        iv.layer.shadowOpacity = 0.3;//设置阴影的透明度
-        iv.layer.shadowOffset = CGSize.init(width: 0, height: 4)//设置阴影的偏移量
- 
+        iv.clipsToBounds = true
+        iv.backgroundColor = .black
+        iv.contentMode = .scaleAspectFit
+        iv.addCorner(corner: 8)
         return iv
     }()
     
@@ -35,11 +29,20 @@ class MVBannerCell: UICollectionViewCell {
 
     }()
     
+    lazy var backShadowView: UIView = {
+        let backShowView = UIView.init()
+        backShowView.layer.masksToBounds = false
+        backShowView.layer.shadowColor = UIColor.black.cgColor
+        backShowView.layer.shadowOpacity = 0.3;//设置阴影的透明度
+        backShowView.layer.shadowRadius = 4
+        backShowView.layer.shadowOffset = CGSize.init(width: 0, height: 4)//设置阴影的偏移量
+        return backShowView
+    }()
 
     //下面 marks view
     lazy var bottmMaskView: UIImageView = {
         let bottmMaskView = UIImageView.init(image: UIImage.init(named: "home_marks"))
-        
+        bottmMaskView.addCorner(corner: 8)
         return bottmMaskView
     }()
     //暂停view
@@ -54,7 +57,7 @@ class MVBannerCell: UICollectionViewCell {
     lazy var musicNameLab: LMJHorizontalScrollText = {
         let name:String = "文件名称"
         let nameWidth: CGFloat = sizeWithText(text: "\(name)", font: UIFont.systemFont(ofSize: 13), size: CGSize(width: cScreenWidth - ((cDefaultMargin * 6 + 16 * 2) * 2) - (25 + cDefaultMargin * 3), height: cDefaultMargin * 3)).width
-        let musicNameLab = LMJHorizontalScrollText(frame: CGRect(x: 0, y: 0, width: nameWidth < 147 ? 147 : nameWidth, height: cDefaultMargin * 3))
+        let musicNameLab = LMJHorizontalScrollText(frame: CGRect(x: 0, y: 0, width: nameWidth < 127 ? 127 : nameWidth, height: cDefaultMargin * 3))
         musicNameLab.textColor = UIColor.white
         musicNameLab.textFont = UIFont.systemFont(ofSize: 13)
 
@@ -115,54 +118,69 @@ class MVBannerCell: UICollectionViewCell {
     override func layoutSubviews() {
         super.layoutSubviews()
    
-        self.typeLabe.snp.remakeConstraints { make in
+        backShadowView.snp.remakeConstraints { make in
+            make.width.equalToSuperview().offset(-15)
+            make.height.equalToSuperview().offset(-15)
+            make.left.equalToSuperview().offset(15)
+            make.top.equalToSuperview()
+        }
+        
+        converView.snp.remakeConstraints { make in
+            make.width.equalToSuperview()
+            make.height.equalToSuperview().offset(0)
+            make.left.equalToSuperview()
+            make.top.equalToSuperview()
+        }
+
+        typeLabe.snp.remakeConstraints { make in
             make.width.equalTo(50)
             make.height.equalTo(24)
             make.left.equalTo(musicNameView.snp_left)
             make.top.equalTo(musicNameView.snp_bottom).offset(6)
         }
-        
-        self.bottmMaskView.snp.remakeConstraints { make in
-            make.width.equalTo(630 / 2)
+
+        bottmMaskView.snp.remakeConstraints { make in
+            make.width.equalToSuperview()
             make.height.equalTo(150)
             make.left.equalToSuperview()
             make.bottom.equalToSuperview()
         }
-        
-        self.reCreateBtn.snp.remakeConstraints { make in
+
+        reCreateBtn.snp.remakeConstraints { make in
             make.width.equalTo(92)
             make.height.equalTo(46)
             make.right.equalToSuperview().offset(-16)
             make.bottom.equalToSuperview().offset(-20)
         }
-        
-        self.pauseView.snp.remakeConstraints { make in
+
+        pauseView.snp.remakeConstraints { make in
             make.width.equalTo(72)
             make.height.equalTo(82)
             make.center.equalToSuperview()
         }
-        
-        self.progressView.snp.remakeConstraints { make in
-            make.width.equalTo(self.bounds.size.width)
+
+        progressView.snp.remakeConstraints { make in
+            make.width.equalToSuperview().offset(-6)
             make.height.equalTo(2)
-            make.bottom.equalToSuperview().offset(-1)
+            make.left.equalToSuperview().offset(3)
+            make.bottom.equalToSuperview().offset(0)
         }
     }
     
     override init(frame: CGRect) {
         super.init(frame: frame)
-        self.contentView.addSubview(self.converView)
-        self.contentView.addSubview(self.bottmMaskView)
-        self.contentView.addSubview(self.typeLabe)
-        self.contentView.addSubview(self.musicNameView)
-        self.contentView.addSubview(self.reCreateBtn)
-        self.contentView.addSubview(self.pauseView)
-        self.contentView.addSubview(self.progressView)
-    
+        
+        contentView.addSubview(backShadowView)
+        backShadowView.addSubview(converView)
+        backShadowView.addSubview(bottmMaskView)
+        backShadowView.addSubview(typeLabe)
+        backShadowView.addSubview(musicNameView)
+        backShadowView.addSubview(reCreateBtn)
+        backShadowView.addSubview(pauseView)
+        backShadowView.addSubview(progressView)
+ 
     }
-    
-    
-
+  
     func addData() {
         typeLabe.text = videoData?.categoryName
         

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

@@ -219,7 +219,6 @@ extension MVLoginController: TYAttributedLabelDelegate {
         }
         let detail = PQBaseWebViewController()
         detail.baseUrl = link
-        detail.evaluateJavaScript = "document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust='210%'"
         navigationController?.pushViewController(detail, animated: true)
     }
 }