跳转播放器

张旭
1 parent c5301e35
Showing 5 changed files with 81 additions and 53 deletions
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsListCell.swift
metaCode/Classes/Main/HomePages/Controller/PlayletHomePage/CNLivePlayletHomePageController.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageCell.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageHeaderCell.swift
@@ -50,7 +50,7 @@ class CNLiveShopGoodsListCell: UITableViewCell {
         titleLabel.textAlignment = .left
         titleLabel.font = Font_15
         titleLabel.adjustsFontSizeToFitWidth=true
-        titleLabel.text = "啊啊啊啊啊"
+        titleLabel.text = "标题"
         return titleLabel
     }()
     ///副标题
@@ -60,7 +60,7 @@ class CNLiveShopGoodsListCell: UITableViewCell {
         subTitleLabel.textAlignment = .left
         subTitleLabel.font = Font_13
         subTitleLabel.adjustsFontSizeToFitWidth=true
-        subTitleLabel.text = "啊啊啊啊"
+        subTitleLabel.text = "副标题"
         return subTitleLabel
     }()
     ///价格
@@ -133,4 +133,12 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
             return 75+12*2
         }
     }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.section == 0{
+        }else{
+            let albumListModel = self.albumModelArr[indexPath.row]
+            let aid = albumListModel.albumMsgModel?.albumId ?? ""
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+        }
+    }
 }
@@ -48,7 +48,7 @@ class CNLiveAlbumCell:UITableViewCell{
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
         titleLabel.font = Font_15
-        titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
+        titleLabel.text = "标题"
         return titleLabel
     }()
     ///副标题
@@ -101,11 +101,6 @@ class CNLiveAlbumCell:UITableViewCell{
     }
     @objc func playBtnAction(){
         showLoading(message: "")
-        self.getAlbumList()
-    }
-    
-    //获取专辑详情(简介等)
-    func getAlbumMsg(){
         var aid = ""
         if self.albumModel != nil{
             aid = self.albumModel!.contentId
@@ -114,42 +109,56 @@ class CNLiveAlbumCell:UITableViewCell{
         }else{
             aid = ""
         }
-        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
-            hiddenLoading()
-            if status == .success{
-                let model = result as! CNLiveAlbumMsgModel
-                for listModel in self.albumModelArr! {
-                    listModel.albumMsgModel = model
-                }
-                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(), animated: pushAnimated)
-                
-                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLivePlayletHomePageController(aid: aid), animated: true)
-            }else{
-                
-            }
-        }
-    }
-    //获取专辑视频列表详情(播放地址 ,点赞数等信息)
-    func getAlbumList(){
-        showLoading(message: "")
-        var aid = ""
-        if self.albumModel != nil{
-            aid = self.albumModel!.contentId
-        }else if self.albumMsgModel != nil{
-            aid = self.albumMsgModel!.albumId
-        }else{
-            aid = ""
-        }
-        
-        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
-            hiddenLoading()
-            if status == .success{
-                let arr = result as! Array<CNLiveAlbumListModel>
-                self.albumModelArr = Array(arr)
-                self.getAlbumMsg()
-            }else{
-                
-            }
-        }
+
+        navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+
+//        self.getAlbumList()
     }
+    
+//    //获取专辑详情(简介等)
+//    func getAlbumMsg(){
+//        var aid = ""
+//        if self.albumModel != nil{
+//            aid = self.albumModel!.contentId
+//        }else if self.albumMsgModel != nil{
+//            aid = self.albumMsgModel!.albumId
+//        }else{
+//            aid = ""
+//        }
+//        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
+//            hiddenLoading()
+//            if status == .success{
+//                let model = result as! CNLiveAlbumMsgModel
+//                for listModel in self.albumModelArr! {
+//                    listModel.albumMsgModel = model
+//                }
+//                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+//            }else{
+//                
+//            }
+//        }
+//    }
+//    //获取专辑视频列表详情(播放地址 ,点赞数等信息)
+//    func getAlbumList(){
+//        showLoading(message: "")
+//        var aid = ""
+//        if self.albumModel != nil{
+//            aid = self.albumModel!.contentId
+//        }else if self.albumMsgModel != nil{
+//            aid = self.albumMsgModel!.albumId
+//        }else{
+//            aid = ""
+//        }
+//        
+//        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
+//            hiddenLoading()
+//            if status == .success{
+//                let arr = result as! Array<CNLiveAlbumListModel>
+//                self.albumModelArr = Array(arr)
+//                self.getAlbumMsg()
+//            }else{
+//                
+//            }
+//        }
+//    }
 }
