提交播放相关问题

liushiyu
1 parent 184f9c53
Showing 13 changed files with 768 additions and 98 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/View/ShopCoupon/CNLiveShopCouponCreateBottomView.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyCustomView.swift
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
metaCode/Classes/Main/VideoPage/Model/CNLiveShortVideoCommentLayout.swift
metaCode/Classes/Main/VideoPage/Model/CNLiveShortVideoHomeModel.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
metaCode/Supporting Files/Assets.xcassets/Video/short_video_commet_emoji.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Video/short_video_commet_emoji.imageset/c_topic_chat_emoji@2x.png
metaCode/Supporting Files/Assets.xcassets/Video/short_video_commet_emoji.imageset/c_topic_chat_emoji@3x.png
@@ -161,7 +161,6 @@
 		793CAF522A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 793CAF512A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift */; };
 		794294A72B4D18EC008AAFA0 /* CNLiveShortVideoContentListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794294A62B4D18EC008AAFA0 /* CNLiveShortVideoContentListView.swift */; };
 		794294AA2B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794294A92B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift */; };
-		794294AC2B4D44C0008AAFA0 /* CNLiveShortVideoCommentLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794294AB2B4D44C0008AAFA0 /* CNLiveShortVideoCommentLayout.swift */; };
 		794BC1652AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794BC1642AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift */; };
 		794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1042B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift */; };
 		794FF1072B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FF1062B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift */; };
@@ -427,7 +426,6 @@
 		793CAF512A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineExchangeViewController.swift; sourceTree = "<group>"; };
 		794294A62B4D18EC008AAFA0 /* CNLiveShortVideoContentListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShortVideoContentListView.swift; sourceTree = "<group>"; };
 		794294A92B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShortVideoCommentListView.swift; sourceTree = "<group>"; };
-		794294AB2B4D44C0008AAFA0 /* CNLiveShortVideoCommentLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShortVideoCommentLayout.swift; sourceTree = "<group>"; };
 		794BC1642AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSendViewController.swift; sourceTree = "<group>"; };
 		794FF1042B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSearchViewController.swift; sourceTree = "<group>"; };
 		794FF1062B01FC9800385E85 /* CNLiveShopOrderSearchListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderSearchListViewController.swift; sourceTree = "<group>"; };
@@ -1033,7 +1031,6 @@
 			isa = PBXGroup;
 			children = (
 				796308742B4B90700090D22A /* CNLiveShortVideoHomeModel.swift */,
-				794294AB2B4D44C0008AAFA0 /* CNLiveShortVideoCommentLayout.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1895,7 +1892,6 @@
 				191733152B109FD7007BCC04 /* CNLivePlayerTopNaviView.swift in Sources */,
 				794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
-				794294AC2B4D44C0008AAFA0 /* CNLiveShortVideoCommentLayout.swift in Sources */,
 				791C1C882AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				794BC1652AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift in Sources */,
