专辑跳转方法添加

liushiyu
1 parent 70545b57
Showing 15 changed files with 770 additions and 400 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/CustomView/CNLiveRefresh.swift
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.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/CNLiveShortVideoCustomControlView.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoListTableViewCell.swift
metaCode/Classes/Main/VideoPage/ViewModel/CNLiveShortVideoViewModel.swift
@@ -49,20 +49,23 @@ target &#39;metaCode&#39; do
   #播放器
   pod 'ZFPlayer', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
   pod 'ZFPlayer/ControlView', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
-#  pod 'ZFPlayer/AVPlayer', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
+  pod 'ZFPlayer/AVPlayer', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
   pod 'ZFPlayer/ijkplayer', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
-  #支付
-  #pod 'CNLivePayCostModule'
   #分享
   #pod 'CNLiveShareToolKit'
+  #网家家输入组件
+  pod 'CNLiveCustomUI/CNLiveContentToolTextView'
+  #业务工具库
+  pod 'CNLiveBusinessTools'
   #图片浏览器
-  pod 'SKPhotoBrowser'
+  pod 'SKPhotoBrowser', :git => 'https://gitee.com/mirrors/SKPhotoBrowser.git'
   #视频播放器
   pod 'PLPlayerKit'
   #UI框架
-  pod 'QMUIKit'
+#  pod 'QMUIKit'
+   pod 'YYWebImage', :git => 'https://gitee.com/mirrors/YYWebImage.git'
   target 'metaCodeTests' do
     inherit! :search_paths
@@ -158,9 +158,10 @@
 		7939B0732B47F12F005AE981 /* CNLiveShortVideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7939B0722B47F12F005AE981 /* CNLiveShortVideoViewController.swift */; };
 		7939B0752B47F1B9005AE981 /* CNLiveShortVideoListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7939B0742B47F1B9005AE981 /* CNLiveShortVideoListTableViewCell.swift */; };
 		7939B0772B47F88A005AE981 /* CNLiveShortVideoControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7939B0762B47F88A005AE981 /* CNLiveShortVideoControlView.swift */; };
-		7939B0792B47FC33005AE981 /* CNLiveShortVideoCustomControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7939B0782B47FC33005AE981 /* CNLiveShortVideoCustomControlView.swift */; };
 		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 */; };
@@ -196,6 +197,7 @@
 		799172362AF08D4500DC01A8 /* CNLiveShopBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799172352AF08D4500DC01A8 /* CNLiveShopBaseModel.swift */; };
 		799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799172372AF090CD00DC01A8 /* CNLiveShopBodyListView.swift */; };
 		7991723A2AF091E100DC01A8 /* CNLiveShopOrderListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 799172392AF091E100DC01A8 /* CNLiveShopOrderListViewController.swift */; };
+		7999415C2B4E8E8E0014C721 /* CNLiveRefresh.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7999415B2B4E8E8E0014C721 /* CNLiveRefresh.swift */; };
 		79A212C02B0B5C5400BFA8E3 /* CNLiveShopCouponManagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79A212BF2B0B5C5400BFA8E3 /* CNLiveShopCouponManagerViewController.swift */; };
 		79A212C22B0B5D0700BFA8E3 /* CNLiveShopBodyCouponManagerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79A212C12B0B5D0700BFA8E3 /* CNLiveShopBodyCouponManagerView.swift */; };
 		79A267832AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79A267822AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift */; };
@@ -422,9 +424,10 @@
 		7939B0722B47F12F005AE981 /* CNLiveShortVideoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShortVideoViewController.swift; sourceTree = "<group>"; };
 		7939B0742B47F1B9005AE981 /* CNLiveShortVideoListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShortVideoListTableViewCell.swift; sourceTree = "<group>"; };
 		7939B0762B47F88A005AE981 /* CNLiveShortVideoControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShortVideoControlView.swift; sourceTree = "<group>"; };
-		7939B0782B47FC33005AE981 /* CNLiveShortVideoCustomControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShortVideoCustomControlView.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -460,6 +463,7 @@
 		799172352AF08D4500DC01A8 /* CNLiveShopBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBaseModel.swift; sourceTree = "<group>"; };
 		799172372AF090CD00DC01A8 /* CNLiveShopBodyListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyListView.swift; sourceTree = "<group>"; };
 		799172392AF091E100DC01A8 /* CNLiveShopOrderListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopOrderListViewController.swift; sourceTree = "<group>"; };
+		7999415B2B4E8E8E0014C721 /* CNLiveRefresh.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRefresh.swift; sourceTree = "<group>"; };
 		79A212BF2B0B5C5400BFA8E3 /* CNLiveShopCouponManagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCouponManagerViewController.swift; sourceTree = "<group>"; };
 		79A212C12B0B5D0700BFA8E3 /* CNLiveShopBodyCouponManagerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyCouponManagerView.swift; sourceTree = "<group>"; };
 		79A267822AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopBodyCustomView.swift; sourceTree = "<group>"; };
@@ -1029,6 +1033,7 @@
 			isa = PBXGroup;
 			children = (
 				796308742B4B90700090D22A /* CNLiveShortVideoHomeModel.swift */,
+				794294AB2B4D44C0008AAFA0 /* CNLiveShortVideoCommentLayout.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1038,12 +1043,19 @@
 			children = (
 				7939B0742B47F1B9005AE981 /* CNLiveShortVideoListTableViewCell.swift */,
 				7939B0762B47F88A005AE981 /* CNLiveShortVideoControlView.swift */,
-				7939B0782B47FC33005AE981 /* CNLiveShortVideoCustomControlView.swift */,
 				794294A62B4D18EC008AAFA0 /* CNLiveShortVideoContentListView.swift */,
+				794294A92B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
 		};
