修复横屏-付费专辑(有试看)-选某集时直接播放问题

张旭
1 parent 0daa2ef3
Showing 3 changed files with 51 additions and 12 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/HengPing/CNLiveVodLandscapeXuanjiView.swift
@@ -2972,7 +2972,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.8.25.04.29.22;
+				CURRENT_PROJECT_VERSION = 1.1.9.25.04.30.10;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3045,7 +3045,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.8;
+				MARKETING_VERSION = 1.1.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -3228,7 +3228,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.8.25.04.29.22;
+				CURRENT_PROJECT_VERSION = 1.1.9.25.04.30.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -3300,7 +3300,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.8;
+				MARKETING_VERSION = 1.1.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -610,6 +610,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         }
+        //横屏看点-选集
         self.controlView.xuanjiBgView.vodPlayerLandscapeXuanjiKanDianSelectBlock = { [weak self] seleIndex,vodPlayBlockListListModel in
             guard let self = self else { return }
             //切换横屏看点视频
@@ -892,15 +893,53 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         self.controlView.controlXuanjiUpdateBlock = { [weak self] index,albumModel in
             guard let self = self else { return }
-            let title = albumModel.title
-            CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: albumModel.activityId) { result, status in
-                if status == .success{
-                    if let url = result as? String{
-                        self.playWithUrlAndTitle(url: url, title: title)
-                    }
+            let vodModel = albumModel
+            //点击横屏-专辑 剧集的某集按钮
+            var yuanString = "1"
+            let isPaid = CNLivePlayerTool.isPaid(product: vodModel.product)
+            if isPaid{
+                //需要付费
+                self.controlView.payBgView.isHidden = false
+                //分转元,没有小数点
+                let fenString = vodModel.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)
+            }else{
+                //免费或者付过费了
+                self.controlView.payBgView.isHidden = true
             }
+            isPayZhuanJi = !isPaid
+            
+            //true当前播放的专辑 false看点
+            let isAblumVideo = true// (model.album?.albumId.count ?? 0 > 0) ? true : false
+//                let isAblumVideo = (vodModel.albumId.count > 0) ? true : false
+            var vodAlbumListModel:CNLiveVodAlbumListModel?
+            if self.albumListArr.count > 0{
+                if let vodAlbumListMdl = self.albumListArr[index] as? CNLiveVodAlbumListModel{
+                    vodAlbumListModel = vodAlbumListMdl
+                }
+            }
+            self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: vodModel.product, mdlContentId: vodModel.contentId, isAblumVideo: isAblumVideo, albumSelectIndex: index, albumListArray: albumListArr, kanDianSelectIndex: -1, kanDianListArray: NSMutableArray(), isPlayAblumOrKandian: isAblumVideo, xuanjiBgViewCurrSeleIdx: 0, xuanjiBgViewKanDianListArr: NSMutableArray(), modelTitle: vodModel.title, mdlActiveId: vodModel.activityId, mdlModel: vodModel.modelId, yuanString: yuanString, payVodAlbumListModel: vodAlbumListModel, vodAlbumListBaseModel: vodAlbumListBaseModel)
+//            CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: albumModel.activityId) { result, status in
+//                if status == .success{
+//                    if let url = result as? String{
+//                        self.playWithUrlAndTitle(url: url, title: title)
+//                    }
+//                }
+//
+//            }
         }
         self.controlView.controlGaoqingUpdateBlock = { [weak self] gaoqing in
@@ -1430,7 +1469,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             //点击专辑
             cell.selectBlock = {[weak self] vodModel, index ,albumListArr,vodAlbumListBaseModel in
                 guard let self = self else { return }
-                self.player.currentPlayerManager.pause()
                 var yuanString = "1"
                 let isPaid = CNLivePlayerTool.isPaid(product: vodModel.product)
                 if isPaid{
@@ -1619,7 +1657,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
     // MARK: - 点击 看点/专辑
     //isAblumVideo true:播放或选择的专辑 false:看点
     func selectKanDianOrAlbum(isPayZhuanJi:Bool,mdlProduct:CNLiveAlbumProductModel?,mdlContentId:String,isAblumVideo:Bool,albumSelectIndex:Int,albumListArray:NSMutableArray,kanDianSelectIndex:Int,kanDianListArray: NSMutableArray,isPlayAblumOrKandian:Bool,xuanjiBgViewCurrSeleIdx:Int,xuanjiBgViewKanDianListArr:NSMutableArray,modelTitle:String,mdlActiveId:String,mdlModel:String,yuanString:String,payVodAlbumListModel:CNLiveVodAlbumListModel?,vodAlbumListBaseModel : CNLiveVodAlbumListBaseModel?){
-        
+        self.player.currentPlayerManager.pause()
         if isPayZhuanJi{
             //已付费
             self.currentPlayIsNeedPay = false
@@ -333,6 +333,7 @@ class CNLiveVodLandscapeXuanjiView:UIView, UITableViewDataSource, UITableViewDel
 //        }
 //    }
+    ///专辑点击每个剧集按钮
     @objc func xuanjiBtnAction(btn:UIButton){
         let index = btn.tag-100
         if let listModel = self.vodAlbumListBaseModel?.list[index] as? CNLiveVodAlbumListModel{