@@ -19,7 +19,7 @@ class CNLiveShopCouponCreateBottomView:UIView{
     /// 代理
     weak var delegate:CNLiveShopCouponButtonClickDelegate?
-    private lazy var cancelBtn: UIButton = {
+    lazy var cancelsBtn: UIButton = {
         let button = UIButton(type: .custom)
         button.backgroundColor = UIColor.white
@@ -55,13 +55,13 @@ class CNLiveShopCouponCreateBottomView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
-        self.addSubview(self.cancelBtn)
+        self.addSubview(self.cancelsBtn)
         self.addSubview(self.saveBtn)
         self.saveBtn.snp.makeConstraints { make in
             make.top.right.bottom.equalTo(self)
             make.width.equalTo(245)
         }
-        self.cancelBtn.snp.makeConstraints { make in
+        self.cancelsBtn.snp.makeConstraints { make in
             make.left.top.bottom.equalTo(self)
             make.right.equalTo(self.saveBtn.snp.left)
         }
@@ -60,7 +60,7 @@ class ShopBodyOrderRefundView: UIView, UITextViewDelegate {
         return contentTextView
     }()
-    lazy var cancelBtn: UIButton = {
+    lazy var cancelsBtn: UIButton = {
         let cancelBtn = UIButton.init(type: .custom)
         cancelBtn.setTitle("取消", for: .normal)
         cancelBtn.setTitleColor(HexColor("#ffffff"), for: .normal)
@@ -117,8 +117,8 @@ class ShopBodyOrderRefundView: UIView, UITextViewDelegate {
             make.right.equalToSuperview().offset(-adapt_length(length: 15))
             make.bottom.equalToSuperview().offset(-adapt_length(length: 12))
         }
-        alertView.addSubview(cancelBtn)
-        cancelBtn.snp.makeConstraints { make in
+        alertView.addSubview(cancelsBtn)
+        cancelsBtn.snp.makeConstraints { make in
             make.left.equalToSuperview().offset((KSreenWidth-adapt_length(length: 228))/3)
             make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
             make.width.equalTo(adapt_length(length: 84))
@@ -31,9 +31,13 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         tableView.tableFooterView = UIView.init()
         tableView.separatorStyle = .none
         tableView.scrollsToTop = false
+        if #available(iOS 11.0, *) {
+            tableView.contentInsetAdjustmentBehavior = .never;
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = false;
+        }
         tableView.showsVerticalScrollIndicator = false
         tableView.showsHorizontalScrollIndicator = false
-        tableView.contentInsetAdjustmentBehavior = .never;
         tableView.register(CNLiveShortVideoListTableViewCell.self, forCellReuseIdentifier: kVideoBodyListViewCellIdentifier)
         return tableView
     }()
@@ -50,6 +54,13 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         return controlView
     }()
+    lazy var headerRefreshView: UIRefreshControl = {
+        let headerRefreshView = UIRefreshControl()
+        headerRefreshView.tintColor = .white
+        headerRefreshView.addTarget(self, action: #selector(headerRefresh), for: .valueChanged)
+        return headerRefreshView
+    }()
+    
     lazy var dataArray: NSMutableArray = {
         let dataArray = NSMutableArray.init()
         return dataArray
@@ -62,7 +73,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     var aid: String! = ""
     var pageNum: NSInteger! = 1
     var currentIndex: NSInteger! = 0
-    var headerRefreshView: CNLiveHeaderRefresh!
     var footerRefreshView: CNLiveFooterRefresh!
     var playerManager = ZFIJKPlayerManager.init()
 //    var playerManager = ZFAVPlayerManager.init()
@@ -115,16 +125,13 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             guard let self = self else { return }
             self.player.currentPlayerManager.replay()
         }
-        player.playerPrepareToPlay = {[weak self] asset, assetURL in
+        player.playerReadyToPlay = {[weak self] asset, assetURL in
             guard let self = self else { return }
             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
-            let indexPath = IndexPath(row: index, section: 0)
-            let cell: CNLiveShortVideoListTableViewCell = self.tableView.cellForRow(at: indexPath) as! CNLiveShortVideoListTableViewCell
-            cell.hiddenView(isHidden: homeModel.product!.albumProductType != "0")
             if (homeModel.product!.albumProductType != "0") {
-                self.player.stopCurrentPlayingCell()
+                (self.player)!.stopCurrentPlayingCell()
             }
         }
         // 更新另一个控制层的时间
@@ -148,11 +155,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     }
     func addRefreshView() {
-        headerRefreshView = CNLiveHeaderRefresh(refreshingBlock: { [weak self] in
-            guard let self = self else { return }
-            self.pageNum = 1
-            self.requestData {}
-        })
+        self.tableView.refreshControl = headerRefreshView
         footerRefreshView = CNLiveFooterRefresh(refreshingBlock: { [weak self] in
             guard let self = self else { return }
             self.player.stopCurrentPlayingCell()
@@ -161,6 +164,11 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         })
     }
+    @objc func headerRefresh() {
+        self.pageNum = 1
+        self.requestData {}
+    }
+    
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
         self.backBtn.frame = CGRectMake(15, CGRectGetMaxY(UIApplication.shared.statusBarFrame), 45, 45)
@@ -173,16 +181,22 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                 if self.pageNum == 1 {
                     self.dataArray.removeAllObjects()
                     self.dataURLArray.removeAllObjects()
+                    if self.currentIndex == 0 {
+                        self.tableView.setContentOffset(CGPoint.zero, animated: false)
+                    }
                 }
                 let listArray = (result as! [Any]).first as! [CNLiveAlbumListModel]
                 self.dataArray.addObjects(from: listArray)
                 let urlArray = (result as! [Any]).last as! [String]
                 self.dataURLArray.addObjects(from: urlArray)
-                if self.tableView.mj_header != nil && self.tableView.mj_footer != nil {
+                if self.tableView.mj_footer != nil {
                     self.tableView.mj_footer?.endRefreshing()
-                    self.tableView.mj_header?.endRefreshing()
                 }
+                self.tableView.refreshControl?.endRefreshing()
                 self.tableView.reloadData()
+                DispatchQueue.main.async {
+                    self.tableView.contentOffset = CGPoint.zero
+                }
                 let hasNextPage = (result as! [Any])[1] as! Bool
                 if listArray.count == 0 && urlArray.count == 0 {
                     if !hasNextPage {
@@ -190,9 +204,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                         self.tableView.reloadData()
                     }
                 } else {
-                    if self.tableView.mj_header == nil {
-                        self.tableView.mj_header = headerRefreshView
-                    }
                     if self.tableView.mj_footer == nil  {
                         self.tableView.mj_footer = footerRefreshView
                     }
@@ -201,10 +212,11 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                     self.playTheIndex(index: self.currentIndex)
                 }
             } else {
-                if self.tableView.mj_header != nil && self.tableView.mj_footer != nil {
+                if self.tableView.mj_footer != nil {
                     self.tableView.mj_footer?.endRefreshing()
-                    self.tableView.mj_header?.endRefreshing()
                 }
+                self.tableView.contentOffset = CGPoint.zero
+                self.tableView.refreshControl?.endRefreshing()
                 if self.dataArray.count == 0 {
                     self.tableView.reloadEmptyDataSet()
                 }
@@ -268,12 +280,20 @@ extension CNLiveShortVideoViewController {
         CNLiveShortVideoViewModel.requestRankWithLike(contentId: viewcell.homeModel.pid, contentTitle: viewcell.homeModel.title, contentSid: viewcell.homeModel.icon!.id, support: viewcell.homeModel.tool!.liked, tagName: viewcell.homeModel.tagName) {result, respStatue in
             if respStatue == .success {
                 viewcell.homeModel.tool!.liked = !viewcell.homeModel.tool!.liked
+                if viewcell.homeModel.tool!.liked {
+                    viewcell.homeModel.tool?.likesNum = "\(Int(viewcell.homeModel.tool!.likesNum)! + 1)"
+                } else {
+                    viewcell.homeModel.tool?.likesNum = "\(Int(viewcell.homeModel.tool!.likesNum)! - 1)"
+                }
+                button.setTitle(viewcell.homeModel.tool?.likesNum, for: .normal)
                 button.isSelected = viewcell.homeModel.tool!.liked
             }
         }
     }
     func commentActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
-        
+        CNLiveShortVideoCommentListView.showVideoCommentListView(pid: viewcell.homeModel.pid, contentSid: viewcell.homeModel.icon!.id, result: { commentModel in
+            
+        })
     }
     func shareActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
@@ -323,8 +343,8 @@ extension CNLiveShortVideoViewController {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kVideoBodyListViewCellIdentifier) as? CNLiveShortVideoListTableViewCell else {
             return CNLiveShortVideoListTableViewCell()
         }
-        cell.setupWithData(model: dataArray[indexPath.row] as! CNLiveAlbumListModel)
         cell.delegate = self
+        cell.setupWithData(model: dataArray[indexPath.row] as! CNLiveAlbumListModel)
         return cell
     }
-//
-//  CNLiveShortVideoCommentLayout.swift
-//  metaCode
-//
-//  Created by open on 2024/1/9.
-//
-
-import Foundation
@@ -6,17 +6,31 @@
 //
 import Foundation
-
+import YYText
+import CNLiveBusinessTools
 //!!!: 评论相关 model
 class ShortVideoHomeCommentModel: BaseModel {
     var total_hd: Int? = 0 //总数
-    var hasNext: String? = ""
+    var hasNext: Bool? = false
     var comments = [ShortVideoHomeCommentListModel]()
 }
 class ShortVideoHomeCommentListModel: BaseModel {
     var comment = ShortVideoHomeCommentFListModel()
     var replyData = ShortVideoHomeCommentRListModel()
+    
+    var cell_h: CGFloat! = 0.0
+    var tableView_h: CGFloat! = 0.0
+    override func didFinishMapping() {
+        super.didFinishMapping()
+        cell_h += comment.cellH
+        cell_h += 10
+        for replyModel in replyData.replys {
+            tableView_h += replyModel.cellH
+        }
+        cell_h += tableView_h
+    }
+    
 }
 //评论数据
 class ShortVideoHomeCommentFListModel: BaseModel {
@@ -37,6 +51,26 @@ class ShortVideoHomeCommentFListModel: BaseModel {
     var praiseCount: Int? = 0
     var isPraised: Bool? = false
     var icon: String? = ""
+    
+    var iconSize: CGSize = CGSize(width: 50, height: 50)
+    var textLayout: YYTextLayout!
+    var cellH: CGFloat! = 0
+    
+    override func didFinishMapping() {
+        super.didFinishMapping()
+        
+        let modifier = CNLiveShortVideoMateCodeLinePositionModifier(font: medium_adapt_font(pointSize: 16), paddingTop: 5, paddingBottom: 5, lineHeightMultiple: 2)
+        let comment = CNLiveBusinessTools.replaceQQemoji(withCustomText: self.content ?? "")
+        let attributes = NSMutableAttributedString(attributedString: comment)
+        attributes.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor.white, range: NSRange(location: 0, length: comment.length))
+        attributes.addAttribute(NSAttributedString.Key.font, value: medium_adapt_font(pointSize: 16), range: NSRange(location: 0, length: comment.length))
+        let textContainer = YYTextContainer(size: CGSize(width: KSreenWidth-80, height: CGFloat(HUGE)))
+        textContainer.linePositionModifier = modifier;
+        let textLayout = YYTextLayout(container: textContainer, text: attributes)
+        self.textLayout = textLayout
+        self.cellH = 70 + (textLayout?.textBoundingRect.size.height ?? 0)
+    }
+    
 }
 //回复数据
 class ShortVideoHomeCommentRListModel: BaseModel {
@@ -62,4 +96,76 @@ class ShortVideoHomeCommentRListItemModel: BaseModel {
     var content: String? = ""
     var level: Int? = 0
     var icon: String? = ""
+    
+    var textLayout: YYTextLayout!
+    var cellH: CGFloat! = 0
+    
+    override func didFinishMapping() {
+        super.didFinishMapping()
+        
+        let modifier = CNLiveShortVideoMateCodeLinePositionModifier(font: semibold_adapt_font(pointSize: 14), paddingTop: 0, paddingBottom: 0, lineHeightMultiple: 1.5)
+        let comment = CNLiveBusinessTools.replaceQQemoji(withCustomText: content ?? "")
+        let attributes = NSMutableAttributedString(attributedString: comment)
+        attributes.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor.white, range: NSRange(location: 0, length: comment.length))
+        attributes.addAttribute(NSAttributedString.Key.font, value: medium_adapt_font(pointSize: 16), range: NSRange(location: 0, length: comment.length))
+        let textContainer = YYTextContainer(size: CGSize(width: KSreenWidth-80-40, height: CGFloat(HUGE)))
+        textContainer.linePositionModifier = modifier;
+        let textLayout = YYTextLayout(container: textContainer, text: attributes)
+        self.textLayout = textLayout
+        self.cellH = 70 + (textLayout?.textBoundingRect.size.height ?? 0)
+    }
+}
+
+class CNLiveShortVideoMateCodeLinePositionModifier: NSObject, YYTextLinePositionModifier {
+    
+    var font: UIFont // 基准字体 (例如 Heiti SC/PingFang SC)
+    var paddingTop: CGFloat // 文本顶部留白
+    var paddingBottom: CGFloat // 文本底部留白
+    var lineHeightMultiple: CGFloat // 行距倍数
+
+    init(font: UIFont, paddingTop: CGFloat, paddingBottom: CGFloat, lineHeightMultiple: CGFloat) {
+        self.font = font
+        self.paddingTop = paddingTop
+        self.paddingBottom = paddingBottom
+        self.lineHeightMultiple = lineHeightMultiple
+        super.init()
+        
+        if #available(iOS 9.0, *) {
+            self.lineHeightMultiple = 1.34 // for PingFang SC
+        } else {
+            self.lineHeightMultiple = 1.3125 // for Heiti SC
+        }
+    }
+    
+    func modifyLines(_ lines: [YYTextLine], fromText text: NSAttributedString, in container: YYTextContainer) {
+        let ascent = font.pointSize * 0.86
+        let lineHeight = font.pointSize * lineHeightMultiple
+
+        for item in lines {
+            let line = item as YYTextLine
+            var position = line.position
+            position.y = paddingTop + ascent + CGFloat(line.row) * lineHeight
+            line.position = position
+        }
+    }
+
+    func copy(with zone: NSZone? = nil) -> Any {
+        let one = CNLiveShortVideoMateCodeLinePositionModifier(
+            font: font,
+            paddingTop: paddingTop,
+            paddingBottom: paddingBottom,
+            lineHeightMultiple: lineHeightMultiple
+        )
+        return one
+    }
+
+    func heightForLineCount(_ lineCount: UInt) -> CGFloat {
+        if lineCount == 0 {
+            return 0
+        }
+        let ascent = font.pointSize * 0.86
+        let descent = font.pointSize * 0.14
+        let lineHeight = font.pointSize * lineHeightMultiple
+        return paddingTop + paddingBottom + ascent + descent + CGFloat(lineCount - 1) * lineHeight
+    }
 }
@@ -6,7 +6,516 @@
 //
 import Foundation
+import EmptyDataSet_Swift
+import MJRefresh
+import CNLiveCustomUI
+import Kingfisher
+import YYText
+import APButton
+typealias CloseCommentListResultBlock = (_ commentModel: Any) ->Void
+class CNLiveShortVideoCommentListView: UIView, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
+    
+    lazy var grayMaskView: UIView = {
+       let grayMaskView = UIView()
+       grayMaskView.backgroundColor = UIColor.black.withAlphaComponent(0.2)
+       return grayMaskView
+    }()
+    
+    lazy var contentView: UIView = {
+        let view = UIView.init()
+        view.backgroundColor = HexColor("#010101")
+        return view
+    }()
+    
+    lazy var closeButton: UIButton = {
+        let button = UIButton(type: .custom)
+        button.setImage(UIImage(named: "short_video_close"), for: .normal)
+        button.backgroundColor = .clear
+        button.addTarget(self, action: #selector(closeMethod), for: .touchUpInside)
+        return button
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.white
+        label.font = semibold_adapt_font(pointSize: 19)
+        label.textAlignment = .left
+        label.text = "0条评论"
+        label.numberOfLines = 1
+        label.lineBreakMode = .byTruncatingTail
+        return label
+    }()
+    
+    lazy var sendButton: UIButton = {
+        let button = UIButton(type: .custom)
+        button.backgroundColor = HexColor("#f8f8f8")
+        button.setTitle("我来说一下...", for: .normal)
+        button.layer.cornerRadius = 20
+        button.layer.masksToBounds = true
+        button.titleLabel?.font = medium_adapt_font(pointSize: 15)
+        button.setTitleColor(UIColor.lightGray, for: .normal)
+        button.addTarget(self, action: #selector(sendCommentAction), for: .touchUpInside)
+        return button
+    }()
+    
+    lazy var emjButton: UIButton = {
+        let button = UIButton(type: .custom)
+        button.setImage(UIImage(named: "short_video_commet_emoji"), for: .normal)
+        button.backgroundColor = .clear
+        button.layer.cornerRadius = 20
+        button.layer.masksToBounds = true
+        button.addTarget(self, action: #selector(sendCommentAction), for: .touchUpInside)
+        return button
+    }()
+    
+    
+    lazy var lineLabel: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#686868")
+        return lineLabel
+    }()
+    
+    let kShortVideoCommentListTableViewCellIdentifier = "kShortVideoCommentListTableViewCellIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
+        tableView.estimatedSectionFooterHeight = 0
+        tableView.estimatedSectionHeaderHeight = 0
+        tableView.backgroundColor = HexColor("#010101")
+        tableView.tableFooterView = UIView.init()
+        tableView.separatorStyle = .none
+        tableView.scrollsToTop = false
+        tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: get_system_tabbar_ui_offsetHeight(), right: 0)
+        tableView.contentInsetAdjustmentBehavior = .never;
+        tableView.register(CNLiveShortVideoCommentListTableViewCell.self, forCellReuseIdentifier: kShortVideoCommentListTableViewCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let array = NSMutableArray()
+        return array
+    }()
+    
+    var videoId: String!
+    var contentSid: String!
+    var pageNum: NSInteger! = 0
+    var footerRefreshView: CNLiveFooterRefresh!
+    var resultBlock: CloseCommentListResultBlock!
+    
+    func requestDataSource() {
+        CNLiveShortVideoViewModel.requestCommentList(pid: self.videoId, page: self.pageNum) {[weak self] result, respStatue in
+            guard let self = self else { return }
+            if respStatue == .success {
+                if self.pageNum == 0 {
+                    self.dataArray.removeAllObjects()
+                }
+                let listArray = (result as! ShortVideoHomeCommentModel).comments
+                self.dataArray.addObjects(from: listArray)
+                self.titleLabel.text = "\((result as! ShortVideoHomeCommentModel).total_hd ?? 0)条评论"
+                if self.tableView.mj_footer != nil {
+                    self.tableView.mj_footer?.endRefreshing()
+                }
+                self.tableView.mj_header?.endRefreshing()
+                self.tableView.reloadData()
+                let hasNextPage = (result as! ShortVideoHomeCommentModel).hasNext!
+                if !hasNextPage {
+                    self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    self.tableView.reloadData()
+                } else {
+                    if self.tableView.mj_footer == nil  {
+                        self.tableView.mj_footer = footerRefreshView
+                    }
+                }
+            } else {
+                if self.tableView.mj_footer != nil {
+                    self.tableView.mj_footer?.endRefreshing()
+                }
+                self.tableView.mj_header?.endRefreshing()
+                if self.dataArray.count == 0 {
+                    self.tableView.reloadEmptyDataSet()
+                }
+            }
+        }
+    }
+    
+    func addRefreshView() {
+        self.tableView.mj_header = CNLiveHeaderRefresh(refreshingBlock: { [weak self] in
+            guard let self = self else { return }
+            self.pageNum = 0
+            self.requestDataSource()
+        })
+        footerRefreshView = CNLiveFooterRefresh(refreshingBlock: { [weak self] in
+            guard let self = self else { return }
+            self.pageNum += 1
+            self.requestDataSource()
+        })
+    }
+
+    init(frame: CGRect, pid: String, toSid: String) {
+        super.init(frame: frame)
+
+        videoId = pid
+        contentSid = toSid
+        addRefreshView()
+        requestDataSource()
+        addSubview(grayMaskView)
+        grayMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        grayMaskView.addSubview(contentView)
+        contentView.snp.makeConstraints { make in
+            make.top.equalTo(250)
+            make.right.left.bottom.equalToSuperview()
+        }
+        contentView.addSubview(emjButton)
+        emjButton.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-10)
+            make.bottom.equalToSuperview().offset(-(10+get_system_tabbar_ui_offsetHeight()))
+            make.size.equalTo(40)
+        }
+        contentView.addSubview(sendButton)
+        sendButton.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(10)
+            make.right.equalTo(emjButton.snp.left).offset(-10)
+            make.bottom.equalToSuperview().offset(-(10+get_system_tabbar_ui_offsetHeight()))
+            make.height.equalTo(40)
+        }
+        contentView.addSubview(closeButton)
+        closeButton.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-15)
+            make.top.equalToSuperview().offset(15)
+            make.size.equalTo(30)
+        }
+        contentView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.left.equalToSuperview().offset(20)
+            make.right.equalTo(closeButton.snp.left).offset(-10)
+        }
+        contentView.addSubview(lineLabel)
+        lineLabel.snp.makeConstraints { make in
+            make.top.equalTo(closeButton.snp.bottom).offset(15)
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(1)
+        }
+        contentView.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(lineLabel.snp.bottom).offset(10)
+            make.bottom.equalTo(sendButton.snp.top).offset(-5)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func closeMethod() {
+        removeFromSuperview()
+    }
+    
+    @objc func sendCommentAction(button: UIButton) {
+
+        CNLiveContentToolTextView.showCommentViewForCustom(withCommType: .comment, fromNick: "", firstRespFace: button == self.emjButton, successBlcok: {[weak self] commentString, toolbarView in
+            guard let self = self else { return }
+            print("评论内容\(commentString ?? "")")
+            CNLiveShortVideoViewModel.requestCommentWithSend(videoId: self.videoId, comment: commentString ?? "", isAuthor: UserInfoManager.shared.userInfo.uid == self.contentSid) { result, respStatue in
+                if respStatue == .success {
+                    showMessage(message: result as! String)
+                    self.tableView.mj_header?.beginRefreshing()
+                }
+            }
+        }, dissBlock: { toolbarView in
+            
+        })
+    }
+    
+    static public func showVideoCommentListView(pid: String,contentSid: String,result: @escaping CloseCommentListResultBlock) {
+        
+        let commentView = CNLiveShortVideoCommentListView.init(frame: CGRect.zero, pid: pid, toSid: contentSid)
+        commentView.resultBlock = result
+        
+        let delegate = UIApplication.shared.delegate as! AppDelegate
+        delegate.window?.addSubview(commentView)
+        commentView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        delegate.window?.layoutIfNeeded()
+        commentView.alpha = 0
+        UIView.animate(withDuration: 0.1) {
+            commentView.alpha = 1
+        } completion: { _ in}
+    }
+}
+
+extension CNLiveShortVideoCommentListView {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return dataArray.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShortVideoCommentListTableViewCellIdentifier) as? CNLiveShortVideoCommentListTableViewCell else {
+            return CNLiveShortVideoCommentListTableViewCell()
+        }
+        cell.setupWithDataSource(commentData: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).comment, replyData: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).replyData, tableView_h: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).tableView_h)
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        let model: ShortVideoHomeCommentListModel = dataArray[indexPath.row] as! ShortVideoHomeCommentListModel
+        return model.cell_h
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let model: ShortVideoHomeCommentFListModel = ((dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).comment)
+        self.resultBlock(model)
+    }
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        return UIImage(named: "short_video_default")
+    }
+}
+
+class CNLiveShortVideoCommentListTableViewCell: UITableViewCell, UITableViewDelegate, UITableViewDataSource {
+    
+    lazy var iconView: UIImageView = {
+        let imageView = UIImageView.init()
+        imageView.image = UIImage(named: "short_video_default")
+        imageView.contentMode = .scaleAspectFill
+        imageView.layer.cornerRadius = 20
+        imageView.layer.masksToBounds = true
+        imageView.clipsToBounds = true
+        return imageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.textColor = .white
+        titleLabel.lineBreakMode = .byTruncatingTail
+        titleLabel.numberOfLines = 2
+        titleLabel.font = medium_adapt_font(pointSize: 12)
+        return titleLabel
+    }()
+    
+    lazy var commentLabel: YYLabel = {
+        let commentLabel = YYLabel()
+        commentLabel.textColor = .white
+        commentLabel.displaysAsynchronously = true
+        commentLabel.clearContentsBeforeAsynchronouslyDisplay = false
+        commentLabel.fadeOnAsynchronouslyDisplay = false
+        commentLabel.font = medium_adapt_font(pointSize: 16)
+        commentLabel.numberOfLines = 0
+        commentLabel.textAlignment = .left
+        commentLabel.textVerticalAlignment = .center
+        commentLabel.textContainerInset = UIEdgeInsets.zero
+        commentLabel.isUserInteractionEnabled = true
+        return commentLabel
+    }()
+    
+    lazy var timeLabel: UILabel = {
+        let timeLabel = UILabel.init()
+        timeLabel.textColor = .white
+        timeLabel.font = light_adapt_font(pointSize: 13)
+        return timeLabel
+    }()
+    
+    lazy var replyButton: UIButton = {
+        let replyButton = APButton()
+        replyButton.setTitleColor(.white, for: .normal)
+        replyButton.activityIndicator.color = .white
+        replyButton.backgroundColor = .clear
+        replyButton.setTitle("回复", for: .normal)
+        replyButton.titleLabel?.font = medium_adapt_font(pointSize: 13)
+        replyButton.addTarget(self, action: #selector(replyMethod), for: .touchUpInside)
+        return replyButton
+    }()
+    
+    lazy var likeButton: QMUIButton = {
+        let button = QMUIButton()
+        button.imagePosition = .left
+        button.spacingBetweenImageAndTitle = 2.5
+        button.setTitleColor(UIColor.white, for: .normal)
+        button.setTitle("0", for: .normal)
+        button.imageView?.contentMode = .scaleAspectFit
+        button.setImage(UIImage(named: "short_video_zan_nomal"), for: .normal)
+        button.setImage(UIImage(named: "short_video_zan_select"), for: .selected)
+        button.titleLabel?.font = regular_adapt_font(pointSize: 14)
+        button.addTarget(self, action: #selector(likeActionMethod), for: .touchUpInside)
+        return button
+    }()
+    
+    let kShortVideoReplyListTableViewCellIdentifier = "kShortVideoReplyListTableViewCellIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.estimatedSectionFooterHeight = 0
+        tableView.estimatedSectionHeaderHeight = 0
+        tableView.backgroundColor = HexColor("#010101")
+        tableView.tableFooterView = UIView.init()
+        tableView.separatorStyle = .none
+        tableView.scrollsToTop = false
+        tableView.register(CNLiveShortVideoCommentListTableViewCell.self, forCellReuseIdentifier: kShortVideoReplyListTableViewCellIdentifier)
+        return tableView
+    }()
+    
+    var commentModel: ShortVideoHomeCommentFListModel!
+    var replyModel: ShortVideoHomeCommentRListModel!
+    var replyItemModel: ShortVideoHomeCommentRListItemModel!
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        backgroundColor = .clear
+        selectionStyle = .none
+        let isReply = reuseIdentifier == kShortVideoReplyListTableViewCellIdentifier
+        
+        contentView.addSubview(iconView)
+        iconView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(10)
+            make.left.equalToSuperview().offset(isReply ? 0 : 10)
+            make.size.equalTo(40)
+        }
+        contentView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(iconView.snp.right).offset(10)
+            make.top.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(20)
+        }
+        contentView.addSubview(commentLabel)
+        commentLabel.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(10)
+            make.left.equalTo(titleLabel.snp.left)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(20)
+        }
+        contentView.addSubview(likeButton)
+        likeButton.snp.makeConstraints { make in
+            if isReply {
+                make.right.equalToSuperview()
+            } else {
+                make.right.equalToSuperview().offset(-10)
+            }
+            make.height.equalTo(20)
+            make.width.equalTo(30)
+            make.top.equalTo(commentLabel.snp.bottom).offset(10)
+        }
+        contentView.addSubview(timeLabel)
+        timeLabel.snp.makeConstraints { make in
+            make.top.equalTo(commentLabel.snp.bottom).offset(10)
+            make.left.equalTo(titleLabel.snp.left)
+            make.height.equalTo(20)
+        }
+        contentView.addSubview(replyButton)
+        replyButton.snp.makeConstraints { make in
+            make.left.equalTo(timeLabel.snp.right).offset(10)
+            make.height.equalTo(20)
+            make.width.equalTo(40)
+            make.top.equalTo(commentLabel.snp.bottom).offset(10)
+        }
+        contentView.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(60)
+            make.right.equalToSuperview()
+            make.top.equalTo(timeLabel.snp.bottom).offset(10)
+            make.height.equalTo(0.01)
+        }
+    }
+    
+    func setupWithDataSource(commentData: ShortVideoHomeCommentFListModel, replyData: ShortVideoHomeCommentRListModel, tableView_h: CGFloat) {
+        replyModel = replyData
+        commentModel = commentData
+        iconView.kf.indicatorType = .activity
+        iconView.kf.setImage(with: URL(string: commentData.icon!), placeholder: UIImage(named: "short_video_default"))
+        titleLabel.text = commentData.nick
+        likeButton.isSelected = commentData.isPraised!
+        likeButton.setTitle(commentData.praise, for: .normal)
+        timeLabel.text = commentData.created_at
+        DispatchQueue.main.async {[weak self] in
+            guard let self = self else { return }
+            self.commentLabel.textLayout = commentData.textLayout
+            self.commentLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.titleLabel.snp.bottom).offset(10)
+                make.left.equalTo(self.iconView.snp.right).offset(10)
+                make.right.equalToSuperview().offset(-10)
+                make.height.equalTo(commentData.textLayout.textBoundingRect.size.height)
+            }
+        }
+        if replyData.replys.count > 0 {
+            tableView.reloadData()
+            tableView.snp.remakeConstraints { make in
+                make.left.equalToSuperview().offset(60)
+                make.right.equalToSuperview()
+                make.top.equalTo(timeLabel.snp.bottom).offset(10)
+                make.height.equalTo(tableView_h)
+            }
+        }
+    }
+    
+    func setupWithReplyModel(  replyModel: ShortVideoHomeCommentRListItemModel) {
+        iconView.kf.indicatorType = .activity
+        iconView.kf.setImage(with: URL(string: replyModel.fromFace!), placeholder: UIImage(named: "short_video_default"))
+        titleLabel.text = replyModel.fromNick
+        likeButton.isSelected = replyModel.isPraised!
+        likeButton.setTitle("\(replyModel.praiseCount ?? 0)", for: .normal)
+        timeLabel.text = replyModel.created_at
+        DispatchQueue.main.async {[weak self] in
+            guard let self = self else { return }
+            self.commentLabel.textLayout = replyModel.textLayout
+            self.commentLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.titleLabel.snp.bottom).offset(10)
+                make.left.equalTo(self.iconView.snp.right).offset(10)
+                make.right.equalToSuperview().offset(-10)
+                make.height.equalTo(replyModel.textLayout.textBoundingRect.size.height)
+            }
+        }
+    }
+    
+    @objc func likeActionMethod() {
+        
+    }
+    
+    @objc func replyMethod() {
+        CNLiveContentToolTextView.showCommentViewForCustom(withCommType: .reply, fromNick: commentModel == nil ? replyItemModel.fromNick : commentModel.nick, firstRespFace: false, successBlcok: {[weak self] commentString, toolbarView in
+            guard let self = self else { return }
+            CNLiveShortVideoViewModel.requestCommentWithReply(commentId: self.commentModel.commentId!, comment: commentString ?? "", toSid: commentModel.uid!, fromSid: UserInfoManager.shared.userInfo.uid, level: "1") { result, respStatue in
+                if respStatue == .success {
+                    showMessage(message: result as! String)
+                    var replyItemModel = ShortVideoHomeCommentRListItemModel()
+                    
+                }
+            }
+        }, dissBlock: { toolbarView in
+            
+        })
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
-class CNLiveShortVideoCommentListView: UIView {
+extension CNLiveShortVideoCommentListTableViewCell {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return replyModel == nil ? 0 : replyModel.replys.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShortVideoReplyListTableViewCellIdentifier) as? CNLiveShortVideoCommentListTableViewCell else {
+            return CNLiveShortVideoCommentListTableViewCell()
+        }
+        cell.setupWithReplyModel(replyModel: replyModel.replys[indexPath.row] )
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        let model: ShortVideoHomeCommentRListItemModel = replyModel.replys[indexPath.row]
+        return model.cellH
+    }
 }
