iOS Team / CNLiveMateCode · Commits

Commit 3f2b5bffa64affc2b9e209cec113d1d03ca5acb1

Authored by 张旭
1 parent 0daa2ef3

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

Inline Side-by-side
Showing 3 changed files with 51 additions and 12 deletions
metaCode.xcodeproj/project.pbxproj
  View file @3f2b5bf
... ... @@ -2972,7 +2972,7 @@
2972 2972 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2973 2973 CODE_SIGN_IDENTITY = "Apple Development";
2974 2974 CODE_SIGN_STYLE = Automatic;
2975   - CURRENT_PROJECT_VERSION = 1.1.8.25.04.29.22;
  2975 + CURRENT_PROJECT_VERSION = 1.1.9.25.04.30.10;
2976 2976 DEBUG_INFORMATION_FORMAT = dwarf;
2977 2977 DEVELOPMENT_TEAM = 94X49GG3ZW;
2978 2978 ENABLE_BITCODE = NO;
... ... @@ -3045,7 +3045,7 @@
3045 3045 "$(inherited)",
3046 3046 "@executable_path/Frameworks",
3047 3047 );
3048   - MARKETING_VERSION = 1.1.8;
  3048 + MARKETING_VERSION = 1.1.9;
3049 3049 OTHER_LDFLAGS = (
3050 3050 "$(inherited)",
3051 3051 "-all_load",
... ... @@ -3228,7 +3228,7 @@
3228 3228 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
3229 3229 CODE_SIGN_IDENTITY = "Apple Development";
3230 3230 CODE_SIGN_STYLE = Automatic;
3231   - CURRENT_PROJECT_VERSION = 1.1.8.25.04.29.22;
  3231 + CURRENT_PROJECT_VERSION = 1.1.9.25.04.30.10;
3232 3232 DEVELOPMENT_TEAM = 94X49GG3ZW;
3233 3233 ENABLE_BITCODE = NO;
3234 3234 ENABLE_MODULE_VERIFIER = NO;
... ... @@ -3300,7 +3300,7 @@
3300 3300 "$(inherited)",
3301 3301 "@executable_path/Frameworks",
3302 3302 );
3303   - MARKETING_VERSION = 1.1.8;
  3303 + MARKETING_VERSION = 1.1.9;
3304 3304 OTHER_LDFLAGS = (
3305 3305 "$(inherited)",
3306 3306 "-all_load",
... ...
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
  View file @3f2b5bf
... ... @@ -610,6 +610,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
610 610  
611 611  
612 612 }
  613 + //横屏看点-选集
613 614 self.controlView.xuanjiBgView.vodPlayerLandscapeXuanjiKanDianSelectBlock = { [weak self] seleIndex,vodPlayBlockListListModel in
614 615 guard let self = self else { return }
615 616 //切换横屏看点视频
... ... @@ -892,15 +893,53 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
892 893  
893 894 self.controlView.controlXuanjiUpdateBlock = { [weak self] index,albumModel in
894 895 guard let self = self else { return }
895   - let title = albumModel.title
896   - CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: albumModel.activityId) { result, status in
897   - if status == .success{
898   - if let url = result as? String{
899   - self.playWithUrlAndTitle(url: url, title: title)
900   - }
  896 + let vodModel = albumModel
  897 + //点击横屏-专辑 剧集的某集按钮
  898 + var yuanString = "1"
  899 + let isPaid = CNLivePlayerTool.isPaid(product: vodModel.product)
  900 + if isPaid{
  901 + //需要付费
  902 + self.controlView.payBgView.isHidden = false
  903 + //分转元,没有小数点
  904 + let fenString = vodModel.product!.iosRmb
  905 + // 将字符串转换为整数
  906 + // 使用guard语句确保字符串可以转换为整数
  907 + guard let fen = Int(fenString) else {
  908 + print("无法将字符串转换为整数")
  909 + return
901 910 }
  911 + // 计算元值（整数除法，自动舍去小数部分）
  912 + var yuan = fen / 100
  913 + if yuan <= 0{//如果是测试0.1元 ,线上默认设置为1元
  914 + yuan = 1
  915 + }
  916 + // 将结果转换为字符串
  917 + yuanString = String(yuan)
902 918  
  919 + }else{
  920 + //免费或者付过费了
  921 + self.controlView.payBgView.isHidden = true
903 922 }
  923 + isPayZhuanJi = !isPaid
  924 +
  925 + //true当前播放的专辑 false看点
  926 + let isAblumVideo = true// (model.album?.albumId.count ?? 0 > 0) ? true : false
  927 +// let isAblumVideo = (vodModel.albumId.count > 0) ? true : false
  928 + var vodAlbumListModel:CNLiveVodAlbumListModel?
  929 + if self.albumListArr.count > 0{
  930 + if let vodAlbumListMdl = self.albumListArr[index] as? CNLiveVodAlbumListModel{
  931 + vodAlbumListModel = vodAlbumListMdl
  932 + }
  933 + }
  934 + 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)
  935 +// CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: albumModel.activityId) { result, status in
  936 +// if status == .success{
  937 +// if let url = result as? String{
  938 +// self.playWithUrlAndTitle(url: url, title: title)
  939 +// }
  940 +// }
  941 +//
  942 +// }
904 943  
905 944 }
906 945 self.controlView.controlGaoqingUpdateBlock = { [weak self] gaoqing in
... ... @@ -1430,7 +1469,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1430 1469 //点击专辑
1431 1470 cell.selectBlock = {[weak self] vodModel, index ,albumListArr,vodAlbumListBaseModel in
1432 1471 guard let self = self else { return }
1433   - self.player.currentPlayerManager.pause()
1434 1472 var yuanString = "1"
1435 1473 let isPaid = CNLivePlayerTool.isPaid(product: vodModel.product)
1436 1474 if isPaid{
... ... @@ -1619,7 +1657,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1619 1657 // MARK: - 点击 看点/专辑
1620 1658 //isAblumVideo true:播放或选择的专辑 false:看点
1621 1659 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?){
1622   -
  1660 + self.player.currentPlayerManager.pause()
1623 1661 if isPayZhuanJi{
1624 1662 //已付费
1625 1663 self.currentPlayIsNeedPay = false
... ...
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/HengPing/CNLiveVodLandscapeXuanjiView.swift
  View file @3f2b5bf
... ... @@ -333,6 +333,7 @@ class CNLiveVodLandscapeXuanjiView:UIView, UITableViewDataSource, UITableViewDel
333 333 // }
334 334 // }
335 335  
  336 + ///专辑点击每个剧集按钮
336 337 @objc func xuanjiBtnAction(btn:UIButton){
337 338 let index = btn.tag-100
338 339 if let listModel = self.vodAlbumListBaseModel?.list[index] as? CNLiveVodAlbumListModel{
... ...