+		794294A82B4D3018008AAFA0 /* Share */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Share;
+			sourceTree = "<group>";
+		};
 		79579CAA2AAAE905006E5B38 /* Database */ = {
 			isa = PBXGroup;
 			children = (
@@ -1131,6 +1143,7 @@
 		796398922A260C0100D045EB /* Config */ = {
 			isa = PBXGroup;
 			children = (
+				794294A82B4D3018008AAFA0 /* Share */,
 				79E496E42AB936E200127BF8 /* Tool */,
 				79579CAA2AAAE905006E5B38 /* Database */,
 				7CD675512A29C04B008354C1 /* CNLiveConfigstant.swift */,
@@ -1190,6 +1203,7 @@
 			children = (
 				798A44F52A3077ED00815935 /* CNLiveHotButton.swift */,
 				798A44FA2A30999900815935 /* CNLiveAlertTool.swift */,
+				7999415B2B4E8E8E0014C721 /* CNLiveRefresh.swift */,
 			);
 			path = CustomView;
 			sourceTree = "<group>";
@@ -1707,7 +1721,6 @@
 				19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
 				1938BD382B4BDC2500390A34 /* CNLiveAlbumImageCell.swift in Sources */,
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
-				7939B0792B47FC33005AE981 /* CNLiveShortVideoCustomControlView.swift in Sources */,
 				1917330D2B1096AB007BCC04 /* CNLivePlayerViewController.swift in Sources */,
 				1917330F2B10989C007BCC04 /* CNLivePlayerView.swift in Sources */,
 				7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */,
@@ -1873,6 +1886,7 @@
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
+				7999415C2B4E8E8E0014C721 /* CNLiveRefresh.swift in Sources */,
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
 				19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */,
@@ -1881,6 +1895,7 @@
 				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 */,
@@ -1889,6 +1904,7 @@
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
 				19FA20192AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift in Sources */,
 				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
+				794294AA2B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
 				191733022B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift in Sources */,
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
+//
+//  CNLiveHeaderRefresh.swift
+//  metaCode
+//
+//  Created by open on 2024/1/10.
+//
+
+import Foundation
+import MJRefresh
+
+class CNLiveHeaderRefresh: MJRefreshNormalHeader {
+    
+    override func prepare() {
+        super.prepare()
+        self.loadingView?.color = .white
+        self.arrowView!.isHidden = true
+        self.stateLabel?.isHidden = true
+        self.lastUpdatedTimeLabel?.isHidden = true
+    }
+}
+
+class CNLiveFooterRefresh: MJRefreshAutoNormalFooter {
+    override func prepare() {
+        super.prepare()
+        self.stateLabel?.textColor = .white
+        self.loadingView?.color = .white
+    }
+}
@@ -33,6 +33,8 @@ let APPBaseWjjBUrl: String = CNLiveEnvironmentManager.shared.base_wjj_b_url
 let APPBaseWjjShopUrl: String = CNLiveEnvironmentManager.shared.base_mjj_shop_url
 /// cms接口
 let APPBaseCMSUrl: String = CNLiveEnvironmentManager.shared.base_cms_url
+/// 用户云接口
+let APPBaseTokenUrl: String = CNLiveEnvironmentManager.shared.img_token_url
 /// cms_api接口
 let APPBaseCMSClassUrl: String = CNLiveEnvironmentManager.shared.base_cms_class_url
 ///当前APP的环境
@@ -96,16 +96,16 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     // MARK: - UITableViewDelegate
     func numberOfSections(in tableView: UITableView) -> Int {
         if self.isHaveDuanJU{
-            2
+            return 2
         }else{
-            1
+            return 1
         }
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if self.isHaveDuanJU && section == 0{
-            1
+            return 1
         }else{
-            self.dataArray.count
+            return self.dataArray.count
         }
     }
@@ -92,7 +92,6 @@ class CNLiveHomePageViewModel:NSObject{
         let param = NSMutableDictionary()
         param.setValue(aid, forKey: "aid")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
-
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getAlbumMsg", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -118,7 +117,6 @@ class CNLiveHomePageViewModel:NSObject{
         let param = NSMutableDictionary()
         param.setValue(aid, forKey: "aid")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
-
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/ugcApi/albumList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -136,8 +134,7 @@ class CNLiveHomePageViewModel:NSObject{
                     }
                     resultBlock(listArr,.success)
-                }
-                else{
+                }else{
                     resultBlock(NSNull(),.failed)
                 }
             }
@@ -193,7 +193,7 @@ extension CNLiveMineViewController {
                 self.navigationController?.pushViewController(CNLiveShopCouponManagerViewController.init(), animated: true)
             }
             if indexPath.row == 4 {
-                self.navigationController?.pushViewController(CNLiveShortVideoViewController.init(), animated: true)
+                self.navigationController?.pushViewController(CNLiveShortVideoViewController.init(aid: "cms_ugc_10504077_1704334474587"), animated: true)
             }
         }
@@ -8,7 +8,10 @@
 import Foundation
 import ZFPlayer
 import APButton
-class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, CNLiveShortVideoListTableViewCellDelegate {
+import EmptyDataSet_Swift
+import MJRefresh
+
+class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, CNLiveShortVideoListTableViewCellDelegate, EmptyDataSetSource, EmptyDataSetDelegate {
     var player: ZFPlayerController!
     let kVideoBodyListViewCellIdentifier = "kVideoBodyListViewCellIdentifier"
@@ -16,6 +19,8 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.dataSource = self
         tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.isPagingEnabled = true
         tableView.estimatedRowHeight = 0
         tableView.estimatedSectionFooterHeight = 0
@@ -26,6 +31,8 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         tableView.tableFooterView = UIView.init()
         tableView.separatorStyle = .none
         tableView.scrollsToTop = false
+        tableView.showsVerticalScrollIndicator = false
+        tableView.showsHorizontalScrollIndicator = false
         tableView.contentInsetAdjustmentBehavior = .never;
         tableView.register(CNLiveShortVideoListTableViewCell.self, forCellReuseIdentifier: kVideoBodyListViewCellIdentifier)
         return tableView
@@ -51,16 +58,52 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         let dataArray = NSMutableArray.init()
         return dataArray
     }()
-
+    
+    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()
+    /// 初始化播放器
+    /// - Parameters:
+    ///   - aid: 专辑 id
+    ///   - page: 当前页数
+    ///   - currentIndex: 当前点击的索引
+    ///   - dataArray: 当前请求的数据
+    init(aid: String,page: NSInteger, currentIndex: NSInteger, dataArray: [CNLiveAlbumListModel]) {
+        self.aid = aid
+        self.pageNum = page
+        self.currentIndex = currentIndex
+        super.init(nibName:nil, bundle:nil)
+        self.dataArray.addObjects(from: dataArray)
+        dataArray.forEach {[weak self] listModel in
+            guard let self = self else { return }
+            self.dataURLArray.add(listModel.videoUrl)
+        }
+    }
+    
+    /// 初始化播放器
+    /// - Parameter aid: 专辑 id
+    init(aid: String) {
+        self.aid = aid
+        super.init(nibName:nil, bundle:nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .black
         view.addSubview(tableView)
         view.addSubview(backBtn)
-        requestData()
+        
+        requestData {}
+        addRefreshView()
         player = ZFPlayerController(scrollView: tableView, playerManager: playerManager, containerViewTag: 100)
         player.disableGestureTypes = [.pan, .pinch]
@@ -74,17 +117,14 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         }
         player.playerPrepareToPlay = {[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! ShortVideoHomeTestModel
-            if (homeModel.isMoney!) {
-                let indexPath = IndexPath(row: index, section: 0)
-                let cell: CNLiveShortVideoListTableViewCell = self.tableView.cellForRow(at: indexPath) as! CNLiveShortVideoListTableViewCell
-                cell.hiddenView(isHidden: true)
+            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()
-            } else {
-                let indexPath = IndexPath(row: index, section: 0)
-                let cell: CNLiveShortVideoListTableViewCell = self.tableView.cellForRow(at: indexPath) as! CNLiveShortVideoListTableViewCell
-                cell.hiddenView(isHidden: false)
             }
         }
         // 更新另一个控制层的时间
@@ -103,42 +143,72 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             if self.player.playingIndexPath != nil {
                 return
             }
-            if indexPath.row == (self.dataArray.count) - 1 {
-                // 加载下一页数据
-                self.requestData()
-                self.tableView.reloadData()
-            }
             self.playVideo(at: indexPath)
         }
     }
+    func addRefreshView() {
+        headerRefreshView = CNLiveHeaderRefresh(refreshingBlock: { [weak self] in
+            guard let self = self else { return }
+            self.pageNum = 1
+            self.requestData {}
+        })
+        footerRefreshView = CNLiveFooterRefresh(refreshingBlock: { [weak self] in
+            guard let self = self else { return }
+            self.player.stopCurrentPlayingCell()
+            self.pageNum += 1
+            self.requestData {}
+        })
+    }
+    
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
         self.backBtn.frame = CGRectMake(15, CGRectGetMaxY(UIApplication.shared.statusBarFrame), 45, 45)
     }
-    func loadRequest() {
-        dataArray.removeAllObjects()
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in
-            guard let strongSelf = self else { return }
-            // 下拉时一定要停止当前播放，以防有新数据，播放位置会错位
-            strongSelf.player.stopCurrentPlayingCell()
-            strongSelf.requestData()
-            strongSelf.tableView.reloadData()
-            strongSelf.player.zf_filterShouldPlayCellWhileScrolled { [weak self] indexPath in
-                guard let strongSelf = self else { return }
-                strongSelf.playVideo(at: indexPath)
-            }
-        }
-    }
-    
-    func requestData() {
-        CNLiveShortVideoViewModel.requstWithShortVideo { [weak self] result, respStatue in
+    func requestData(resultBlock: @escaping () -> Void) {
+        CNLiveShortVideoViewModel.requstWithShortVideo(aid: self.aid, page: self.pageNum) { [weak self] result, respStatue in
             guard let self = self else { return }
-            self.dataArray.addObjects(from: (result as! [Any]).first as! [Any])
-            self.dataURLArray.addObjects(from: (result as! [Any]).last as! [Any])
-            self.tableView.reloadData()
-            self.playTheIndex(index: 0)
+            if respStatue == .success {
+                if self.pageNum == 1 {
+                    self.dataArray.removeAllObjects()
+                    self.dataURLArray.removeAllObjects()
+                }
+                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 {
+                    self.tableView.mj_footer?.endRefreshing()
+                    self.tableView.mj_header?.endRefreshing()
+                }
+                self.tableView.reloadData()
+                let hasNextPage = (result as! [Any])[1] as! Bool
+                if listArray.count == 0 && urlArray.count == 0 {
+                    if !hasNextPage {
+                        self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                        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
+                    }
+                }
+                if self.pageNum == 1 {
+                    self.playTheIndex(index: self.currentIndex)
+                }
+            } else {
+                if self.tableView.mj_header != nil && self.tableView.mj_footer != nil {
+                    self.tableView.mj_footer?.endRefreshing()
+                    self.tableView.mj_header?.endRefreshing()
+                }
+                if self.dataArray.count == 0 {
+                    self.tableView.reloadEmptyDataSet()
+                }
+            }
         }
     }
@@ -152,12 +222,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             guard let self = self else { return }
             self.playVideo(at: indexPath)
         }
-        // 如果是最后一行，去请求新数据
-        if index == dataArray.count - 1 {
-            // 加载下一页数据
-            requestData()
-            tableView.reloadData()
-        }
     }
     override var shouldAutorotate: Bool {
@@ -181,10 +245,10 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     }
     func playVideo(at indexPath: IndexPath) {
-        let data: ShortVideoHomeTestModel = dataArray[indexPath.row] as! ShortVideoHomeTestModel
-        self.player.playTheIndexPath(indexPath, assetURL: URL(string: data.videoUrl!)!)
+        let data: CNLiveAlbumListModel = dataArray[indexPath.row] as! CNLiveAlbumListModel
+        self.player.playTheIndexPath(indexPath, assetURL: URL(string: data.videoUrl)!)
         controlView.resetControlView()
-        controlView.showCoverView(withUrl: data.poster!)
+        controlView.showCoverView(withUrl: data.poster)
     }
     deinit {
@@ -201,7 +265,12 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
 extension CNLiveShortVideoViewController {
     func likeActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
-        button.isSelected = !button.isSelected
+        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
+                button.isSelected = viewcell.homeModel.tool!.liked
+            }
+        }
     }
     func commentActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
