修复高清超清等按钮没居中问题

修复列表进入播放详情页,横屏选集是空的问题

修复高清超清等按钮没居中问题
修复列表进入播放详情页,横屏选集是空的问题
“张旭”
1 parent 528c245e
Showing 3 changed files with 194 additions and 82 deletions
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/HengPing/CNLiveVodLandscapeGaoqingView.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/HengPing/CNLiveVodPayView.swift
@@ -172,8 +172,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         backBtn.frame = CGRect(x: 15, y: KStatusBarHeight, width: backBtn.width, height: backBtn.height)
         self.view.addSubview(backBtn)
 //        backBtn.backgroundColor = .red
-
-        self.setupPlayer()
         view.addSubview(tableView)
         tableView.frame = CGRect(x: 0, y: self.containerView.bottom, width: KSreenWidth, height: KSreenHeight-self.containerView.bottom-KTabBarSafeHeight-60)
@@ -207,7 +205,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         }
         bottomCommentShowContainView.isHidden = true
 //        self.addRefreshView()
-        self.configDataArray()
         self.isAblumVideo = false
         self.isPlayAblumOrKandian = false
@@ -221,6 +218,8 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             self.isAblumVideo = false
             self.isPlayAblumOrKandian = false
         }
+        self.configDataArray()
+        self.setupPlayer()
     }
     func configDataArray(){
@@ -255,6 +254,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         //专辑有值-专辑列表
         if let vodAlbumListBaseModel = self.vodAlbumListBaseModel{//专辑有值-专辑列表
             tempDataArray.add(vodAlbumListBaseModel)
+            self.albumListArr = NSMutableArray(array: vodAlbumListBaseModel.list)
         }
         //看点
         ///**blockList.type 1/2/3/4/5  商品入口/片花资讯/活动推荐/相关推荐/点播详情 */
@@ -263,6 +263,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 if mdl.type == "2"{//看点list数据
                     //CNLiveVodPlayBlockListModel
                     tempDataArray.add(mdl)
+                    self.kanDianListArr = NSMutableArray(array: mdl.list)
                 }
             }
         }
@@ -353,15 +354,15 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             self.isPlayAblumOrKandian = false
             self.kanDianIndex = seleIndex
             self.kanDianOrAlbumChangeContentApi(contentId: vodPlayBlockListListModel.contentId, title: vodPlayBlockListListModel.title, isAlbum: isAblumVideo, activeId: vodPlayBlockListListModel.pid, isRefreshPlayer:true )
-
+            
         }
-//        var title = ""
-//        if let blockListModel =  self.vodPlayModel?.blockList.first as? CNLiveVodPlayBlockListModel{
-//            if let blockListListModel = blockListModel.list.first{
-//                title = blockListListModel.title
-//            }
-//        }
+        //        var title = ""
+        //        if let blockListModel =  self.vodPlayModel?.blockList.first as? CNLiveVodPlayBlockListModel{
+        //            if let blockListListModel = blockListModel.list.first{
+        //                title = blockListListModel.title
+        //            }
+        //        }
         var title = ""
         if self.vodPlayModel?.blockList.count ?? 0 > 0{
             for mdl in self.vodPlayModel!.blockList{
@@ -373,20 +374,22 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 }
             }
         }
