付费显示逻辑

liushiyu
1 parent ddddcbe5
Showing 4 changed files with 15 additions and 39 deletions
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoCommentListView.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoContentListView.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoListTableViewCell.swift
@@ -156,18 +156,9 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             self.controlView.videoPlayer((self.player)!, currentTime: self.player.currentTime, totalTime: self.player.totalTime)
             let index = self.dataURLArray.index(of: assetURL.absoluteString)
             let homeModel = self.dataArray[index] as! CNLiveAlbumListModel
-            if (homeModel.product!.check == true) {
+            if homeModel.product?.check == false {
                 (self.player)!.stopCurrentPlayingCell()
             }
-            if homeModel.product?.check == true {
-                if homeModel.product?.albumProductType != "0" {
-                    (self.player)!.stopCurrentPlayingCell()
-                }
-            } else {
-                if homeModel.product?.albumProductType != "0" {
-                    (self.player)!.stopCurrentPlayingCell()
-                }
-            }
         }
         // 更新另一个控制层的时间
         player.playerPlayTimeChanged = { [weak self] asset, currentTime, duration in
@@ -284,8 +284,8 @@ extension CNLiveShortVideoCommentListView {
         cell.deleteBlock = {[weak self] commentModel in
             guard let self = self else { return }
             self.pageNum = 1
+            showLoading(message: "")
             self.requestDataSource()
-            
 //            let tempArray = NSMutableArray(array: self.dataArray)
 //            let tempModel = commentModel as! ShortVideoHomeCommentFListModel
 //            tempArray.forEach { itemModel in
@@ -656,7 +656,7 @@ extension CNLiveShortVideoCommentListTableViewCell {
         cell.setupWithReplyModel(replyModel: replyModel.replys[indexPath.row])
         cell.deleteItemBlock = {[weak self] commentModel in
             guard let self = self else { return }
-            self.reloadBlcok(commentModel)
+            self.deleteBlock(commentModel)
 //            let tempArray = NSMutableArray(array: replyModel.replys)
 //            let tempModel = commentModel as! ShortVideoHomeCommentRListItemModel
 //            tempArray.forEach { itemModel in
@@ -183,7 +183,7 @@ class CNLiveShortVideoContentListTableViewCell: UITableViewCell {
     lazy var tipView: UIImageView = {
         let imageView = UIImageView.init()
-        imageView.contentMode = .scaleAspectFill
+        imageView.contentMode = .scaleAspectFit
         imageView.layer.cornerRadius = 5
         imageView.layer.masksToBounds = true
         imageView.clipsToBounds = true
@@ -223,8 +223,7 @@ class CNLiveShortVideoContentListTableViewCell: UITableViewCell {
         contentView.addSubview(tipView)
         tipView.snp.makeConstraints { make in
             make.left.top.equalToSuperview().offset(20)
-            make.width.equalTo(50)
-            make.height.equalTo(10)
+            make.height.equalTo(15)
         }
         contentView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
@@ -254,10 +253,8 @@ class CNLiveShortVideoContentListTableViewCell: UITableViewCell {
                 tipView.image = UIImage(named: "short_video_free")
             }
         } else {
-            if listModel.product?.albumProductType != "0" {
-                tipView.isHidden = false
-                tipView.image = UIImage(named: "short_video_pay")
-            }
+            tipView.isHidden = false
+            tipView.image = UIImage(named: "short_video_pay")
         }
     }
@@ -200,25 +200,14 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         let tipV: UIImageView = payView.viewWithTag(1001) as! UIImageView
         if model.product?.check == true {
-            //免费
-            if model.product?.albumProductType == "0" {
-                hiddenView(isHidden: false)
-            } else {
-                hiddenView(isHidden: true)
-                payButton.setTitle("\(model.product!.point)积分解锁全集", for: .normal)
-                tipV.isHidden = false
-                tipV.image = UIImage(named: "short_video_free")
-            }
+            //免费或者付过费了
+            hiddenView(isHidden: false)
         } else {
             //需要付费
-            if model.product?.albumProductType == "0" {
-                hiddenView(isHidden: false)
-            } else {
-                hiddenView(isHidden: true)
-                payButton.setTitle("\(model.product!.point)积分解锁全集", for: .normal)
-                tipV.isHidden = false
-                tipV.image = UIImage(named: "short_video_pay")
-            }
+            hiddenView(isHidden: true)
+            payButton.setTitle("\(model.product!.point)积分解锁全集", for: .normal)
+            tipV.isHidden = false
+            tipV.image = UIImage(named: "short_video_pay")
         }
     }
@@ -380,7 +369,7 @@ extension CNLiveShortVideoListTableViewCell {
         }
         let tipView = UIImageView.init()
-        tipView.contentMode = .scaleAspectFill
+        tipView.contentMode = .scaleAspectFit
         tipView.isHidden = true
         tipView.layer.cornerRadius = 5
         tipView.layer.masksToBounds = true
@@ -389,8 +378,7 @@ extension CNLiveShortVideoListTableViewCell {
         view.addSubview(tipView)
         tipView.snp.makeConstraints { make in
             make.left.top.equalToSuperview().offset(20)
-            make.width.equalTo(50)
-            make.height.equalTo(10)
+            make.height.equalTo(15)
         }
         let titleLabel = UILabel.init()