@@ -216,8 +285,10 @@ extension CNLiveShortVideoViewController {
     }
     func listActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
-        CNLiveShortVideoContentListView.showVideoContentListView(result: { videoId in
-            
+        CNLiveShortVideoContentListView.showVideoContentListView(title: viewcell.homeModel.albumMsgModel!.albumName,dataArray: dataArray, result: {[weak self] listModel in
+            guard let self = self else { return }
+            let index = self.dataArray.index(of: listModel) as NSInteger
+            self.playTheIndex(index: index)
         })
     }
     func payActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
@@ -227,8 +298,8 @@ extension CNLiveShortVideoViewController {
             guard let self = self else { return }
             payButton.stopAnimating()
             for item in self.dataArray {
-                let homeModel = item as! ShortVideoHomeTestModel
-                homeModel.isMoney = false
+                let homeModel = item as! CNLiveAlbumListModel
+                homeModel.product!.albumProductType = "0"
                 self.tableView.reloadData()
             }
             let index = self.dataArray.index(of: viewcell.homeModel as Any)
@@ -252,7 +323,7 @@ extension CNLiveShortVideoViewController {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kVideoBodyListViewCellIdentifier) as? CNLiveShortVideoListTableViewCell else {
             return CNLiveShortVideoListTableViewCell()
         }
-        cell.setupWithData(model: dataArray[indexPath.row] as! ShortVideoHomeTestModel)
+        cell.setupWithData(model: dataArray[indexPath.row] as! CNLiveAlbumListModel)
         cell.delegate = self
         return cell
     }
@@ -261,6 +332,10 @@ extension CNLiveShortVideoViewController {
         self.playVideo(at: indexPath)
     }
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        return UIImage(named: "short_video_default")
+    }
+    
     func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
         scrollView.zf_scrollViewDidEndDecelerating()
     }