-
+        
+        var yuanString = ""
         let isPaid = CNLivePlayerTool.isPaid(product: self.vodPlayModel?.product)
         if isPaid{
-            var yuanString = ""
             //需要付费
-            self.controlView.payBgView.isHidden = false
-            isPayZhuanJi = false
+            
             var urls = [URL]()
             urls.append(self.url!)
             self.player.assetURLs = urls
             self.player.playTheIndex(0)
             self.player.currentPlayerManager.pause()
+            
+            self.controlView.payBgView.isHidden = false
+            isPayZhuanJi = false
             //分转元,没有小数点
-            let fenString = self.vodPlayModel!.product!.iosRmb
+            let fenString = self.vodPlayModel?.product!.iosRmb ?? "100"
             // 将字符串转换为整数
             // 使用guard语句确保字符串可以转换为整数
             guard let fen = Int(fenString) else {
@@ -400,74 +403,124 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             }
             // 将结果转换为字符串
             yuanString = String(yuan)
-                        
-            //true当前播放的专辑 false看点
-//            let isAblumVideo = false// (model.album?.albumId.count ?? 0 > 0) ? true : false
-            let isAblumVideo = (self.vodPlayModel?.album?.albumId.count ?? 0 > 0) ? true : false
-            var vodAlbumListModel:CNLiveVodAlbumListModel?
-            if self.albumListArr.count > 0{
-                if let vodAlbumListMdl = self.albumListArr[0] as? CNLiveVodAlbumListModel{
-                    vodAlbumListModel = vodAlbumListMdl
-                }
-            }
-            self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: self.vodPlayModel?.product, mdlContentId: self.vodPlayModel?.contentId ?? "", isAblumVideo: isAblumVideo, albumSelectIndex: 0, albumListArray: albumListArr, kanDianSelectIndex: -1, kanDianListArray: NSMutableArray(), isPlayAblumOrKandian: isAblumVideo, xuanjiBgViewCurrSeleIdx: 0, xuanjiBgViewKanDianListArr: NSMutableArray(), modelTitle: title, mdlActiveId: self.vodPlayModel?.contentId ?? "", mdlModel: self.vodPlayModel?.model ?? "", yuanString: yuanString, payVodAlbumListModel: vodAlbumListModel, vodAlbumListBaseModel: self.vodAlbumListBaseModel)
-
-//            if isPayZhuanJi{
-//                //已经付费
-//                self.controlView.payBgView.isHidden = true
-//                self.contentId = self.vodPlayModel?.contentId ?? ""
-//                self.albumListArr = albumListArr
-//                self.albumIndex = 0
-//                self.kanDianIndex = -1
-//                self.isPlayAblumOrKandian = true
-//                self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "", isRefreshPlayer: true)
-//                self.player.allowOrentitaionRotation = true
-//            }else{
-//                //没付费
-//                //显示付费页面
-//                let vodMdl = CNLiveVodPlayModel()
-//                vodMdl.product = self.vodPlayModel?.product
-//                vodMdl.contentId = self.vodPlayModel?.contentId ?? ""
-//                vodMdl.model = self.vodPlayModel?.model ?? ""
-//                self.controlView.vodPlayModel = vodMdl
-//                self.controlView.payBgView.isHidden = false
-//                self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本专辑", for: .normal)
-//                
-//                //成功用pay参数 刷新页面
-//                self.albumListArr = NSMutableArray(array: self.vodAlbumListBaseModel?.list ?? [CNLiveVodAlbumListModel]())
-//                if self.albumListArr.count > 0{
-//                    if let vodAlbumListModel = self.albumListArr[0] as? CNLiveVodAlbumListModel{
-//                        self.payVodAlbumListModel = vodAlbumListModel
-//                        self.payAid = vodAlbumListModel.albumId//.contentId
-//                        self.payContentId = vodAlbumListModel.contentId
-//                        self.payAlbumListArr = albumListArr
-//                        self.payIndex = 0
-//                        self.payTitle = title
-//                        self.payIsAlbum = true
-//                        self.payActivityId = vodAlbumListModel.activityId
-//                        self.player.allowOrentitaionRotation = false
-//                        
-//                        self.contentId = self.vodPlayModel?.contentId ?? ""
-//                        self.albumListArr = albumListArr
-//                        self.albumIndex = 0
-//                        self.kanDianIndex = -1
-//                        self.isPlayAblumOrKandian = true
-//                        self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "", isRefreshPlayer: false)
-//                    }
-//                }
-//            }
         }else{
-            //免费
+            //免费或者付过费了
             self.controlView.payBgView.isHidden = true
             isPayZhuanJi = true
-            self.playWithUrlAndTitle(url: self.url!.absoluteString, title: title)
-
-//            var urls = [URL]()
-//            urls.append(self.url!)
-//            self.player.assetURLs = urls
-//            self.player.playTheIndex(0)
-            
+//            self.playWithUrlAndTitle(url: self.url!.absoluteString, title: title)
         }