@@ -37,7 +37,6 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
         label.textAlignment = .left
         label.numberOfLines = 1
         label.lineBreakMode = .byTruncatingTail
-        label.text = "爱得供养"
         return label
     }()
@@ -28,6 +28,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         label.font = semibold_adapt_font(pointSize: 19)
         label.textAlignment = .left
         label.numberOfLines = 1
+        label.isHidden = true
         label.lineBreakMode = .byTruncatingTail
         return label
     }()
@@ -38,6 +39,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         label.font = regular_adapt_font(pointSize: 15)
         label.textAlignment = .left
         label.numberOfLines = 3
+        label.isHidden = true
         label.lineBreakMode = .byTruncatingTail
         return label
     }()
@@ -74,6 +76,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         button.layer.masksToBounds = true
         button.layer.borderColor = UIColor.white.cgColor
         button.layer.borderWidth = 1
+        button.isHidden = true
         button.backgroundColor = .clear
         button.addTarget(self, action: #selector(iconMothod), for: .touchUpInside)
         return button
@@ -84,6 +87,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         button.setImage(UIImage(named: "short_video_guan_zhu"), for: .normal)
         button.layer.cornerRadius = 10
         button.layer.masksToBounds = true
+        button.isHidden = true
         button.backgroundColor = .clear
         button.activityIndicator.color = .white
         button.addTarget(self, action: #selector(faviMothod), for: .touchUpInside)
@@ -102,7 +106,8 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         let button = ImageButton(type: .custom)
         button.setImage(UIImage(named: "short_video_zan_nomal"), for: .normal)
         button.setImage(UIImage(named: "short_video_zan_select"), for: .selected)
-        button.setTitle("22.8w", for: .normal)
+        button.setTitle("0", for: .normal)
+        button.isHidden = true
         button.setTitleColor(.white, for: .normal)
         button.titleLabel?.font = light_adapt_font(pointSize: 15)
         button.addTarget(self, action: #selector(likeMothod), for: .touchUpInside)
@@ -112,7 +117,8 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
     lazy var commentBtn: ImageButton = {
         let button = ImageButton(type: .custom)
         button.setImage(UIImage(named: "short_video_comment"), for: .normal)
-        button.setTitle("232.8w", for: .normal)
+        button.setTitle("0", for: .normal)
+        button.isHidden = true
         button.setTitleColor(.white, for: .normal)
         button.titleLabel?.font = light_adapt_font(pointSize: 15)
         button.addTarget(self, action: #selector(commentMothod), for: .touchUpInside)
@@ -122,7 +128,8 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
     lazy var shareBtn: ImageButton = {
         let button = ImageButton(type: .custom)
         button.setImage(UIImage(named: "short_video_share"), for: .normal)
-        button.setTitle("0.8w", for: .normal)
+        button.setTitle("0", for: .normal)
+        button.isHidden = true
         button.setTitleColor(.white, for: .normal)
         button.titleLabel?.font = light_adapt_font(pointSize: 15)
         button.addTarget(self, action: #selector(shareMothod), for: .touchUpInside)
@@ -181,6 +188,8 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         descLabel.text = model.title
         listBtn.setTitle(model.albumMsgModel?.albumName, for: .normal)
+        hiddenView(isHidden: homeModel.product!.albumProductType != "0")
+        
         let imageV: UIImageView = payView.viewWithTag(1000) as! UIImageView
         imageV.kf.indicatorType = .activity
         imageV.kf.setImage(with: URL(string: model.poster))
@@ -188,6 +197,37 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         titleL.text = model.title
         let timeL: UILabel = payView.viewWithTag(1002) as! UILabel
         timeL.text = model.duration
+        let payButton: APButton = payView.viewWithTag(1003) as! APButton
+        if model.product?.albumProductType != "0" {
+            payButton.setTitle("\(model.product!.point)积分解锁全集", for: .normal)
+        }
+//        if model.product?.albumProductType == "2" {
+//            payButton.setTitle("\(Double(model.product!.iosOriginalRmb)!/100.0)元解锁全集", for: .normal)
+//        }
+    }
+    
+    open func hiddenView(isHidden: Bool) {
+        if (isHidden) {
+            self.commentBtn.isHidden = true
+            self.faviBtn.isHidden = true
+            self.shareBtn.isHidden = true
+            self.likeBtn.isHidden = true
+            self.iconBtn.isHidden = true
+            self.titleLabel.isHidden = true
+            self.descLabel.isHidden = true
+            self.tipsLabel.isHidden = false
+            self.payView.isHidden = false
+        } else {
+            self.commentBtn.isHidden = false
+            self.faviBtn.isHidden = false
+            self.shareBtn.isHidden = false
+            self.likeBtn.isHidden = false
+            self.iconBtn.isHidden = false
+            self.titleLabel.isHidden = false
+            self.descLabel.isHidden = false
+            self.tipsLabel.isHidden = true
+            self.payView.isHidden = true
+        }
     }
     override func layoutSubviews() {
@@ -262,29 +302,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         }
     }
-    open func hiddenView(isHidden: Bool) {
-        if (isHidden) {
-            self.commentBtn.isHidden = true
-            self.faviBtn.isHidden = true
-            self.shareBtn.isHidden = true
-            self.likeBtn.isHidden = true
-            self.iconBtn.isHidden = true
-            self.titleLabel.isHidden = true
-            self.descLabel.isHidden = true
-            self.tipsLabel.isHidden = false
-            self.payView.isHidden = false
-        } else {
-            self.commentBtn.isHidden = false
-            self.faviBtn.isHidden = false
-            self.shareBtn.isHidden = false
-            self.likeBtn.isHidden = false
-            self.iconBtn.isHidden = false
-            self.titleLabel.isHidden = false
-            self.descLabel.isHidden = false
-            self.tipsLabel.isHidden = true
-            self.payView.isHidden = true
-        }
-    }
+    
     @objc func likeMothod(button: UIButton) {
         self.delegate.likeActionMethod(viewcell: self, button: button)
@@ -380,12 +398,11 @@ extension CNLiveShortVideoListTableViewCell {
         }
         let payButton = APButton()
-        payButton.setTitle("840积分解锁全42集", for: .normal)
         payButton.setTitleColor(.white, for: .normal)
         payButton.layer.cornerRadius = 20
         payButton.activityIndicator.color = .white
         payButton.layer.masksToBounds = true
-        payButton.viewWithTag(1003)
+        payButton.tag = 1003
         payButton.backgroundColor = HexColor("#67C5FF")
         payButton.titleLabel?.font = medium_adapt_font(pointSize: 15)
         payButton.addTarget(self, action: #selector(payMethod), for: .touchUpInside)
@@ -7,7 +7,7 @@
 import Foundation
 import CNLiveRequestBastKit
-
+import QMUIKit
 typealias resultShortVideoBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
 class CNLiveShortVideoViewModel: NSObject {
@@ -46,6 +46,9 @@ class CNLiveShortVideoViewModel: NSObject {
                                 for item in array {
                                     let listModel = dictionaryToModel(item as! [String : Any], CNLiveAlbumListModel.self,"") as! CNLiveAlbumListModel
                                     listModel.albumMsgModel = result as? CNLiveAlbumMsgModel
+                                    /////测试使用 临时的
+                                    listModel.product?.albumProductType = "0"
+                                    
                                     tempArray.add(listModel)
                                     tempUrlArray.add(listModel.videoUrl as String)
                                 }
@@ -132,17 +135,17 @@ class CNLiveShortVideoViewModel: NSObject {
     static func requestRankWithLike(contentId: String, contentTitle: String, contentSid: String, support: Bool,tagName: String,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
         param.setValue(contentId, forKey: "contentId")
-        param.setValue(APPId_wjj, forKey: "appId")
+        param.setValue(APPId, forKey: "appId")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
-        param.setValue(contentId, forKey: "contentTitle")
+        param.setValue(contentTitle, forKey: "contentTitle")
         param.setValue(contentSid, forKey: "contentSid")
         param.setValue(support ? "1":"0", forKey: "support")
         param.setValue("false", forKey: "isRank")
         param.setValue("1", forKey: "isUgc")
         param.setValue(tagName, forKey: "contentTag")
         let custom_param = NSMutableDictionary()
-        custom_param.setValue(APPId_wjj, forKey: "appId")
-        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
@@ -179,16 +182,19 @@ class CNLiveShortVideoViewModel: NSObject {
     static func requestCommentList(pid: String,page: NSInteger,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
         param.setValue(pid, forKey: "topicId")
+        param.setValue("i", forKey: "plat")
+        param.setValue(APPId, forKey: "appId")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("\(page)", forKey: "seqId")
         param.setValue("10", forKey: "count")
         let custom_param = NSMutableDictionary()
-        custom_param.setValue(APPId_wjj, forKey: "appId")
-        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
-        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSClassUrl+"/ugcApi/ugcVideoList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseTokenUrl+"/commentServices/commentForUgc/loadUgcComments", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -225,17 +231,20 @@ class CNLiveShortVideoViewModel: NSObject {
     static func requestCommentWithSend(videoId: String, comment: String, isAuthor: Bool,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
         param.setValue(videoId, forKey: "topicId")
-        param.setValue(APPId_wjj, forKey: "appId")
-        param.setValue(comment, forKey: "comment")
-        param.setValue(isAuthor ? "1":"0", forKey: "isAuthor")
+        param.setValue(APPId, forKey: "appId")
+        param.setValue("i", forKey: "plat")
+        param.setValue(comment.qmui_trim, forKey: "comment")
+        param.setValue(isAuthor ? "1" :  "0", forKey: "isAuthor")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         let custom_param = NSMutableDictionary()
-        custom_param.setValue(APPId_wjj, forKey: "appId")
-        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(false)
+        CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseTokenUrl+"/commentServices/commentForUgc/insertComment", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseTokenUrl+"/commentServices/commentForUgc/insertComment", param: param as? [AnyHashable : Any], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -270,15 +279,15 @@ class CNLiveShortVideoViewModel: NSObject {
     static func requestCommentWithReply(commentId: String, comment: String, toSid: String, fromSid: String, level: String,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
         param.setValue(commentId, forKey: "commentId")
-        param.setValue(APPId_wjj, forKey: "appId")
+        param.setValue(APPId, forKey: "appId")
         param.setValue(comment, forKey: "comment")
         param.setValue(toSid, forKey: "toSid")
         param.setValue(fromSid, forKey: "fromSid")
         param.setValue(level, forKey: "level")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         let custom_param = NSMutableDictionary()
-        custom_param.setValue(APPId_wjj, forKey: "appId")
-        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
@@ -314,15 +323,15 @@ class CNLiveShortVideoViewModel: NSObject {
     static func requestcommentWithReplyList(commentId: String,page: NSInteger,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
         param.setValue(commentId, forKey: "commentId")
-        param.setValue("\(page)", forKey: "seqId")
+        param.setValue("\(page)", forKey: "seqId")//从 0 开始
         param.setValue("10", forKey: "count")
         let custom_param = NSMutableDictionary()
-        custom_param.setValue(APPId_wjj, forKey: "appId")
-        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseCMSClassUrl+"/commentServices/commentForUgc/loadReplys", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseTokenUrl+"/commentServices/commentForUgc/loadReplys", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -365,12 +374,12 @@ class CNLiveShortVideoViewModel: NSObject {
     static func requestCommentDelete(videoId: String, commentId: String, reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
         param.setValue(commentId, forKey: "commentId")
-        param.setValue(APPId_wjj, forKey: "appId")
+        param.setValue(APPId, forKey: "appId")
         param.setValue(videoId, forKey: "topicId")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         let custom_param = NSMutableDictionary()
-        custom_param.setValue(APPId_wjj, forKey: "appId")
-        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
@@ -405,12 +414,12 @@ class CNLiveShortVideoViewModel: NSObject {
     static func requestCommentReplyDelete(replyId: String, commentId: String, reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
         param.setValue(commentId, forKey: "commentId")
-        param.setValue(APPId_wjj, forKey: "appId")
+        param.setValue(APPId, forKey: "appId")
         param.setValue(replyId, forKey: "replyId")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         let custom_param = NSMutableDictionary()
-        custom_param.setValue(APPId_wjj, forKey: "appId")
-        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        custom_param.setValue(APPId, forKey: "appId")
+        custom_param.setValue(APPKey, forKey: "appKey")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "c_topic_chat_emoji@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "c_topic_chat_emoji@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}