@@ -285,3 +360,4 @@ extension CNLiveShortVideoViewController {
         self.playVideo(at: indexPath)
     }
 }
+
+//
+//  CNLiveShortVideoCommentLayout.swift
+//  metaCode
+//
+//  Created by open on 2024/1/9.
+//
+
+import Foundation
@@ -7,51 +7,59 @@
 import Foundation
-class ShortVideoHomeTestModel: BaseModel {
-    var activityEndTime: String? = ""
-    var address: String? = ""
-    var colours: String? = ""
-    var contentId: String? = ""
-    var coordinate: String? = ""
-    var duration: String? = ""
-    var h5Url: String? = ""
-    var shortTitle: String? = ""
-    var height: Int? = 0
-    var isMoney: Bool? = false
-    var identity: Int? = 0
-    var isHorizontalScreen: Int? = 0
-    var model: String? = ""
-    var number: String? = ""
+//!!!: 评论相关 model
+class ShortVideoHomeCommentModel: BaseModel {
+    var total_hd: Int? = 0 //总数
+    var hasNext: String? = ""
+    var comments = [ShortVideoHomeCommentListModel]()
+}
+
+class ShortVideoHomeCommentListModel: BaseModel {
+    var comment = ShortVideoHomeCommentFListModel()
+    var replyData = ShortVideoHomeCommentRListModel()
+}
+//评论数据
+class ShortVideoHomeCommentFListModel: BaseModel {
+    var commentId: String? = ""
     var pid: String? = ""
-    var poster: String? = ""
-    var productId: String? = ""
-    var productType: String? = ""
-    var shareUrl: String? = ""
-    var source: Int? = 0
-    var sourceDescribe: String? = ""
-    var sourceName: String? = ""
-    var subTitle: String? = ""
-    var supervision: String? = ""
-    var tagId: String? = ""
-    var tagName: String? = ""
-    var thirdUrl: String? = ""
-    var time: Int? = 0
-    var timeString: String? = ""
-    var title: String? = ""
-    var videoType: Int? = 0
-    var videoUrl: String? = ""
-    var width: Int? = 0
-    var showStatue: Int? = 0
-    var witnessId: String? = ""
-    var statue: String? = ""
-    var pids: [String]? = []
-    var icon = ShortVideoHomeTestIconModel()
+    var uid: String? = ""
+    var nick: String? = ""
+    var facepath: String? = ""
+    var content: String? = ""
+    var created_at: String? = ""
+    var praise: String? = ""
+    var plat: String? = ""
+    var isOffical: Bool? = false
+    var model: String? = ""
+    var spId: String? = ""
+    var seqId: Int? = 0
+    var topicId: String? = ""
+    var praiseCount: Int? = 0
+    var isPraised: Bool? = false
+    var icon: String? = ""
+}
+//回复数据
+class ShortVideoHomeCommentRListModel: BaseModel {
+    var total_hd: Int? = 0 //总数
+    var replys = [ShortVideoHomeCommentRListItemModel]()
 }
-class ShortVideoHomeTestIconModel: BaseModel {
-    var face: String? = ""
-    var focused: Bool? = false
-    var idField: String? = ""
-    var name: String? = ""
-    var type: String? = ""
+class ShortVideoHomeCommentRListItemModel: BaseModel {
+    var praiseCount: Int? = 0
+    var isPraised: Bool? = false
+    var commentId: String? = ""
+    var replyId: String? = ""
+    var topicId: String? = ""
+    var created_at: String? = ""
+    var plat: String? = ""
+    var fromFace: String? = ""
+    var fromSid: String? = ""
+    var fromNick: String? = ""
+    var toSid: String? = ""
+    var toNick: String? = ""
+    var toFace: String? = ""
+    var seqId: Int? = 0
+    var content: String? = ""
+    var level: Int? = 0
+    var icon: String? = ""
 }
+//
+//  CNLiveShortVideoCommentListView.swift
+//  metaCode
+//
+//  Created by open on 2024/1/9.
+//
+
+import Foundation
+
+class CNLiveShortVideoCommentListView: UIView {
+    
+}
@@ -7,9 +7,21 @@
 import Foundation
-typealias CloseVideoListResultBlock = (_ videoId: Any) ->Void
+typealias CloseVideoListResultBlock = (_ listModel: Any) ->Void
 class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewDataSource {
+    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)
@@ -41,7 +53,7 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
         tableView.dataSource = self
         tableView.delegate = self
         tableView.rowHeight = 90
-        tableView.estimatedRowHeight = 0
+        tableView.estimatedRowHeight = 90
         tableView.estimatedSectionFooterHeight = 0
         tableView.estimatedSectionHeaderHeight = 0
         tableView.backgroundColor = HexColor("#010101")
@@ -54,21 +66,38 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
         return tableView
     }()
+    lazy var dataSource: NSMutableArray = {
+        let array = NSMutableArray()
+        return array
+    }()
+    
+    var resultBlock: CloseVideoListResultBlock!
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
-        addSubview(closeButton)
+        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(closeButton)
         closeButton.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(-15)
             make.top.equalToSuperview().offset(15)
             make.size.equalTo(30)
         }
-        addSubview(titleLabel)
+        contentView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.top.left.equalToSuperview().offset(20)
             make.right.equalTo(closeButton.snp.left).offset(-10)
         }
-        addSubview(lineLabel)
+        contentView.addSubview(lineLabel)
         lineLabel.snp.makeConstraints { make in
             make.top.equalTo(closeButton.snp.bottom).offset(15)
             make.centerX.equalToSuperview()
@@ -76,32 +105,41 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
             make.right.equalToSuperview().offset(-10)
             make.height.equalTo(1)
         }