+        //true当前播放的专辑 false看点
+        let isAblumVideo = (self.vodPlayModel?.album?.albumId.count ?? 0 > 0) ? true : false
+        var vodAlbumListModel:CNLiveVodAlbumListModel?
+        if self.albumListArr.count > 0{
+            if let vodAlbumListMdl = self.albumListArr[0] as? CNLiveVodAlbumListModel{
+                vodAlbumListModel = vodAlbumListMdl
+            }
+        }
+        let xuanjiBgViewKanDianListArr = isAblumVideo ? (self.albumListArr.count > 0 ? self.albumListArr : self.kanDianListArr) : self.kanDianListArr
+        self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: self.vodPlayModel?.product, mdlContentId: self.vodPlayModel?.cid ?? (self.vodPlayModel?.contentId ?? ""), isAblumVideo: isAblumVideo, albumSelectIndex: self.albumIndex, albumListArray: self.albumListArr, kanDianSelectIndex: self.kanDianIndex, kanDianListArray: self.kanDianListArr, isPlayAblumOrKandian: isAblumVideo, xuanjiBgViewCurrSeleIdx: isAblumVideo ? self.albumIndex : self.kanDianIndex , xuanjiBgViewKanDianListArr: xuanjiBgViewKanDianListArr, modelTitle: title, mdlActiveId: self.vodPlayModel?.contentId ?? "", mdlModel: self.vodPlayModel?.model ?? "1", yuanString: yuanString, payVodAlbumListModel: vodAlbumListModel, vodAlbumListBaseModel: self.vodAlbumListBaseModel)
+        //mdlActiveId: self.vodPlayModel?.contentId
+        
+        
+        
+        //        let isPaid = CNLivePlayerTool.isPaid(product: self.vodPlayModel?.product)
+        //        if isPaid{
+        //            var yuanString = ""
+        //            //需要付费
+        //            self.controlView.payBgView.isHidden = false
+        //            isPayZhuanJi = false
+        //            var urls = [URL]()
+        //            urls.append(self.url!)
+        //            self.player.assetURLs = urls
+        //            self.player.playTheIndex(0)
+        //            self.player.currentPlayerManager.pause()
+        //            //分转元,没有小数点
+        //            let fenString = self.vodPlayModel!.product!.iosRmb
+        //            // 将字符串转换为整数
+        //            // 使用guard语句确保字符串可以转换为整数
+        //            guard let fen = Int(fenString) else {
+        //                print("无法将字符串转换为整数")
+        //                return
+        //            }
+        //            // 计算元值（整数除法，自动舍去小数部分）
+        //            var yuan = fen / 100
+        //            if yuan <= 0{//如果是测试0.1元 ,线上默认设置为1元
+        //                yuan = 1
+        //            }
+        //            // 将结果转换为字符串
+        //            yuanString = String(yuan)
+        //
+        //            //true当前播放的专辑 false看点
+        ////            let isAblumVideo = false// (model.album?.albumId.count ?? 0 > 0) ? true : false
+        //            let isAblumVideo = (self.vodPlayModel?.album?.albumId.count ?? 0 > 0) ? true : false
+        //            var vodAlbumListModel:CNLiveVodAlbumListModel?
+        //            if self.albumListArr.count > 0{
+        //                if let vodAlbumListMdl = self.albumListArr[0] as? CNLiveVodAlbumListModel{
+        //                    vodAlbumListModel = vodAlbumListMdl
+        //                }
+        //            }
+        //            self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: self.vodPlayModel?.product, mdlContentId: self.vodPlayModel?.contentId ?? "", isAblumVideo: isAblumVideo, albumSelectIndex: 0, albumListArray: albumListArr, kanDianSelectIndex: -1, kanDianListArray: NSMutableArray(), isPlayAblumOrKandian: isAblumVideo, xuanjiBgViewCurrSeleIdx: 0, xuanjiBgViewKanDianListArr: NSMutableArray(), modelTitle: title, mdlActiveId: self.vodPlayModel?.contentId ?? "", mdlModel: self.vodPlayModel?.model ?? "", yuanString: yuanString, payVodAlbumListModel: vodAlbumListModel, vodAlbumListBaseModel: self.vodAlbumListBaseModel)
+        
+        
+        //            if isPayZhuanJi{
+        //                //已经付费
+        //                self.controlView.payBgView.isHidden = true
+        //                self.contentId = self.vodPlayModel?.contentId ?? ""
+        //                self.albumListArr = albumListArr
+        //                self.albumIndex = 0
+        //                self.kanDianIndex = -1
+        //                self.isPlayAblumOrKandian = true
+        //                self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "", isRefreshPlayer: true)
+        //                self.player.allowOrentitaionRotation = true
+        //            }else{
+        //                //没付费
+        //                //显示付费页面
+        //                let vodMdl = CNLiveVodPlayModel()
+        //                vodMdl.product = self.vodPlayModel?.product
+        //                vodMdl.contentId = self.vodPlayModel?.contentId ?? ""
+        //                vodMdl.model = self.vodPlayModel?.model ?? ""
+        //                self.controlView.vodPlayModel = vodMdl
+        //                self.controlView.payBgView.isHidden = false
+        //                self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本专辑", for: .normal)
+        //
+        //                //成功用pay参数 刷新页面
+        //                self.albumListArr = NSMutableArray(array: self.vodAlbumListBaseModel?.list ?? [CNLiveVodAlbumListModel]())
+        //                if self.albumListArr.count > 0{
+        //                    if let vodAlbumListModel = self.albumListArr[0] as? CNLiveVodAlbumListModel{
+        //                        self.payVodAlbumListModel = vodAlbumListModel
+        //                        self.payAid = vodAlbumListModel.albumId//.contentId
+        //                        self.payContentId = vodAlbumListModel.contentId
+        //                        self.payAlbumListArr = albumListArr
+        //                        self.payIndex = 0
+        //                        self.payTitle = title
+        //                        self.payIsAlbum = true
+        //                        self.payActivityId = vodAlbumListModel.activityId
+        //                        self.player.allowOrentitaionRotation = false
+        //
+        //                        self.contentId = self.vodPlayModel?.contentId ?? ""
+        //                        self.albumListArr = albumListArr
+        //                        self.albumIndex = 0
+        //                        self.kanDianIndex = -1
+        //                        self.isPlayAblumOrKandian = true
+        //                        self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "", isRefreshPlayer: false)
+        //                    }
+        //                }
+        //            }
+        
+        
+//        }else{
+//            //免费
+//            
+//            self.controlView.payBgView.isHidden = true
+//            isPayZhuanJi = true
+//            self.playWithUrlAndTitle(url: self.url!.absoluteString, title: title)
+//
+////            var urls = [URL]()
+////            urls.append(self.url!)
+////            self.player.assetURLs = urls
+////            self.player.playTheIndex(0)
+//            
+//        }
         self.controlView.showTitle(title, cover: UIImage.imageWithColor(color: .darkGray, size: CGSize(width: 50, height: 50)), fullScreenMode: .landscape)
         self.playTitle = title
