Commit 44dd5abcb010f8a2ca927d8ea1ad33cd5152774c

Authored by “张旭”
1 parent 9b129b67

是否付过费 , 确定好

metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
@@ -23,7 +23,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -23,7 +23,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
23 var payTitle = "" 23 var payTitle = ""
24 var payIsAlbum = false 24 var payIsAlbum = false
25 var payActivityId = "" 25 var payActivityId = ""
26 - var isPayZhuanJi = false 26 + var isPayZhuanJi = false//是否付过费
27 var payVodProductModel:CNLiveAlbumProductModel? 27 var payVodProductModel:CNLiveAlbumProductModel?
28 28
29 //当前选择内容是否需要付费 29 //当前选择内容是否需要付费
@@ -455,9 +455,9 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -455,9 +455,9 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
455 if self.vodAlbumListBaseModel?.list.count ?? 0 > 0{ 455 if self.vodAlbumListBaseModel?.list.count ?? 0 > 0{
456 payAlbumListArr = NSMutableArray(array: self.vodAlbumListBaseModel!.list) 456 payAlbumListArr = NSMutableArray(array: self.vodAlbumListBaseModel!.list)
457 } 457 }
458 - self.setPayParams(payVodAlbumListModel: payVodAlbumListModel, payContentId: self.vodPlayModel?.cid ?? (self.vodPlayModel?.contentId ?? ""), payAid: self.vodPlayModel?.albumId ?? "", payAlbumListArr: payAlbumListArr, payIndex: self.albumIndex, payTitle: title, payIsAlbum: true, payActivityId: self.vodPlayModel?.contentId ?? "", isPayZhuanJi: true, payVodProductModel: self.vodPlayModel?.product) 458 + self.setPayParams(payVodAlbumListModel: payVodAlbumListModel, payContentId: self.vodPlayModel?.cid ?? (self.vodPlayModel?.contentId ?? ""), payAid: self.vodPlayModel?.albumId ?? "", payAlbumListArr: payAlbumListArr, payIndex: self.albumIndex, payTitle: title, payIsAlbum: true, payActivityId: self.vodPlayModel?.contentId ?? "", isPayZhuanJi: !isPaid, payVodProductModel: self.vodPlayModel?.product)
459 }else{ 459 }else{
460 - self.setPayParams(payVodAlbumListModel: nil, payContentId: self.vodPlayModel?.cid ?? "", payAid: self.vodPlayModel?.albumId ?? "", payAlbumListArr: NSMutableArray(), payIndex: albumIndex, payTitle: title, payIsAlbum: false, payActivityId: self.vodPlayModel?.contentId ?? "", isPayZhuanJi: false, payVodProductModel: self.vodPlayModel?.product) 460 + self.setPayParams(payVodAlbumListModel: nil, payContentId: self.vodPlayModel?.cid ?? "", payAid: self.vodPlayModel?.albumId ?? "", payAlbumListArr: NSMutableArray(), payIndex: albumIndex, payTitle: title, payIsAlbum: false, payActivityId: self.vodPlayModel?.contentId ?? "", isPayZhuanJi: !isPaid, payVodProductModel: self.vodPlayModel?.product)
461 } 461 }
462 462
463 var urls = [URL]() 463 var urls = [URL]()
@@ -467,7 +467,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -467,7 +467,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
467 self.player.currentPlayerManager.pause() 467 self.player.currentPlayerManager.pause()
468 468
469 self.controlView.payBgView.isHidden = false 469 self.controlView.payBgView.isHidden = false
470 - isPayZhuanJi = false 470 + isPayZhuanJi = !isPaid
471 //分转元,没有小数点 471 //分转元,没有小数点
472 let fenString = self.vodPlayModel?.product!.iosRmb ?? "100" 472 let fenString = self.vodPlayModel?.product!.iosRmb ?? "100"
473 // 将字符串转换为整数 473 // 将字符串转换为整数
@@ -488,7 +488,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -488,7 +488,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
488 self.currentPlayIsNeedPay = false 488 self.currentPlayIsNeedPay = false
489 self.resetPayParams() 489 self.resetPayParams()
490 self.controlView.payBgView.isHidden = true 490 self.controlView.payBgView.isHidden = true
491 - isPayZhuanJi = true 491 + isPayZhuanJi = !isPaid
492 // self.playWithUrlAndTitle(url: self.url!.absoluteString, title: title) 492 // self.playWithUrlAndTitle(url: self.url!.absoluteString, title: title)
493 } 493 }
494 494
@@ -708,7 +708,26 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -708,7 +708,26 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
708 if let albumModel = self.albumListArr[nextIdx] as? CNLiveVodAlbumListModel{ 708 if let albumModel = self.albumListArr[nextIdx] as? CNLiveVodAlbumListModel{
709 //播专辑列表下一条 709 //播专辑列表下一条
710 self.contentId = albumModel.contentId 710 self.contentId = albumModel.contentId
711 - self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: true, activeId: albumModel.activityId, isRefreshPlayer: true) 711 +
  712 + let isPaid = CNLivePlayerTool.isPaid(product: albumModel.product)
  713 + isPayZhuanJi = !isPaid
  714 +
  715 + var yuanString = "1"
  716 + let fenString = albumModel.product?.iosRmb ?? "100"
  717 + // 将字符串转换为整数
  718 + let fen = Int(fenString) ?? 100
  719 + // 计算元值(整数除法,自动舍去小数部分)
  720 + var yuan = fen / 100
  721 + // 将结果转换为字符串
  722 + yuanString = String(yuan)
  723 +
  724 + var vodAlbumListBaseModel = CNLiveVodAlbumListBaseModel()
  725 + vodAlbumListBaseModel.list = self.albumListArr as! [CNLiveVodAlbumListModel]
  726 + self.selectKanDianOrAlbum(isPayZhuanJi:isPayZhuanJi , mdlProduct: albumModel.product, mdlContentId: albumModel.contentId, isAblumVideo: true, albumSelectIndex: self.albumIndex, albumListArray: self.albumListArr, kanDianSelectIndex: -1, kanDianListArray: NSMutableArray(), isPlayAblumOrKandian: true, xuanjiBgViewCurrSeleIdx: -1, xuanjiBgViewKanDianListArr: NSMutableArray(), modelTitle: albumModel.title, mdlActiveId: albumModel.activityId, mdlModel: albumModel.modelId, yuanString: yuanString, payVodAlbumListModel: albumModel, vodAlbumListBaseModel: vodAlbumListBaseModel)
  727 +// self.selectKanDianOrAlbum(isPayZhuanJi: false, mdlProduct: albumModel.product, mdlContentId: albumModel.contentId, isAblumVideo: false, albumSelectIndex: self.albumIndex, albumListArray: NSMutableArray(), kanDianSelectIndex: self.kanDianIndex, kanDianListArray: self.kanDianListArr, isPlayAblumOrKandian: false, xuanjiBgViewCurrSeleIdx: self.kanDianIndex, xuanjiBgViewKanDianListArr: self.kanDianListArr, modelTitle: albumModel.title, mdlActiveId: albumModel.pid, mdlModel: albumModel.model, yuanString: yuanString, payVodAlbumListModel: nil, vodAlbumListBaseModel: nil)
  728 +
  729 +// self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: true, activeId: albumModel.activityId, isRefreshPlayer: true)
  730 +
712 // self.changeContentApi(vodModel: albumModel) 731 // self.changeContentApi(vodModel: albumModel)
713 } 732 }
714 733
@@ -728,7 +747,22 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -728,7 +747,22 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
728 let isAblumVideo = false// (model.album?.albumId.count ?? 0 > 0) ? true : false 747 let isAblumVideo = false// (model.album?.albumId.count ?? 0 > 0) ? true : false
729 // let isAblumVideo = (albumModel.album?.albumId.count ?? 0 > 0) ? true : false 748 // let isAblumVideo = (albumModel.album?.albumId.count ?? 0 > 0) ? true : false
730 // if isAblumVideo{ 749 // if isAblumVideo{
731 - self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: isAblumVideo, activeId: albumModel.pid, isRefreshPlayer: true) 750 +
  751 + let isPaid = CNLivePlayerTool.isPaid(product: albumModel.product)
  752 + isPayZhuanJi = !isPaid
  753 +
  754 +
  755 + var yuanString = "1"
  756 + let fenString = albumModel.product?.iosRmb ?? "100"
  757 + // 将字符串转换为整数
  758 + let fen = Int(fenString) ?? 100
  759 + // 计算元值(整数除法,自动舍去小数部分)
  760 + var yuan = fen / 100
  761 + // 将结果转换为字符串
  762 + yuanString = String(yuan)
  763 + self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: albumModel.product, mdlContentId: albumModel.contentId, isAblumVideo: false, albumSelectIndex: self.albumIndex, albumListArray: NSMutableArray(), kanDianSelectIndex: self.kanDianIndex, kanDianListArray: self.kanDianListArr, isPlayAblumOrKandian: false, xuanjiBgViewCurrSeleIdx: self.kanDianIndex, xuanjiBgViewKanDianListArr: self.kanDianListArr, modelTitle: albumModel.title, mdlActiveId: albumModel.pid, mdlModel: albumModel.model, yuanString: yuanString, payVodAlbumListModel: nil, vodAlbumListBaseModel: nil)
  764 +// self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: isAblumVideo, activeId: albumModel.pid, isRefreshPlayer: true)
  765 +