-        addSubview(tableView)
+        contentView.addSubview(tableView)
         tableView.snp.makeConstraints { make in
             make.bottom.left.right.equalToSuperview()
             make.top.equalTo(lineLabel.snp.bottom).offset(10)
         }
     }
+    func setupWithDataSource(title: String,dataArray: NSMutableArray) {
+        dataSource = dataArray
+        titleLabel.text = title
+        self.tableView.reloadData()
+    }
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    deinit {
+        print("弹出界面销毁")
+    }
     @objc func closeMethod() {
         removeFromSuperview()
     }
-    static public func showVideoContentListView(result: @escaping CloseVideoListResultBlock) {
+    static public func showVideoContentListView(title: String,dataArray: NSMutableArray,result: @escaping CloseVideoListResultBlock) {
         let pickerView = CNLiveShortVideoContentListView.init(frame: CGRect.zero)
-        pickerView.backgroundColor = HexColor("#010101")
+        pickerView.resultBlock = result
+        pickerView.setupWithDataSource(title: title,dataArray: dataArray)
         let delegate = UIApplication.shared.delegate as! AppDelegate
         delegate.window?.addSubview(pickerView)
         pickerView.snp.makeConstraints { make in
-            make.top.equalTo(250)
-            make.right.left.bottom.equalToSuperview()
+            make.edges.equalToSuperview()
         }
         delegate.window?.layoutIfNeeded()
         pickerView.alpha = 0
@@ -117,65 +155,85 @@ extension CNLiveShortVideoContentListView {
         return 1
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 20
+        return dataSource.count
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kVideoContentListViewCellIdentifier) as? CNLiveShortVideoContentListTableViewCell else {
             return CNLiveShortVideoContentListTableViewCell()
         }
+        cell.setupWithDataModel(listModel: dataSource[indexPath.row] as! CNLiveAlbumListModel)
         return cell
     }
-    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        self.resultBlock(dataSource[indexPath.row] as! CNLiveAlbumListModel)
+        closeMethod()
+    }
 }
 class CNLiveShortVideoContentListTableViewCell: UITableViewCell {
-    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        super.init(style: style, reuseIdentifier: reuseIdentifier)
-        contentView.backgroundColor = .clear
-        backgroundColor = .clear
-        selectionStyle = .none
-        
+    lazy var iconView: UIImageView = {
         let imageView = UIImageView.init()
-        imageView.image = UIImage(named: "mine_auth_result_header_failer")
+        imageView.image = UIImage(named: "short_video_default")
         imageView.contentMode = .scaleAspectFill
         imageView.layer.cornerRadius = 5
         imageView.layer.masksToBounds = true
         imageView.clipsToBounds = true
-        contentView.addSubview(imageView)
-        imageView.snp.makeConstraints { make in
-            make.left.top.equalToSuperview().offset(20)
-            make.width.equalTo(50)
-            make.height.equalTo(70)
-        }
-        
-        let paragraphStyle = NSMutableParagraphStyle()
-        paragraphStyle.lineSpacing = 6
+        return imageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
         let titleLabel = UILabel.init()
-        titleLabel.attributedText = NSAttributedString(string: "第四集 我们都不知道，所做的哪一个选择会让命运的齿轮开始转动", attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle])
         titleLabel.textColor = .white
         titleLabel.lineBreakMode = .byTruncatingTail
         titleLabel.numberOfLines = 2
         titleLabel.font = medium_adapt_font(pointSize: 12)
+        return titleLabel
+    }()
+    
+    lazy var timeLabel: UILabel = {
+        let timeLabel = UILabel.init()
+        timeLabel.textColor = .white
+        timeLabel.font = light_adapt_font(pointSize: 13)
+        return timeLabel
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .clear
+        backgroundColor = .clear
+        selectionStyle = .none
+        
+
+        contentView.addSubview(iconView)
+        iconView.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(20)
+            make.width.equalTo(50)
+            make.height.equalTo(70)
+        }
         contentView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
-            make.left.equalTo(imageView.snp.right).offset(10)
+            make.left.equalTo(iconView.snp.right).offset(10)
             make.top.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
         }
-        
-        let timeLabel = UILabel.init()
-        timeLabel.text = "04:45"
-        timeLabel.textColor = .white
-        timeLabel.font = light_adapt_font(pointSize: 13)
         contentView.addSubview(timeLabel)
         timeLabel.snp.makeConstraints { make in
-            make.left.equalTo(imageView.snp.right).offset(10)
-            make.bottom.equalTo(imageView.snp.bottom)
+            make.left.equalTo(iconView.snp.right).offset(10)
+            make.bottom.equalTo(iconView.snp.bottom)
             make.right.equalToSuperview().offset(-20)
         }
     }