@@ -83,7 +83,7 @@ class CNLiveVodLandscapeGaoqingView:UIView{
             titleLbl.text = title
             expandBtn.addSubview(titleLbl)
             titleLbl.snp.makeConstraints { make in
-                make.centerX.equalToSuperview().offset(10)
+                make.centerX.equalToSuperview()
                 make.top.equalToSuperview().offset(30)
             }
@@ -92,7 +92,7 @@ class CNLiveVodLandscapeGaoqingView:UIView{
             subTitleLbl.text = subTitle
             expandBtn.addSubview(subTitleLbl)
             subTitleLbl.snp.makeConstraints { make in
-                make.centerX.equalToSuperview().offset(10)
+                make.centerX.equalToSuperview()
                 make.top.equalTo(titleLbl.snp.bottom).offset(3)
             }
@@ -46,7 +46,48 @@ class CNLiveVodPayView:UIView{
         self.backgroundColor = HexColor("#000000", alpha: 0.7)
         self.isUserInteractionEnabled = true
         self.initUI()
-        self.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(tapAction)))
+        self.isMultipleTouchEnabled = true
+
+        // 双击手势
+        var doubleTapGesture = UILongPressGestureRecognizer(target: self, action: #selector(doubleTapAction))
+//        doubleTapGesture.numberOfTapsRequired = 2 // 双击触发
+        doubleTapGesture.delaysTouchesBegan = true
+        doubleTapGesture.delaysTouchesEnded = true
+        doubleTapGesture.numberOfTouchesRequired = 1
+        doubleTapGesture.numberOfTapsRequired = 2
+
+        var panGesture = UIPanGestureRecognizer(target: self, action: #selector(panAction))
+        panGesture.delaysTouchesBegan = true
+        panGesture.delaysTouchesEnded = true
+        panGesture.maximumNumberOfTouches = 1
+        panGesture.cancelsTouchesInView = true
+
+        var tapGesture = UITapGestureRecognizer(target: self, action: #selector(tapAction))
+        tapGesture.delaysTouchesBegan = true
+        tapGesture.delaysTouchesEnded = true
+        tapGesture.numberOfTouchesRequired = 1
+        tapGesture.numberOfTapsRequired = 1
+        tapGesture.require(toFail: doubleTapGesture)
+        tapGesture.require(toFail: panGesture)
+        self.addGestureRecognizer(tapGesture)
+        self.addGestureRecognizer(doubleTapGesture)
+        self.addGestureRecognizer(panGesture)
+
+        var pinchGesture = UIPinchGestureRecognizer(target: self, action: #selector(pinchAction))
+        pinchGesture.delaysTouchesBegan = true
+        self.addGestureRecognizer(pinchGesture)
+
+        // 长按手势
+        var longGesture = UILongPressGestureRecognizer(target: self, action: #selector(longPressAction))
+        longGesture.minimumPressDuration = 0.5// 长按触发时间(秒)
+        self.addGestureRecognizer(longGesture)
+
+    
+        
+//        // 滑动手势（支持四个方向）
+//        var swipeGesture = UISwipeGestureRecognizer(target: self, action: #selector(swipeAction))
+//        swipeGesture.direction = [.left, .right , .up , .down]
+//        self.addGestureRecognizer(swipeGesture)
     }
     required init?(coder: NSCoder) {
@@ -78,8 +119,26 @@ class CNLiveVodPayView:UIView{
     @objc func tapAction(){
 //        self.isHidden = true
+        print("tapAction")
+    }
+    @objc func pinchAction(){
+//        self.isHidden = true
+        print("pinchAction")
+    }
+    @objc func longPressAction(){
+//        self.isHidden = true
+        print("longPressAction")
+    }
+    @objc func doubleTapAction(){
+//        self.isHidden = true
+        print("doubleTapAction")
     }
+    @objc func panAction(){
+//        self.isHidden = true
+        print("panAction")
+    }
+
     @objc func landscapeBackBtnAction(){
         let viewControllers = navigationViewController().viewControllers
         if viewControllers.count > 1 {