@@ -41,7 +41,7 @@ class CNLivePlayletHomePageCell:UITableViewCell{
         titleLabel.textAlignment = .left
         titleLabel.font = Font_13
         titleLabel.numberOfLines = 2
-        titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
+        titleLabel.text = "视频标题"
         let height = titleLabel.qmui_lineHeight
         titleLabel.height = height*2
         return titleLabel
@@ -57,7 +57,7 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
         titleLabel.font = BoldFont_15
-        titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
+        titleLabel.text = "短剧标题"
         let height = titleLabel.qmui_lineHeight
         titleLabel.height = height
         return titleLabel
@@ -68,7 +68,7 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         titleLabel.textColor = HexColor("#999999")
         titleLabel.textAlignment = .left
         titleLabel.font = Font_12
-        titleLabel.text = "45集"
+        titleLabel.text = "1集"
         let height = titleLabel.qmui_lineHeight
         titleLabel.height = height
         return titleLabel
@@ -325,8 +325,9 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
             //已购买
             self.paymentBtn.setTitle("已购买", for: .normal)
             self.paymentBtn.setTitleColor(HexColor("#619CFF"), for: .normal)
+            
+            let payLayer = self.subLayer(name: payBtnSubLayer, viewLayer: self.paymentBtn.layer)
-            let payLayer =  self.paymentBtn.layer.qmui_layer(withName: payBtnSubLayer)
             payLayer?.removeFromSuperlayer()
             self.paymentBtn.backgroundColor = HexColor("#ECF3FF")
         }else{
@@ -334,7 +335,8 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
             self.paymentBtn.setTitle("付费解锁全集", for: .normal)
             self.paymentBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
-            let payLayer =  self.paymentBtn.layer.qmui_layer(withName: payBtnSubLayer)
+            let payLayer = self.subLayer(name: payBtnSubLayer, viewLayer: self.paymentBtn.layer)
+
             if (payLayer != nil){
                 //已添加layer
             }else{
@@ -357,15 +359,14 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
             //已追剧
             self.followBtn.setTitleColor(HexColor("#F5A623"), for: .normal)
             self.followBtn.setTitle("已追剧", for: .normal)
-            let follLayer =  self.followBtn.layer.qmui_layer(withName: followBtnSubLayer)
+            let follLayer = self.subLayer(name: followBtnSubLayer, viewLayer: self.followBtn.layer)
             follLayer?.removeFromSuperlayer()
             self.followBtn.backgroundColor = HexColor("#FDF4E4")
         }else{
             //未追剧
             self.followBtn.setTitle("追剧", for: .normal)
             self.followBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
-            
-            let follLayer =  self.followBtn.layer.qmui_layer(withName: followBtnSubLayer)
+            let follLayer = self.subLayer(name: followBtnSubLayer, viewLayer: self.followBtn.layer)
             if (follLayer != nil){
                 //已添加layer
             }else{
@@ -383,6 +384,16 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         }
     }
+    
+    func subLayer(name:String,viewLayer:CALayer) -> CALayer?{
+        if let subLayer = viewLayer.sublayers?.first(where: { $0.name == name }) {
+            // 这里可以对获取到的子图层进行操作或者访问其属性等
+            return subLayer
+        } else {
+            print("未找到指定名称的图层")
+            return nil
+        }
+    }
     // MARK: - 网络请求 追剧1/取消追剧2
     func postAlbumCollect(type:NSInteger){