+    func setupWithDataModel(listModel: CNLiveAlbumListModel) {
+        iconView.kf.indicatorType = .activity
+        iconView.kf.setImage(with: URL(string: listModel.poster), placeholder: UIImage(named: "short_video_default"))
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = 6
+        titleLabel.attributedText = NSAttributedString(string: listModel.title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, ])
+        timeLabel.text = listModel.duration
+    }
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-//
-//  CNLiveShortVideoCustomControlView.swift
-//  metaCode
-//
-//  Created by open on 2024/1/5.
-//
-
-import Foundation
-import ZFPlayer
-
-class CNLiveShortVideoCustomControlView: UIView, ZFPlayerMediaControl, ZFSliderViewDelegate {
-    
-    var player: ZFPlayerController?
-        
-    var topToolView: UIView = {
-        let view = UIView()
-        let image = UIImage(named: "ZFPlayer_top_shadow")
-        view.layer.contents = image?.cgImage
-        return view
-    }()
-    
-    var titleLabel: UILabel = {
-        let label = UILabel()
-        label.textColor = .white
-        label.font = UIFont.systemFont(ofSize: 15.0)
-        return label
-    }()
-    
-    var bottomToolView: UIView = {
-        let view = UIView()
-        let image = UIImage(named: "ZFPlayer_bottom_shadow")
-        view.layer.contents = image?.cgImage
-        return view
-    }()
-    
-    var playOrPauseBtn: UIButton = {
-        let button = UIButton(type: .custom)
-        button.setImage(UIImage(named: "new_allPlay_44x44_"), for: .normal)
-        button.setImage(UIImage(named: "new_allPause_44x44_"), for: .selected)
-        return button
-    }()
-    
-    var currentTimeLabel: UILabel = {
-        let label = UILabel()
-        label.textColor = .white
-        label.font = UIFont.systemFont(ofSize: 14.0)
-        label.textAlignment = .center
-        return label
-    }()
-    
-    var slider: ZFSliderView = {
-        let slider = ZFSliderView()
-        slider.maximumTrackTintColor = UIColor(red: 0.5, green: 0.5, blue: 0.5, alpha: 0.8)
-        slider.bufferTrackTintColor = UIColor(red: 1, green: 1, blue: 1, alpha: 0.5)
-        slider.minimumTrackTintColor = .white
-        slider.setThumbImage(UIImage(named: "ZFPlayer_slider"), for: .normal)
-        slider.sliderHeight = 2
-        return slider
-    }()
-    
-    var totalTimeLabel: UILabel = {
-        let label = UILabel()
-        label.textColor = .white
-        label.font = UIFont.systemFont(ofSize: 14.0)
-        label.textAlignment = .center
-        return label
-    }()
-    
-    var fullScreenBtn: UIButton = {
-        let button = UIButton(type: .custom)
-        button.setImage(UIImage(named: "ZFPlayer_fullscreen"), for: .normal)
-        return button
-    }()
-    
-    var coverImageView: UIImageView = {
-        let imageView = UIImageView()
-        imageView.isUserInteractionEnabled = true
-        imageView.contentMode = .scaleAspectFit
-        return imageView
-    }()
-    
-    var bottomPgrogress: ZFSliderView = {
-        let slider = ZFSliderView()
-        slider.maximumTrackTintColor = .clear
-        slider.minimumTrackTintColor = .white
-        slider.bufferTrackTintColor = UIColor(red: 1, green: 1, blue: 1, alpha: 0.5)
-        slider.sliderHeight = 1
-        slider.isHideSliderBlock = false
-        return slider
-    }()
-
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        addSubview(topToolView)
-        addSubview(bottomToolView)
-        addSubview(playOrPauseBtn)
-        topToolView.addSubview(titleLabel)
-        bottomToolView.addSubview(currentTimeLabel)
-        bottomToolView.addSubview(slider)
-        bottomToolView.addSubview(totalTimeLabel)
-        bottomToolView.addSubview(fullScreenBtn)
-        addSubview(bottomPgrogress)
-//        addSubview(activity)
-
-//        autoFadeTimeInterval = 0.2
-//        autoHiddenTimeInterval = 2.5
-
-        // 设置子控件的响应事件
-        makeSubViewsAction()
-        
-//        resetControlView()
-        clipsToBounds = true
-    }
-
-    func makeSubViewsAction() {
-        playOrPauseBtn.addTarget(self, action: #selector(playPauseButtonClickAction), for: .touchUpInside)
-        fullScreenBtn.addTarget(self, action: #selector(fullScreenButtonClickAction), for: .touchUpInside)
-    }
-    
-    
-    
-    ///////////////  ZFSliderViewDelegate
-    func sliderTouchBegan(_ value: Float) {
-        slider.isdragging = true
-    }
-    
-    func sliderTouchEnded(_ value: Float) {
-        guard player?.totalTime ?? 0.0 > 0 else {
-            slider.isdragging = false
-            return
-        }
-        
-        player?.seek(toTime: (player?.totalTime ?? 0.0) * TimeInterval(value), completionHandler: {[weak self] finished in
-            guard let self = self else { return }
-            if finished {
-                self.slider.isdragging = false
-            }
-        })
-    }
-    
-    func sliderValueChanged(_ value: Float) {
-        guard player?.totalTime ?? 0.0 > 0 else {
-            slider.value = 0
-            return
-        }
-        
-        slider.isdragging = true
-        let currentTimeString = ZFUtilities.convertTimeSecond(Int((player?.totalTime ?? 0.0) * TimeInterval(value)))
-        currentTimeLabel.text = currentTimeString
-    }
-    
-    func sliderTapped(_ value: Float) {
-        guard player?.totalTime ?? 0.0 > 0 else {
-            slider.isdragging = false
-            slider.value = 0
-            return
-        }
-        
-        slider.isdragging = true
-        player?.seek(toTime: (player?.totalTime ?? 0.0) * TimeInterval(value), completionHandler: { [weak self] finished in
-            guard let self = self else { return }
-            if finished {
-                slider.isdragging = false
-                player?.currentPlayerManager.play()
-            }
-        })
-    }
-    
-    ////////////action
-    @objc func playPauseButtonClickAction(_ sender: UIButton) {
-        playOrPause()
-    }
-
-    @objc func fullScreenButtonClickAction(_ sender: UIButton) {
-        self.player?.enterFullScreen(!self.player!.isFullScreen, animated: true)
-    }
-    
-    private func playOrPause() {
-        self.playOrPauseBtn.isSelected = !self.playOrPauseBtn.isSelected
-        self.playOrPauseBtn.isSelected ? self.player?.currentPlayerManager.play(): self.player?.currentPlayerManager.pause()
-    }
-    
-    private func playBtnSelectedState(selected: Bool) {
-        self.playOrPauseBtn.isSelected = selected
-    }
-    
-
-    ///////private
-    func resetControlView() {
-        self.bottomToolView.alpha        = 1
-        self.slider.value                = 0
-        self.slider.bufferValue          = 0
-        self.currentTimeLabel.text       = "00:00"
-        self.totalTimeLabel.text         = "00:00"
-        self.backgroundColor             = .clear
-        self.playOrPauseBtn.isSelected     = true
-        self.titleLabel.text             = ""
-    }
-    
-//    func showControlView() {
-//        self.topToolView.alpha           = 1
-//        self.bottomToolView.alpha        = 1
-//        self.isShow                      = true
-//        self.topToolView.zf_y            = 0
-//        self.bottomToolView.zf_y         = self.zf_height - self.bottomToolView.zf_height
-//        self.playOrPauseBtn.alpha        = 1
-//        self.player.statusBarHidden      = false
-//    }
-    
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        // Initialization code...
-    }
-}
@@ -29,7 +29,6 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         label.textAlignment = .left
         label.numberOfLines = 1
         label.lineBreakMode = .byTruncatingTail
-        label.text = "爱得供养"
         return label
     }()
@@ -40,7 +39,6 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         label.textAlignment = .left
         label.numberOfLines = 3
         label.lineBreakMode = .byTruncatingTail
