专辑头像修改，试听功能修改，集数显示添加，评论回复点赞错误问题。

liushiyu
1 parent b4539eab
Showing 6 changed files with 43 additions and 21 deletions
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumModel.swift
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
metaCode/Classes/Main/VideoPage/ViewModel/CNLiveShortVideoViewModel.swift
@@ -48,8 +48,8 @@ class CNLiveAlbumProductModel:BaseModel{
     var productId = ""
     var productTitle = ""
     var productImg = ""
-    var albumProductType = ""//专辑类型
-    var productType = ""//类型 0免费 1积分 2付费  3 4试听
+    var albumProductType = ""/// 专辑付费类型 0 免费（默认） 1 积分 2 人民币 3 中国币（不用） 4 试听 5 专辑收费 6兑换码兑换
+    var productType = ""/// 单个视频付费类型 0 免费（默认） 1 积分 2 人民币 3 中国币（不用） 4 试听 5 专辑收费 6兑换码兑换
     var androidRmb = ""
     var androidOriginalRmb = ""
     var iosOriginalRmb = ""
@@ -62,7 +62,7 @@ class CNLiveAlbumProductModel:BaseModel{
     var validPeriod = ""
     var expiryDate = ""
     var effectiveDate = ""
-    var check = false////false需要付费 true免费或者付过费
+    var check = false/// 判断是否已购买或者免费, 0: 需要付费  1:免费或者付过费  null:免费
 }
  
  
@@ -156,8 +156,13 @@ 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
+            self.currentIndex = index
             if homeModel.product?.check == false {
-                (self.player)!.stopCurrentPlayingCell()
+                if homeModel.product?.productType == "4" {
+                    //这里表示可以进行试听
+                } else {
+                    (self.player)!.stopCurrentPlayingCell()
+                }
             }
         }
         // 更新另一个控制层的时间
@@ -191,6 +196,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         footerRefreshView = CNLiveFooterRefresh(refreshingBlock: { [weak self] in
             guard let self = self else { return }
             self.player.stopCurrentPlayingCell()
+            self.currentIndex = 0
             self.pageNum += 1
             self.requestData {}
         })
@@ -238,8 +244,10 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                 }
                 self.tableView.refreshControl?.endRefreshing()
                 self.tableView.reloadData()
-                DispatchQueue.main.async {
-                    self.tableView.contentOffset = CGPoint.zero
+                if self.pageNum == 1 {
+                    DispatchQueue.main.async {
+                        self.tableView.contentOffset = CGPoint.zero
+                    }
                 }
                 let hasNextPage = (result as! [Any])[1] as! Bool
                 if listArray.count == 0 && urlArray.count == 0 {
@@ -254,6 +262,8 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                 }
                 if self.pageNum == 1 {
                     self.playTheIndex(index: self.currentIndex)
+                } else {
+                    self.playTheIndex(index: (self.pageNum - 1)*10)
                 }
             } else {
                 if self.tableView.mj_footer != nil {
@@ -130,7 +130,7 @@ class CNLiveShortVideoCommentListView: UIView, UITableViewDelegate, UITableViewD
                 }
                 self.tableView.mj_header?.endRefreshing()
  
-                if self.tableView.mj_footer == nil  {
+                if self.tableView.mj_footer == nil && listArray.count > 0  {
                     self.tableView.mj_footer = footerRefreshView
                 }
                 let hasNextPage = (result as! ShortVideoHomeCommentModel).hasNext!
@@ -688,9 +688,9 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
     }
  
     @objc func likeActionMethod(button: UIButton) {
-        let contentId: String = commentModel == nil ? replyItemModel.replyId! : commentModel.commentId!
-        let support: Bool = commentModel == nil ? replyItemModel.isPraised! : commentModel.isPraised!
-        let isComment: Bool = commentModel != nil
+        let contentId: String = replyItemModel != nil ? replyItemModel.replyId! : commentModel.commentId!
+        let support: Bool = replyItemModel != nil ? replyItemModel.isPraised! : commentModel.isPraised!
+        let isComment: Bool = replyItemModel == nil
         CNLiveShortVideoViewModel.requestCommentWithLike(contentId: contentId, support: support, isComment: isComment) {[weak self] result, respStatue in
             guard let self = self else { return }
             if respStatue == .success {
@@ -253,8 +253,13 @@ class CNLiveShortVideoContentListTableViewCell: UITableViewCell {
                 tipView.image = UIImage(named: "short_video_free")
             }
         } else {
-            tipView.isHidden = false
-            tipView.image = UIImage(named: "short_video_pay")
+            if listModel.product?.productType == "4" {
+                //这里表示可以进行试听
+                tipView.isHidden = true
+            } else {
+                tipView.isHidden = false
+                tipView.image = UIImage(named: "short_video_pay")
+            }
         }
     }
  
@@ -179,15 +179,16 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         homeModel = model
         coverImageView.kf.indicatorType = .activity
         coverImageView.kf.setImage(with: URL(string: model.poster), placeholder: UIImage(named: "short_video_default"))
-        iconBtn.kf.setImage(with: URL(string: model.icon!.face), for: .normal)
-        likeBtn.setTitle(model.tool?.likesNum, for: .normal)
-        commentBtn.setTitle(model.tool?.commentsNum, for: .normal)
+        iconBtn.imageView!.kf.indicatorType = .activity
+        iconBtn.kf.setImage(with: URL(string: model.albumMsgModel!.albumImg), for: .normal)
+        likeBtn.setTitle(model.tool!.likesNum, for: .normal)
+        commentBtn.setTitle(model.tool!.commentsNum, for: .normal)
         shareBtn.setTitle(model.tool?.shareNum, for: .normal)
         likeBtn.isSelected = model.tool!.liked
         titleLabel.text = model.shortTitle
         descLabel.text = model.title
         faviBtn.isHidden = model.albumMsgModel!.collection
-        listBtn.setTitle(model.albumMsgModel?.albumName, for: .normal)
+        listBtn.setTitle("\(model.albumMsgModel!.albumName)·\(model.albumMsgModel!.episodeNow)集", for: .normal)
  
         let imageV: UIImageView = payView.viewWithTag(1000) as! UIImageView
         imageV.kf.indicatorType = .activity
@@ -203,11 +204,16 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
             //免费或者付过费了
             hiddenView(isHidden: false)
         } else {
-            //需要付费
-            hiddenView(isHidden: true)
-            payButton.setTitle("\(model.product!.point)积分解锁全集", for: .normal)
-            tipV.isHidden = false
-            tipV.image = UIImage(named: "short_video_pay")
+            if model.product?.productType == "4" {
+                //这里表示可以进行试听
+                hiddenView(isHidden: false)
+            } else {
+                //需要付费
+                hiddenView(isHidden: true)
+                payButton.setTitle("\(model.product!.point)积分解锁全集", for: .normal)
+                tipV.isHidden = false
+                tipV.image = UIImage(named: "short_video_pay")
+            }
         }
     }
  
@@ -27,6 +27,7 @@ class CNLiveShortVideoViewModel: NSObject {
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/ugcApi/albumList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()