732 // }else{ 766 // }else{
733 // self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: isAblumVideo, activeId: albumModel.pid) 767 // self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: isAblumVideo, activeId: albumModel.pid)
734 // } 768 // }
@@ -1047,7 +1081,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1047,7 +1081,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1047 if isPaid{ 1081 if isPaid{
1048 //需要付费 1082 //需要付费
1049 self.controlView.payBgView.isHidden = false 1083 self.controlView.payBgView.isHidden = false
1050 - isPayZhuanJi = false 1084 + isPayZhuanJi = !isPaid
1051 //分转元,没有小数点 1085 //分转元,没有小数点
1052 let fenString = model.product!.iosRmb 1086 let fenString = model.product!.iosRmb
1053 // 将字符串转换为整数 1087 // 将字符串转换为整数
@@ -1066,7 +1100,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1066,7 +1100,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1066 }else{ 1100 }else{
1067 //免费或者付过费了 1101 //免费或者付过费了
1068 self.controlView.payBgView.isHidden = true 1102 self.controlView.payBgView.isHidden = true
1069 - isPayZhuanJi = true 1103 + isPayZhuanJi = !isPaid
1070 } 1104 }
1071 1105
1072 //true当前播放的专辑 false看点 1106 //true当前播放的专辑 false看点
@@ -1153,13 +1187,11 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1153,13 +1187,11 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1153 cell.selectBlock = {[weak self] vodModel, index ,albumListArr,vodAlbumListBaseModel in 1187 cell.selectBlock = {[weak self] vodModel, index ,albumListArr,vodAlbumListBaseModel in
1154 guard let self = self else { return } 1188 guard let self = self else { return }
1155 self.player.currentPlayerManager.pause() 1189 self.player.currentPlayerManager.pause()
1156 - isPayZhuanJi = false//是否付过费  
1157 var yuanString = "1" 1190 var yuanString = "1"
1158 let isPaid = CNLivePlayerTool.isPaid(product: vodModel.product) 1191 let isPaid = CNLivePlayerTool.isPaid(product: vodModel.product)
1159 if isPaid{ 1192 if isPaid{
1160 //需要付费 1193 //需要付费
1161 self.controlView.payBgView.isHidden = false 1194 self.controlView.payBgView.isHidden = false
1162 - isPayZhuanJi = false  
1163 //分转元,没有小数点 1195 //分转元,没有小数点
1164 let fenString = vodModel.product!.iosRmb 1196 let fenString = vodModel.product!.iosRmb
1165 // 将字符串转换为整数 1197 // 将字符串转换为整数
@@ -1179,8 +1211,8 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1179,8 +1211,8 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1179 }else{ 1211 }else{
1180 //免费或者付过费了 1212 //免费或者付过费了
1181 self.controlView.payBgView.isHidden = true 1213 self.controlView.payBgView.isHidden = true
1182 - isPayZhuanJi = true  
1183 } 1214 }
  1215 + isPayZhuanJi = !isPaid
1184 1216
1185 //true当前播放的专辑 false看点 1217 //true当前播放的专辑 false看点
1186 let isAblumVideo = true// (model.album?.albumId.count ?? 0 > 0) ? true : false 1218 let isAblumVideo = true// (model.album?.albumId.count ?? 0 > 0) ? true : false
@@ -1397,7 +1429,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1397,7 +1429,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1397 self.isPlayAblumOrKandian = isPlayAblumOrKandian 1429 self.isPlayAblumOrKandian = isPlayAblumOrKandian
1398 1430
1399 //成功用pay参数 刷新页面 1431 //成功用pay参数 刷新页面
1400 - self.setPayParams(payVodAlbumListModel: payVodAlbumListModel, payContentId: payVodAlbumListModel?.contentId ?? "", payAid: payVodAlbumListModel?.albumId ?? "", payAlbumListArr: albumListArray, payIndex: albumSelectIndex, payTitle: modelTitle, payIsAlbum: isAblumVideo, payActivityId: mdlActiveId, isPayZhuanJi: true, payVodProductModel: mdlProduct) 1432 + self.setPayParams(payVodAlbumListModel: payVodAlbumListModel, payContentId: payVodAlbumListModel?.contentId ?? "", payAid: payVodAlbumListModel?.albumId ?? "", payAlbumListArr: albumListArray, payIndex: albumSelectIndex, payTitle: modelTitle, payIsAlbum: isAblumVideo, payActivityId: mdlActiveId, isPayZhuanJi: isPayZhuanJi, payVodProductModel: mdlProduct)
1401 // //成功用pay参数 刷新页面 1433 // //成功用pay参数 刷新页面
1402 // self.payVodAlbumListModel = payVodAlbumListModel 1434 // self.payVodAlbumListModel = payVodAlbumListModel
1403 // self.payAid = payVodAlbumListModel?.albumId ?? "" 1435 // self.payAid = payVodAlbumListModel?.albumId ?? ""
@@ -1430,7 +1462,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1430,7 +1462,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1430 self.isPlayAblumOrKandian = isPlayAblumOrKandian 1462 self.isPlayAblumOrKandian = isPlayAblumOrKandian
1431 1463
1432 //成功用pay参数 刷新页面 1464 //成功用pay参数 刷新页面
1433 - self.setPayParams(payVodAlbumListModel: nil, payContentId: mdlContentId, payAid: "", payAlbumListArr: NSMutableArray(), payIndex: albumSelectIndex, payTitle: modelTitle, payIsAlbum: isAblumVideo, payActivityId: mdlActiveId, isPayZhuanJi: false, payVodProductModel: mdlProduct) 1465 + self.setPayParams(payVodAlbumListModel: nil, payContentId: mdlContentId, payAid: "", payAlbumListArr: NSMutableArray(), payIndex: albumSelectIndex, payTitle: modelTitle, payIsAlbum: isAblumVideo, payActivityId: mdlActiveId, isPayZhuanJi: isPayZhuanJi, payVodProductModel: mdlProduct)
1434 // self.payVodProductModel = mdlProduct 1466 // self.payVodProductModel = mdlProduct
1435 // self.payContentId = mdlContentId 1467 // self.payContentId = mdlContentId
1436 // self.payIndex = albumSelectIndex 1468 // self.payIndex = albumSelectIndex
@@ -1469,7 +1501,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1469,7 +1501,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1469 if isPaid{ 1501 if isPaid{
1470 //需要付费 1502 //需要付费
1471 self.controlView.payBgView.isHidden = false 1503 self.controlView.payBgView.isHidden = false
1472 - isPayZhuanJi = false  
1473 //分转元,没有小数点 1504 //分转元,没有小数点
1474 let fenString = model.product!.iosRmb 1505 let fenString = model.product!.iosRmb
1475 // 将字符串转换为整数 1506 // 将字符串转换为整数
@@ -1488,9 +1519,8 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -1488,9 +1519,8 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
1488 }else{ 1519 }else{
1489 //免费或者付过费了 1520 //免费或者付过费了
1490 self.controlView.payBgView.isHidden = true 1521 self.controlView.payBgView.isHidden = true
1491 - isPayZhuanJi = true  
1492 } 1522 }
1493 - 1523 + isPayZhuanJi = !isPaid
1494 // let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false 1524 // let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
1495 // self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: model.product, mdlContentId: model.contentId, isAblumVideo: isAblumVideo, albumSelectIndex: -1, kanDianSelectIndex: seleIdx, kanDianListArray: kanDianListArr, isPlayAblumOrKandian: false, xuanjiBgViewCurrSeleIdx: seleIdx, xuanjiBgViewKanDianListArr: kanDianListArr, modelTitle: model.title, mdlActiveId: model.pid, mdlModel: model.model, yuanString: yuanString) 1525 // self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: model.product, mdlContentId: model.contentId, isAblumVideo: isAblumVideo, albumSelectIndex: -1, kanDianSelectIndex: seleIdx, kanDianListArray: kanDianListArr, isPlayAblumOrKandian: false, xuanjiBgViewCurrSeleIdx: seleIdx, xuanjiBgViewKanDianListArr: kanDianListArr, modelTitle: model.title, mdlActiveId: model.pid, mdlModel: model.model, yuanString: yuanString)
1496 1526