-        label.text = "在 Swift 中，CGRect 的属性和方法名通常是小写字母开头的驼峰命名法。确保在 Swift 中使用正确的命名规范和语法。这段 Swift 代码与原始的 Objective-C 代码逻辑相同，只是在语法和命名上进行了一些调整。"
         return label
     }()
@@ -50,21 +48,18 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         label.font = semibold_adapt_font(pointSize: 15)
         label.textAlignment = .center
         label.numberOfLines = 0
-        label.text = "当前内容需付费观看"
         label.isHidden = true
         return label
     }()
     lazy var listBtn: UIButton = {
         let button = UIButton(type: .custom)
-        button.setTitle("爱的供养·45集", for: .normal)
         button.setTitleColor(.white, for: .normal)
         button.contentHorizontalAlignment = .left
         button.contentEdgeInsets = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 0)
         button.titleLabel?.textAlignment = .left
         button.titleLabel?.lineBreakMode = .byTruncatingTail
         button.titleLabel?.font = semibold_adapt_font(pointSize: 15)
-        button.addTarget(self, action: #selector(likeMothod), for: .touchUpInside)
         button.layer.cornerRadius = 10
         button.layer.masksToBounds = true
         button.backgroundColor = HexColor("#414141")
@@ -146,10 +141,11 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         coverImageView.isUserInteractionEnabled = true
         coverImageView.tag = 100
         coverImageView.contentMode = .scaleAspectFit
+        coverImageView.image = UIImage(named: "short_video_default")
         return coverImageView
     }()
-    var homeModel: ShortVideoHomeTestModel!
+    var homeModel: CNLiveAlbumListModel!
     weak var delegate: CNLiveShortVideoListTableViewCellDelegate!
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -172,10 +168,26 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         contentView.addSubview(payView)
     }
-    func setupWithData(model: ShortVideoHomeTestModel) {
+    func setupWithData(model: CNLiveAlbumListModel) {
         homeModel = model
         coverImageView.kf.indicatorType = .activity
-        coverImageView.kf.setImage(with: URL(string: model.icon.face!), placeholder: UIImage(named: "short_video_default"))
+        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)
+        shareBtn.setTitle(model.tool?.shareNum, for: .normal)
+        likeBtn.isSelected = model.tool!.liked
+        titleLabel.text = model.shortTitle
+        descLabel.text = model.title
+        listBtn.setTitle(model.albumMsgModel?.albumName, for: .normal)
+        
+        let imageV: UIImageView = payView.viewWithTag(1000) as! UIImageView
+        imageV.kf.indicatorType = .activity
+        imageV.kf.setImage(with: URL(string: model.poster))
+        let titleL: UILabel = payView.viewWithTag(1001) as! UILabel
+        titleL.text = model.title
+        let timeL: UILabel = payView.viewWithTag(1002) as! UILabel
+        timeL.text = model.duration
     }
     override func layoutSubviews() {
@@ -321,12 +333,11 @@ extension CNLiveShortVideoListTableViewCell {
         view.layer.masksToBounds = true
         let imageView = UIImageView.init()
-        imageView.image = UIImage(named: "mine_auth_result_header_failer")
         imageView.contentMode = .scaleAspectFill
         imageView.layer.cornerRadius = 5
         imageView.layer.masksToBounds = true
         imageView.clipsToBounds = true
-        imageView.viewWithTag(1000)
+        imageView.tag = 1000
         view.addSubview(imageView)
         imageView.snp.makeConstraints { make in
             make.left.top.equalToSuperview().offset(20)
@@ -334,14 +345,11 @@ extension CNLiveShortVideoListTableViewCell {
             make.height.equalTo(70)
         }
-        let paragraphStyle = NSMutableParagraphStyle()
-        paragraphStyle.lineSpacing = 6
         let titleLabel = UILabel.init()
-        titleLabel.attributedText = NSAttributedString(string: "第四集 我们都不知道，所做的哪一个选择会让命运的齿轮开始转动", attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle])
         titleLabel.textColor = .white
         titleLabel.lineBreakMode = .byTruncatingTail
         titleLabel.numberOfLines = 2
-        titleLabel.viewWithTag(1001)
+        titleLabel.tag = 1001
         titleLabel.font = medium_adapt_font(pointSize: 12)
         view.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
@@ -351,9 +359,8 @@ extension CNLiveShortVideoListTableViewCell {
         }
         let timeLabel = UILabel.init()
-        timeLabel.text = "04:45"
         timeLabel.textColor = .white
-        timeLabel.viewWithTag(1002)
+        timeLabel.tag = 1002
         timeLabel.font = light_adapt_font(pointSize: 13)
         view.addSubview(timeLabel)
         timeLabel.snp.makeConstraints { make in
@@ -11,21 +11,182 @@ import CNLiveRequestBastKit
 typealias resultShortVideoBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
 class CNLiveShortVideoViewModel: NSObject {
-    /// 这是测试请求短视频数据
-    static func requstWithShortVideo(reultShortVideoBlock: @escaping resultShortVideoBlock) {
-        
+    /// 获取短视频数据
+    /// - Parameters:
+    ///   - aid: 专辑 id
+    ///   - reultShortVideoBlock: 返回
+    static func requstWithShortVideo(aid: String,page: NSInteger,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
-        param.setValue("10511059", forKey: "creatorId")
-        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "userId")
-        param.setValue("3", forKey: "type")
-        param.setValue("1", forKey: "page")
+        param.setValue(aid, forKey: "aid")
+        param.setValue("", forKey: "app_channel_id")
+        param.setValue("\(page)", forKey: "page")
         param.setValue("10", forKey: "pageSize")
+        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")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        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()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    if resp["data"] is NSNull {
+                        reultShortVideoBlock(NSNull(), .failed)
+                    } else {
+                        CNLiveShortVideoViewModel.requstWithAlbumMsgVideo(aid: aid) { result, respStatue in
+                            if respStatue == .success {
+                                let resp_dict = resp["data"] as! NSDictionary
+                                let array = resp_dict["list"] as! NSArray
+                                let tempArray = NSMutableArray()
+                                let tempUrlArray = NSMutableArray()
+                                for item in array {
+                                    let listModel = dictionaryToModel(item as! [String : Any], CNLiveAlbumListModel.self,"") as! CNLiveAlbumListModel
+                                    listModel.albumMsgModel = result as? CNLiveAlbumMsgModel
+                                    tempArray.add(listModel)
+                                    tempUrlArray.add(listModel.videoUrl as String)
+                                }
+                                reultShortVideoBlock([tempArray, resp_dict["hasNextPage"], tempUrlArray], .success)
+                            } else {
+                                let resp_dict = resp["data"] as! NSDictionary
+                                let array = resp_dict["list"] as! NSArray
+                                let tempArray = NSMutableArray()
+                                let tempUrlArray = NSMutableArray()
+                                for item in array {
+                                    let listModel = dictionaryToModel(item as! [String : Any], CNLiveAlbumListModel.self,"") as! CNLiveAlbumListModel
+                                    tempArray.add(listModel)
+                                    tempUrlArray.add(listModel.videoUrl as String)
+                                }
+                                reultShortVideoBlock([tempArray, resp_dict["hasNextPage"], tempUrlArray], .success)
+                            }
+                        }
+                    }
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    reultShortVideoBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    reultShortVideoBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    reultShortVideoBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    ///  获取专辑信息接口
+    /// - Parameters:
+    ///   - aid: 专辑名称
+    ///   - reultShortVideoBlock: 返回
+    static func requstWithAlbumMsgVideo(aid: String,reultShortVideoBlock: @escaping resultShortVideoBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(aid, forKey: "aid")
+        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")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getAlbumMsg", param: param as! [String : Any], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    if resp["data"] is NSNull {
+                        reultShortVideoBlock(NSNull(), .failed)
+                    } else {
+                        let listModel = dictionaryToModel(resp["data"] as! [String : Any], CNLiveAlbumMsgModel.self,"") as! CNLiveAlbumMsgModel
+                        reultShortVideoBlock(listModel, .success)
+                    }
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    reultShortVideoBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    reultShortVideoBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    reultShortVideoBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    
+    /// 短视频点赞功能
+    /// - Parameters:
+    ///   - contentId: 点赞内容 id
+    ///   - contentTitle: 点赞的视频标题
+    ///   - support: 1:点赞 0:取消点赞
+    ///   - reultShortVideoBlock: 返回
+    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(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue(contentId, 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")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseTokenUrl+"/support/supportBySpIdForRank/insert", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    reultShortVideoBlock(support ? "取消点赞成功" : "点赞成功", .success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    reultShortVideoBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    reultShortVideoBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    reultShortVideoBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    //!!!: 评论相关
+    
+    /// 获取评论列表数
+    /// - Parameters:
+    ///   - pid: 视频 pid
+    ///   - page: 页数
+    ///   - reultShortVideoBlock: 返回
+    static func requestCommentList(pid: String,page: NSInteger,reultShortVideoBlock: @escaping resultShortVideoBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(pid, forKey: "topicId")
+        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")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupDSRequest(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
             hiddenLoading()
@@ -36,21 +197,149 @@ class CNLiveShortVideoViewModel: NSObject {
                     if resp["data"] is NSNull {
                         reultShortVideoBlock(NSNull(), .failed)
                     } else {
+                        let listModel = dictionaryToModel(resp["data"] as! [String : Any], ShortVideoHomeCommentModel.self,"") as! ShortVideoHomeCommentModel
+                        reultShortVideoBlock(listModel, .success)
+                    }
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    reultShortVideoBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    reultShortVideoBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    reultShortVideoBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 发布评论
+    /// - Parameters:
+    ///   - videoId: 视频 id
+    ///   - comment: 评论内容
+    ///   - isAuthor: 是否是作者
+    ///   - reultShortVideoBlock: 返回
+    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(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        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
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    reultShortVideoBlock("评论成功", .success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    reultShortVideoBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    reultShortVideoBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    reultShortVideoBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    
+    /// 对评论进行回复
+    /// - Parameters:
+    ///   - commentId: 评论 id
+    ///   - comment: 评论内容
+    ///   - toSid: 被回复者ID
+    ///   - fromSid: 回复者ID
+    ///   - level: 1:一级评论回复 2：二级评论回复
+    ///   - reultShortVideoBlock: 返回
+    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(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")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseTokenUrl+"/commentServices/commentForUgc/insertReply", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    reultShortVideoBlock("回复成功", .success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    reultShortVideoBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    reultShortVideoBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    reultShortVideoBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    
+    /// 获取回复数据列表
+    /// - Parameters:
+    ///   - commentId: 评论 id
+    ///   - page: 页数
+    ///   - reultShortVideoBlock: 返回
+    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("10", forKey: "count")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, 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
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    if resp["data"] is NSNull {
+                        reultShortVideoBlock(NSNull(), .failed)
+                    } else {
                         let resp_dict = resp["data"] as! NSDictionary
-                        let array = resp_dict["list"] as! NSArray
+                        let resp_reply_dict = resp_dict["replyData"] as! NSDictionary
+                        let array = resp_reply_dict["replys"] as! NSArray
                         let tempArray = NSMutableArray()
-                        let tempUrlArray = NSMutableArray()
-                        var index = 0
                         for item in array {
-                            let listModel = dictionaryToModel(item as! [String : Any], ShortVideoHomeTestModel.self,"") as! ShortVideoHomeTestModel
-                            if (index > 2) {
-                                listModel.isMoney = true
-                            }
+                            let listModel = dictionaryToModel(item as! [String : Any], ShortVideoHomeCommentRListItemModel.self,"") as! ShortVideoHomeCommentRListItemModel
                             tempArray.add(listModel)
-                            tempUrlArray.add(listModel.videoUrl! as String)
-                            index += 1
                         }
-                    reultShortVideoBlock([tempArray, tempUrlArray], .success)
+                        reultShortVideoBlock(tempArray, .success)
                     }
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
@@ -68,4 +357,84 @@ class CNLiveShortVideoViewModel: NSObject {
         }
     }
+    /// 删除评论
+    /// - Parameters:
+    ///   - videoId: 视频 id
+    ///   - commentId: 评论 id
+    ///   - reultShortVideoBlock: 返回
+    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(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")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseTokenUrl+"/commentServices/commentForUgc/deleteComment", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    reultShortVideoBlock("删除成功", .success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    reultShortVideoBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    reultShortVideoBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    reultShortVideoBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 删除回复
+    /// - Parameters:
+    ///   - replyId: 回复 id
+    ///   - commentId: 评论 id
+    ///   - reultShortVideoBlock: 返回
+    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(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")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseTokenUrl+"/commentServices/commentForUgc/deleteReply", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    reultShortVideoBlock("删除成功", .success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    reultShortVideoBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    reultShortVideoBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    reultShortVideoBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
 }