首页-在追短剧+全部短剧及详情页的UI调整

张旭
1 parent 9a46072b
Showing 19 changed files with 781 additions and 234 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomePageAnimationTransition.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDetailViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDuanJuDetailViewController.swift
metaCode/Classes/Main/HomePages/Controller/PlayletHomePage/CNLivePlayletHomePageController.swift
metaCode/Classes/Main/HomePages/View/HomePage/CNLiveHomePageDuanJuCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveDuanjuTitleCell.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageHeaderCell.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderListViewController.swift
metaCode/Supporting Files/Assets.xcassets/TabBar/tabbar_authentication.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/TabBar/tabbar_authentication.imageset/authentication@2x.png
metaCode/Supporting Files/Assets.xcassets/TabBar/tabbar_authentication.imageset/authentication@3x.png
metaCode/Supporting Files/Assets.xcassets/TabBar/tabbar_authentication_unSelect.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/TabBar/tabbar_authentication_unSelect.imageset/authentication_unSelect@2x.png
metaCode/Supporting Files/Assets.xcassets/TabBar/tabbar_authentication_unSelect.imageset/authentication_unSelect@3x.png
@@ -90,6 +90,8 @@
 		1938BD3D2B4BDD4B00390A34 /* CNLiveAlbumCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */; };
 		1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD3E2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift */; };
 		1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */; };
+		1938BD432B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */; };
+		1938BD452B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */; };
 		19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */; };
 		19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */; };
 		19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */; };
@@ -342,6 +344,8 @@
 		1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumCell.swift; sourceTree = "<group>"; };
 		1938BD3E2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumMsgModel.swift; sourceTree = "<group>"; };
 		1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumListModel.swift; sourceTree = "<group>"; };
+		1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomepageDuanJuDetailViewController.swift; sourceTree = "<group>"; };
+		1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDuanjuTitleCell.swift; sourceTree = "<group>"; };
 		19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailBtnsCell.swift; sourceTree = "<group>"; };
 		19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailOrderAssetCell.swift; sourceTree = "<group>"; };
 		19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopProductManagerController.swift; sourceTree = "<group>"; };
@@ -739,6 +743,7 @@
 			isa = PBXGroup;
 			children = (
 				1938BD292B48014E00390A34 /* CNHomepageDetailViewController.swift */,
+				1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */,
 				1938BD2B2B4801A700390A34 /* CNHomePageAnimationTransition.swift */,
 				1938BD2D2B48021E00390A34 /* CNHomePageBaseNavigationController.swift */,
 			);
@@ -748,6 +753,7 @@
 		1938BD392B4BDC2900390A34 /* HomepageDetail */ = {
 			isa = PBXGroup;
 			children = (
+				1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */,
 				1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */,
 				1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */,
 			);
@@ -1648,6 +1654,7 @@
 				191733562B2FE855007BCC04 /* CNLivePickerReusingModel.swift in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */,
+				1938BD452B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				19CC4D4F2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift in Sources */,
 				191733642B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift in Sources */,
@@ -1762,6 +1769,7 @@
 				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */,
+				1938BD432B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
@@ -64,7 +64,7 @@ class CNLiveBaseTabBarViewController: UITabBarController
         creatTabbarView(viewController: homeVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "首页")
-        creatTabbarView(viewController: authVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "认证")
+        creatTabbarView(viewController: authVC, image: "tabbar_authentication_unSelect", selectImage: "tabbar_authentication", title: "认证")
         creatTabbarView(viewController: mineVC, image: "tabbar_mine_icon_default", selectImage: "tabbar_mine_icon_selected", title: "我的")
@@ -28,7 +28,8 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     var totolNum = 0//一共显示多少行cell
     var selectedCell: CNDownSlideSingleCourseCell?
-    
+    var selectedDuanjuCell: CNLiveHomePageDuanJuCell?
+
     var statusBarShouldBeHidden = false
     //we need to set `View controller-based status bar appearance = YES` in info.plist.
     //so we can be able to hide statusBar.
@@ -40,16 +41,6 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         return .slide
     }
-    var _downPath:String?
-    var downPath:String? {
-        get{
-            return _downPath
-        }
-        set{
-            _downPath = newValue!
-        }
-    }
-    
     // MARK: - 懒加载
     ///数据源
     lazy var dataArray: NSMutableArray = {
@@ -57,6 +48,12 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         return dataArray
     }()
+    //短剧的数据源
+    lazy var duanjuDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.updateStatusBarAndTabbarFrame(visible: true)
@@ -115,6 +112,20 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             else {
                 return CNLiveHomePageDuanJuCell()
             }
+            cell.setModelArr(modelArr: self.duanjuDataArray)
+            cell.DuanJUCellSelectedCallBack = {
+                duanJuCell in
+                self.selectedDuanjuCell = duanJuCell
+
+                let detailVC = CNHomePageBaseNavigationController(rootViewController:CNHomepageDuanJuDetailViewController(cell: duanJuCell))
+                
+                detailVC.dismissClosure = { [weak self] in
+                    guard let StrongSelf = self else { return }
+                    StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+                }
+                self.updateStatusBarAndTabbarFrame(visible: false)
+                self.present(detailVC, animated: true, completion: nil)
+            }
             return cell
         }else{
             let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
@@ -189,6 +200,18 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if self.isHaveDuanJU && indexPath.section == 0{
+            //点击在追短剧
+            guard let cell = tableView.cellForRow(at: indexPath) as? CNLiveHomePageDuanJuCell else { return }
+            selectedDuanjuCell = cell
+            
+            let detailVC = CNHomePageBaseNavigationController(rootViewController:CNHomepageDuanJuDetailViewController(cell: selectedDuanjuCell!))
+            
+            detailVC.dismissClosure = { [weak self] in
+                guard let StrongSelf = self else { return }
+                StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+            }
+            updateStatusBarAndTabbarFrame(visible: false)
+            present(detailVC, animated: true, completion: nil)
         }else{
@@ -201,7 +224,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             }else if slideModel.type == SlideModelTypeAllCourse12{
                 guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
                 selectedCell = cell
-                let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel))
+                let detailVC = CNHomePageBaseNavigationController(rootViewController: CNHomepageDetailViewController(cell: cell,slideModel: slideModel))
                 detailVC.dismissClosure = { [weak self] in
                     guard let StrongSelf = self else { return }
                     StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
@@ -227,7 +250,8 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if self.isHaveDuanJU && indexPath.section == 0{
-            return 300
+            //标题55+n个cell*(45+15*2)+首尾15
+            return CGFloat(self.duanjuDataArray.count)*(45+15*2)+CGFloat(55)+15+15
         }else{
             let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
             return CGFloat(slideModel.cellH)
@@ -250,23 +274,33 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                 for listModel in homePageListMdls {
                     if listModel.type == 3{
                         //在追短剧
-                        self.isHaveDuanJU = true
+                        self.getMyAlbumCollection(page: 1)
                     }else if listModel.type == 1{
                         //页面
                         self.getPageApi(pageID: listModel.content)
                     }
                 }
             }else{
-                
+                self.getHomePageConfigListApi()
             }
         }
     }
     //我的专辑收藏--在追短剧
-    func getMyAlbumCollection(){
-        CNLiveHomePageViewModel.requestGetHomePage { result, status in
+    func getMyAlbumCollection(page:NSInteger){
+        CNLiveHomePageViewModel.requestGetHomePageMyAlbum(page: page){ result, status in
             if status == .success{
-                
+                let arr = result as! Array<CNLiveAlbumMsgModel>
+                if arr.count>0{
+                    //显示在追短剧cell
+                    self.isHaveDuanJU = true
+                    self.duanjuDataArray = NSMutableArray(array: arr)
+                }else{
+                    //隐藏在追短剧cell
+                    self.isHaveDuanJU = false
+                }
+                self.tableView.reloadData()
+
             }else{
             }
@@ -39,26 +39,47 @@ extension CNHomePageAnimationTransition: UIViewControllerAnimatedTransitioning {
         let fromNavi = fromVCtemp.viewControllers![0] as! CNLiveBaseNavigationController
         let fromVC = fromNavi.viewControllers.first as! CNLiveAuthViewController
         guard let toNaviVC = transitionContext.viewController(forKey: .to) as? CNHomePageBaseNavigationController else { return }
-        guard let selectedCell = fromVC.selectedCell else { return }
-        let toVC = toNaviVC.topViewController as! CNHomepageDetailViewController
-        let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: fromVC.view)
-        //2.Set presentation original size.
-        toVC.view.frame = frame
-        toVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
-        toVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
-        
-        containerView.addSubview(toNaviVC.view)
-        
-        //3.Change original size to final size with animation.
-        UIView.animate(withDuration: transitonDuration, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
-            toVC.view.frame = UIScreen.main.bounds
-            toVC.scrollView.imageView.frame.size.width = KSreenWidth
-            toVC.scrollView.imageView.frame.size.height = KSreenWidth*DownSlideSingleCourseImgH/DownSlideSingleCourseW
-            toVC.closeBtn.alpha = 1
+        if  toNaviVC.topViewController is CNHomepageDetailViewController{
+            guard let selectedCell = fromVC.selectedCell else { return }
+            let toVC = toNaviVC.topViewController as! CNHomepageDetailViewController
+            let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: fromVC.view)
+            //2.Set presentation original size.
+            toVC.view.frame = frame
+            toVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+            toVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+            
+            containerView.addSubview(toNaviVC.view)
+            
+            //3.Change original size to final size with animation.
+            UIView.animate(withDuration: transitonDuration, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
+                toVC.view.frame = UIScreen.main.bounds
+                toVC.scrollView.imageView.frame.size.width = KSreenWidth
+                toVC.scrollView.imageView.frame.size.height = KSreenWidth*DownSlideSingleCourseImgH/DownSlideSingleCourseW
+                toVC.closeBtn.alpha = 1
+                
+            }) { (completed) in
+                transitionContext.completeTransition(completed)
+            }
+        }else if toNaviVC.topViewController is CNHomepageDuanJuDetailViewController{
+            guard let selectedCell = fromVC.selectedDuanjuCell else { return }
+            let toVC = toNaviVC.topViewController as! CNHomepageDuanJuDetailViewController
+            let frame = selectedCell.convert(selectedCell.totalView.frame, to: fromVC.view)
+            //2.Set presentation original size.
+            toVC.view.frame = frame            
+            containerView.addSubview(toNaviVC.view)
-        }) { (completed) in
-            transitionContext.completeTransition(completed)
+            //3.Change original size to final size with animation.
+            UIView.animate(withDuration: transitonDuration, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
+                toVC.view.frame = UIScreen.main.bounds
+                toVC.closeBtn.alpha = 1
+                
+            }) { (completed) in
+                transitionContext.completeTransition(completed)
+            }
+        }else{
+            return
         }
+        
     }
     func animationForDismiss(using transitionContext: UIViewControllerContextTransitioning) {
@@ -66,19 +87,36 @@ extension CNHomePageAnimationTransition: UIViewControllerAnimatedTransitioning {
         guard let toVCTabbar = transitionContext.viewController(forKey: .to) as? CNLiveBaseTabBarViewController else { return }
         let toVCNav = toVCTabbar.viewControllers?.first as! CNLiveBaseNavigationController
         let toVC = toVCNav.viewControllers.first as! CNLiveAuthViewController
-        guard let selectedCell = toVC.selectedCell else { return }
-        let fromVC = fromNaviVC.topViewController as! CNHomepageDetailViewController
-        
-        UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
-            let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
-            fromVC.view.frame = frame
-            fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
-            fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
-            fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
-            fromVC.closeBtn.alpha = 0
+        if fromNaviVC.topViewController is CNHomepageDetailViewController{
+            guard let selectedCell = toVC.selectedCell else { return }
+            let fromVC = fromNaviVC.topViewController as! CNHomepageDetailViewController
-        }) { (completed) in
-            transitionContext.completeTransition(completed)
+            UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+                let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
+                fromVC.view.frame = frame
+                fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+                fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+                fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+                fromVC.closeBtn.alpha = 0
+                
+            }) { (completed) in
+                transitionContext.completeTransition(completed)
+            }
+        }else if fromNaviVC.topViewController is CNHomepageDuanJuDetailViewController{
+            guard let selectedCell = toVC.selectedDuanjuCell else { return }
+            let fromVC = fromNaviVC.topViewController as! CNHomepageDuanJuDetailViewController
+            UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+                let frame = selectedCell.convert(selectedCell.totalView.frame, to: toVC.view)
+                fromVC.view.frame = frame
+                fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+                fromVC.closeBtn.alpha = 0
+                
+            }) { (completed) in
+                transitionContext.completeTransition(completed)
+            }
+
+        }else{
+            return
         }
     }
@@ -6,12 +6,16 @@
 //  首页短剧--大图点击详情页
 import Foundation
+import MJRefresh
+import EmptyDataSet_Swift
-class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewDataSource, UITableViewDelegate{
+class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewDataSource, UITableViewDelegate,EmptyDataSetSource, EmptyDataSetDelegate{
     let kCNLiveAlbumImageCellIdentifier = "kCNLiveAlbumImageCellIdentifier"
     let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
+    var pageNum: NSInteger
+    var network_type: CNLiveMineResponseType!
     // MARK: - 懒加载
     ///数据源
     lazy var dataArray: NSMutableArray = {
@@ -22,6 +26,8 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.dataSource = self
         tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.separatorStyle = .none
         tableView.tableFooterView = UIView.init()
         tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
@@ -75,11 +81,13 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     }()
     init(cell: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel) {
+        self.pageNum = 1
         self.cell = cell
         super.init(nibName: nil, bundle: nil)
         self.slideModel = slideModel
         self.setupTranstion()
         setNeedsStatusBarAppearanceUpdate()
+        
     }
     private func setupTranstion() {
@@ -95,7 +103,7 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
         super.viewDidLoad()
         setupUI()
         getImageFromCell()
-        self.getBlockContents()
+        self.getBlockContents(page: 1)
     }
     private func setupUI() {
@@ -137,7 +145,6 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        let goodsModel = self.dataArray[indexPath.row] as! CNLiveShopGoodsListModel
         if indexPath.section == 0{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
             else {
@@ -167,17 +174,50 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     }
     // MARK: - 获取全部专辑列表
-    func getBlockContents(){
-        CNLiveHomePageViewModel.getBlockContents(blockId: self.slideModel!.blockId ?? "") { result, status in
+    func getBlockContents(page:NSInteger){
+        CNLiveHomePageViewModel.getBlockContents(blockId: self.slideModel!.blockId ?? "", page: page) {[weak self] result, status in
             if status == .success{
-                let albumArr = result as! Array<CNLiveAlbumModel>
-                self.dataArray = NSMutableArray(array: albumArr)
-                self.tableView.reloadData()
-            }else{
+                if self!.pageNum > 1 {
+                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumModel])
+                }
+                if self!.pageNum == 1 {
+                    self!.dataArray.removeAllObjects()
+                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumModel])
+                    if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
+                        self!.addRefreshView()
+                        self!.pageNum = self!.pageNum + 1
+                        self!.getBlockContents(page: self!.pageNum)
+                    }
+                }
+                self!.tableView.mj_header?.endRefreshing()
+                self!.tableView.mj_footer?.endRefreshing()
+                self!.tableView.reloadData()
+                if (result as! Array<Any>).count == 0 {
+                    self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    self!.tableView.reloadData()
+                }
+
+            }else if (status == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
             }
         }
     }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.pageNum = 1
+            self!.getBlockContents(page: 1)
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self!.getBlockContents(page: self!.pageNum)
+        })
+    }
     @objc private func handleDismissPan(gesture: UIPanGestureRecognizer) {
         if !draggingDownToDismiss {
@@ -271,3 +311,48 @@ extension CNHomepageDetailViewController: UIGestureRecognizerDelegate {
         return true
     }
 }
+
+extension CNHomepageDetailViewController {
+    
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        if network_type == .failed  || network_type == .unkonw {
+            return UIImage(named: "mine_list_source_unusual_failed")
+        }
+        if dataArray.count == 0 {
+            return UIImage(named: "mine_list_source_unusual_empty")
+        }
+        if network_type == .noNetwork {
+            return UIImage(named: "mine_list_source_unusual_noNet")
+        }
+        return UIImage(named: "mine_list_source_unusual_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
+        if dataArray.count == 0 {
+            defult_string = "暂时没有数据～"
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
+        if network_type == .failed || network_type == .noNetwork {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷一刷", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
+        if network_type == .failed || network_type == .noNetwork  {
+            getBlockContents(page: 1)
+        }
+    }
+}
+//
+//  CNHomepageDuanJuDetailViewController.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/5.
+//  首页短剧--在追短剧点击详情页
+
+import Foundation
+import MJRefresh
+import EmptyDataSet_Swift
+
+class CNHomepageDuanJuDetailViewController: CNLiveBaseViewController  ,UITableViewDataSource, UITableViewDelegate,EmptyDataSetSource, EmptyDataSetDelegate{
+    
+    let kCNLiveDuanjuTitleCellIdentifier = "kCNLiveDuanjuTitleCellIdentifier"
+    let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
+
+    var pageNum: NSInteger
+    var network_type: CNLiveMineResponseType!
+    // MARK: - 懒加载
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
+        tableView.register(CNLiveDuanjuTitleCell.self, forCellReuseIdentifier: kCNLiveDuanjuTitleCellIdentifier)
+        return tableView
+    }()
+    
+    var dismissClosure: (()->())?
+    //the point when start to interactive
+    var interactiveStartingPoint: CGPoint? = nil
+
+    var draggingDownToDismiss = false
+    
+    let cell: CNLiveHomePageDuanJuCell!
+    
+    private lazy var dismissPanGesture: UIPanGestureRecognizer = {
+        let ges = UIPanGestureRecognizer()
+        ges.maximumNumberOfTouches = 1
+        ges.addTarget(self, action: #selector(handleDismissPan(gesture:)))
+        ges.delegate = self
+        return ges
+    }()
+        
+    lazy var closeBtn: UIButton = {
+        let btn = UIButton()
+        btn.frame = CGRect(x: KSreenWidth - 20 - 30, y: KStatusBarHeight+20, width: 30, height: 30)
+        btn.setImage(#imageLiteral(resourceName: "close_button"), for: .normal)
+        btn.addTarget(self, action: #selector(closeAction), for: .touchUpInside)
+        return btn
+    }()
+    
+    init(cell:CNLiveHomePageDuanJuCell) {
+        self.pageNum = 1
+        self.cell = cell
+        super.init(nibName: nil, bundle: nil)
+        self.setupTranstion()
+        setNeedsStatusBarAppearanceUpdate()
+        
+    }
+    
+    private func setupTranstion() {
+        modalPresentationStyle = .custom
+        transitioningDelegate = self
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+        self.getMyAlbum(page: 1)
+        self.view.backgroundColor = .white
+    }
+    
+    private func setupUI() {
+        self.view.layer.masksToBounds = true
+        self.view.addSubview(self.tableView)
+        self.tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-KStatusBarHeight)
+        view.addSubview(closeBtn)
+        view.addGestureRecognizer(dismissPanGesture)
+        
+        if #available(iOS 11.0, *) {
+        } else {
+            automaticallyAdjustsScrollViewInsets = false
+        }
+    }
+    
+    @objc private func closeAction() {
+        dismiss(animated: true, completion: nil)
+        let nav = self.navigationController as! CNHomePageBaseNavigationController
+        nav.dismissClosure?()
+    }
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        2
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0{
+            return 1
+        }else{
+            return self.dataArray.count
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDuanjuTitleCellIdentifier) as? CNLiveDuanjuTitleCell
+            else {
+                let cell = CNLiveDuanjuTitleCell()
+                return cell
+            }
+            return cell
+        }else{
+            let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumMsgModel
+
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
+            else {
+                let cell = CNLiveAlbumCell()
+                return cell
+            }
+            cell.albumMsgModel = albumModel
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0{
+            return 45//10+30+5
+        }else{
+            return 75
+        }
+    }
+    
+    // MARK: - 获取我的在追短剧列表
+    func getMyAlbum(page:NSInteger){
+        CNLiveHomePageViewModel.requestGetHomePageMyAlbum(page: page){[weak self] result, status in
+            if status == .success{
+                if self!.pageNum > 1 {
+                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumMsgModel])
+                }
+                if self!.pageNum == 1 {
+                    self!.dataArray.removeAllObjects()
+                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumMsgModel])
+                    if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
+                        self!.addRefreshView()
+                        self!.pageNum = self!.pageNum + 1
+                        self!.getMyAlbum(page: self!.pageNum)
+
+                    }
+                }
+                
+                self!.tableView.mj_header?.endRefreshing()
+                self!.tableView.mj_footer?.endRefreshing()
+                self!.tableView.reloadData()
+                if (result as! Array<Any>).count == 0 {
+                    self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    self!.tableView.reloadData()
+                }
+
+            }else if (status == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
+    }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.pageNum = 1
+            self!.getMyAlbum(page: 1)
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self!.getMyAlbum(page: self!.pageNum)
+        })
+    }
+    
+    @objc private func handleDismissPan(gesture: UIPanGestureRecognizer) {
+        if !draggingDownToDismiss {
+            return
+        }
+        
+        let startingPoint: CGPoint
+        
+        if let p = interactiveStartingPoint {
+            startingPoint = p
+        } else {
+            startingPoint = gesture.location(in: nil)
+            interactiveStartingPoint = startingPoint
+        }
+
+        let currentLocation = gesture.location(in: nil)
+        
+        var progress = (currentLocation.y - startingPoint.y) / 100
+        
+        //prevent viewController bigger when scrolling up
+        if currentLocation.y <= startingPoint.y {
+            progress = 0
+        }
+        
+        if progress >= 1.0 {
+            dismiss(animated: true, completion: nil)
+            let nav = self.navigationController as! CNHomePageBaseNavigationController
+            nav.dismissClosure?()
+//            dismissClosure?()
+            stopDismissPanGesture(gesture)
+            return
+        }
+
+        let targetShrinkScale: CGFloat = 0.86
+        let currentScale: CGFloat = 1 - (1 - targetShrinkScale) * progress
+        
+        switch gesture.state {
+        case .began,.changed:
+            gesture.view?.transform = CGAffineTransform(scaleX: currentScale, y: currentScale)
+            gesture.view?.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius * (progress)
+        case .cancelled,.ended:
+            stopDismissPanGesture(gesture)
+        default:
+            break
+        }
+    }
+    
+    //当下拉Offset超过100或取消下拉手势时，执行此方法
+    private func stopDismissPanGesture(_ gesture: UIPanGestureRecognizer) {
+        draggingDownToDismiss = false
+        interactiveStartingPoint = nil        
+        UIView.animate(withDuration: 0.2) {
+            gesture.view?.transform = CGAffineTransform.identity
+        }
+    }
+
+}
+
+extension CNHomepageDuanJuDetailViewController: UIViewControllerTransitioningDelegate {
+    
+    func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNHomePageAnimationTransition(animationType: .present)
+    }
+    
+    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNHomePageAnimationTransition(animationType: .dismiss)
+    }
+    
+    func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
+        return CNUpSlideCardPresentationController(presentedViewController: presented, presenting: presenting)
+    }
+}
+
+extension CNHomepageDuanJuDetailViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        
+        if scrollView.contentOffset.y < 0 {
+            scrollView.contentOffset = .zero
+            draggingDownToDismiss = true
+        }
+    }
+}
+
+extension CNHomepageDuanJuDetailViewController: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+}
+
+extension CNHomepageDuanJuDetailViewController {
+    
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        if network_type == .failed  || network_type == .unkonw {
+            return UIImage(named: "mine_list_source_unusual_failed")
+        }
+        if dataArray.count == 0 {
+            return UIImage(named: "mine_list_source_unusual_empty")
+        }
+        if network_type == .noNetwork {
+            return UIImage(named: "mine_list_source_unusual_noNet")
+        }
+        return UIImage(named: "mine_list_source_unusual_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
+        if dataArray.count == 0 {
+            defult_string = "暂时没有数据～"
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
+        if network_type == .failed || network_type == .noNetwork {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷一刷", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
+        if network_type == .failed || network_type == .noNetwork  {
+            getMyAlbum(page: 1)
+        }
+    }
+}
@@ -50,7 +50,6 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        let goodsModel = self.dataArray[indexPath.row] as! CNLiveShopGoodsListModel
         if indexPath.section == 0{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLivePlayletHeaderCellIdentifier) as? CNLivePlayletHomePageHeaderCell
             else {
@@ -6,64 +6,83 @@
 //  首页-在追短剧cell
 import Foundation
-//enum GlobalConstants {
-//    static let leftMargin: CGFloat = 20
-//    
-//    static let toDayCardRowH: CGFloat = 440
-//    static let toDayCardCornerRadius: CGFloat = 12.0
-//    static let todayCardSize: CGSize = CGSize(width: KSreenWidth - 2 * 15, height: DownSlideSingleCourseImgH)
-//    static let cardDetailTopImageH: CGFloat = 500
-//    
-//    static let iconBorderColor: CGColor = UIColor(red: 239/255.0, green: 240/255.0, blue: 241/255.0, alpha: 1).cgColor
-//    static let iconBorderWidth: CGFloat = 0.8
-//    static let iconCornerRadius: CGFloat = 17.5
-//    
-//    static let textBlueColor = UIColor(red: 0/255.0, green: 122/255.0, blue: 255/255.0, alpha: 1.0)   //007AFF
-//    static let speratorLineColor = UIColor(red: 224/255.0, green: 224/255.0, blue: 224/255.0, alpha: 1)
-//
-//}
-//
-/////全部课程 标题高度
-//let DownSlideAllCourseTitleH: CGFloat = 55
-////全部课程 每row_topY间距
-//let DownSlideAllCourseRowTopYGap: CGFloat = 10
-////全部课程 每row_topY间距
-//let DownSlideAllCourseRowBottomYGap: CGFloat = 20
-////全部课程 每row_img宽高
-//let DownSlideAllCourseRowImageWH: CGFloat = 45
-//
-/////全部课程 每row高度
-//let DownSlideAllCourseRowH: CGFloat = DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowBottomYGap + DownSlideAllCourseRowImageWH
-/////全部课程 宽度
-//let DownSlideAllCourseW: CGFloat = KSreenWidth - DownSlideRecommendLeftGap*2
-//
-/////单节课程 大图高度
-//let DownSlideSingleCourseImgH: CGFloat = 345
-/////单节课程 更多课程高度
-//let DownSlideSingleCourseMoreH: CGFloat = 60
-/////单节课程 宽度
-//let DownSlideSingleCourseW: CGFloat = KSreenWidth - DownSlideRecommendLeftGap*2
+import QMUIKit
+
+typealias DuanJUCellSelectedCallBackBlock = (_ cell: CNLiveHomePageDuanJuCell) -> Void
+
+class CNLiveHomePageDuanJuCell:UITableViewCell,UITableViewDelegate,UITableViewDataSource{
+    let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
+//    let bgBackView = UIView()
-class CNLiveHomePageDuanJuCell:UITableViewCell{
+    var DuanJUCellSelectedCallBack:DuanJUCellSelectedCallBackBlock?
+    lazy var modelArr: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    func setModelArr(modelArr:NSMutableArray){
+        self.modelArr = NSMutableArray(array: modelArr)
-    let bgBackView = UIView()
-    let bgImageView = UIImageView()
+        self.tableView.height = CGFloat(self.modelArr.count)*(45+15*2)
+        self.totalView.height = CGFloat(self.modelArr.count)*(45+15*2) + 55
+        self.tableView.reloadData()
+        
+//        //定义view的阴影颜色
+//        self.totalView.layer.shadowColor = UIColor.black.cgColor
+//        //阴影偏移量
+//        self.totalView.layer.shadowOffset=CGSize(width:1, height:1)
+//        //定义view的阴影宽度，模糊计算的半径
+//        self.totalView.layer.shadowRadius = 12
+//        //定义view的阴影透明度，注意:如果view没有设置背景色阴影也是不会显示的
+//        self.totalView.layer.shadowOpacity = 0.4
-    //slideModel
-    var _slideModel : CNLiveDownSlideModel?
-    var slideModel : CNLiveDownSlideModel? {
-        get{
-            _slideModel
-        }
-        set{
-            _slideModel = newValue!
-            self.setupNewUI(model: _slideModel!)
-        }
     }
+    //MARK: - 懒加载
+    ///区块标题
+    lazy var blockTitleLabl: UILabel = {
+        let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap+5, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+        titleLbl.text = "在追短剧"
+        titleLbl.font = BoldFont_21
+        titleLbl.textColor = HexColor("#333333")
+        return titleLbl
+    }()
+    lazy var totalView : UIView = {
+        let totalView = UIView(frame: CGRect(x: 15, y: 15, width: KSreenWidth-30, height: 100))
+        return totalView
+    }()
+
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: self.blockTitleLabl.bottom+5, width: KSreenWidth-30, height: 50), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.backgroundColor = .clear
+        tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
+        return tableView
+    }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
+
+        self.contentView.addSubview(self.totalView)
+        
+        self.totalView.addSubview(self.blockTitleLabl)
+        self.totalView.addSubview(self.tableView)
+        self.tableView.backgroundColor = .white
+        self.totalView.layer.cornerRadius = 12
+        self.totalView.clipsToBounds = true
+        self.totalView.backgroundColor = .white
+        
+        //定义view的阴影颜色
+        self.totalView.layer.shadowColor = UIColor.black.cgColor
+        //阴影偏移量
+        self.totalView.layer.shadowOffset=CGSize(width:1, height:1)
+        //定义view的阴影宽度，模糊计算的半径
+        self.totalView.layer.shadowRadius = 12
+        //定义view的阴影透明度，注意:如果view没有设置背景色阴影也是不会显示的
+        self.totalView.layer.shadowOpacity = 0.4
+        
         setupUI()
     }
@@ -72,123 +91,33 @@ class CNLiveHomePageDuanJuCell:UITableViewCell{
     }
     private func setupUI() {
-        contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+        contentView.backgroundColor =  HexColor(kCNDownSlideBackgroundColorHex)
     }
-    func setupNewUI(model:CNLiveDownSlideModel){
-        if model.type == SlideModelTypeAllCourse12 {
-            //全部课程列表
-            contentView.addSubview(bgBackView)
-
-            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:model.cellH-DownSlideRecommendLeftGap)
-            bgBackView.layer.shadowColor = HexColor("#000000")?.cgColor
-            bgBackView.layer.shadowRadius = 12
-            bgBackView.layer.shadowOpacity = 1
-            bgBackView.layer.shadowOffset = CGSize(width: 0, height: 0)
-            bgBackView.layer.cornerRadius = 12
-            bgBackView.clipsToBounds = true
-            bgBackView.backgroundColor = HexColor("#FFFFFF")
-            
-            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
-            titleLbl.text = model.blockName ?? "全部课程"
-            titleLbl.font = BoldFont_21
-            titleLbl.textColor = HexColor("#333333")
-            bgBackView.addSubview(titleLbl)
-            
-            //总块数
-            let contentsNum = model.contents.count
-            //model行数
-            let row = model.rowNum
-            //总显示块数
-            var totalNum = (contentsNum >= row) ? row : contentsNum
-            if row == 0{//row为0 , contents全部显示
-                totalNum = contentsNum
-            }
-            for i in 0..<totalNum{//i是第几行
-                let contentMdl = model.contents[i]
-                
-                //小icon
-                let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, titleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(i)*(DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowImageWH+DownSlideAllCourseRowBottomYGap), CGFloat(DownSlideAllCourseRowImageWH), CGFloat(DownSlideAllCourseRowImageWH)))
-                imageView.kf.setImage(with: URL(string:contentMdl.poster!))
-                bgBackView.addSubview(imageView)
-                
-                let titleLbl = UILabel(frame: CGRect(x: imageView.right+DownSlideRecommendLeftGap, y: imageView.top, width: DownSlideSingleCourseW-90-imageView.right, height: 21))
-                titleLbl.text = contentMdl.title ?? "婴儿课程"
-                titleLbl.font = Font_15
-                titleLbl.textColor = HexColor("#333333")
-                bgBackView.addSubview(titleLbl)
-                
-                let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
-                subTitleLbl.text = contentMdl.subTitle ?? "适应3-6岁"
-                subTitleLbl.font = Font_12
-                subTitleLbl.textColor = HexColor("#999999")
-                bgBackView.addSubview(subTitleLbl)
-                
-                let enterBtn = UIButton(type: .custom)
-                enterBtn.frame = CGRect(x: bgBackView.right-25-65, y: 0, width: 65, height: 30)
-                enterBtn.centerY = imageView.centerY
-                enterBtn.setBackgroundImage(UIImage(named: "homepage_down_enter"), for: .normal)
-                enterBtn.setTitle("进入", for: .normal)
-                enterBtn.titleLabel?.font = BoldFont_13
-                enterBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
-                enterBtn.addTarget(self, action: #selector(enterBtnAction(_:)), for: .touchUpInside)
-                enterBtn.tag = i
-                bgBackView.addSubview(enterBtn)
-            }
-        }else if model.type == SlideModelTypeOneCourse75 {
-            //单图课程
-            contentView.addSubview(bgBackView)
-            bgBackView.addSubview(bgImageView)
-            
-            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:DownSlideSingleCourseMoreH+DownSlideSingleCourseImgH)
-            bgBackView.layer.shadowColor = UIColor.black.cgColor
-            bgBackView.layer.shadowOpacity = 0.4
-            bgBackView.layer.shadowOffset = CGSize(width: 0, height: 1)
-            
-            bgImageView.frame = CGRect(x: 0, y: 0,width:DownSlideSingleCourseW , height:DownSlideSingleCourseImgH)
-            bgImageView.contentMode = .scaleAspectFill
-            bgImageView.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
-            bgImageView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-            bgImageView.layer.masksToBounds = true
-            bgImageView.kf.setImage(with: URL(string: model.contents[0].poster ?? ""))
-            
-            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
-            titleLbl.text = model.contents[0].title ?? "婴儿课程"
-            titleLbl.font = BoldFont_21
-            titleLbl.textColor = HexColor("#FFFFFF")
-            bgImageView.addSubview(titleLbl)
-            
-            let subTitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y:titleLbl.bottom , width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
-            subTitleLbl.text = model.contents[0].subTitle ?? "适应3-6岁"
-            subTitleLbl.font = Font_12
-            subTitleLbl.textColor = HexColor("#FFFFFF")
-            bgImageView.addSubview(subTitleLbl)
-            
-            //单节底部视图
-            let singleCourseBottomView = UIView(frame: CGRect(x: 0, y: DownSlideSingleCourseImgH, width: DownSlideSingleCourseW, height: DownSlideSingleCourseMoreH))
-            singleCourseBottomView.layer.cornerRadius = 12
-            singleCourseBottomView.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
-            singleCourseBottomView.backgroundColor = .white
-            singleCourseBottomView.isUserInteractionEnabled = true
-            bgBackView.addSubview(singleCourseBottomView)
-            
-            let moreLabel = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: 15, width: DownSlideSingleCourseW - 50 - DownSlideRecommendLeftGap   , height: 30))
-            moreLabel.text = model.blockName ?? "更多"
-            moreLabel.font = Font_15
-            moreLabel.textColor = HexColor("#333333")
-            singleCourseBottomView.addSubview(moreLabel)
-            
-            let moreImgView = UIImageView(image: UIImage(named: "homepage_down_more"))
-            moreImgView.left = moreLabel.right
-            moreImgView.centerY = moreLabel.centerY
-            singleCourseBottomView.addSubview(moreImgView)
-        }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        self.modelArr.count
     }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let model = self.modelArr[indexPath.row] as! CNLiveAlbumMsgModel
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
+        else {
+            let cell = CNLiveAlbumCell()
+            return cell
+        }
+        cell.albumMsgModel = model
+
+        return cell
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        self.DuanJUCellSelectedCallBack!(self)
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 45+15*2
+    }
     //MARK: - 事件
-    @objc func enterBtnAction(_ sender: UIButton){
-        let tag = sender.tag
-        let contentMdl = self.slideModel?.contents[tag]
-        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl!)
+    @objc func playBtnAction(){
+        showLoading(message: "")
+//        self.getAlbumList()
     }
 }
@@ -10,6 +10,19 @@ import QMUIKit
 class CNLiveAlbumCell:UITableViewCell{
     var albumModelArr:Array<CNLiveAlbumListModel>?
+    
+    var _albumMsgModel : CNLiveAlbumMsgModel?
+    var albumMsgModel : CNLiveAlbumMsgModel? {
+        get{
+            _albumMsgModel
+        }
+        set{
+            _albumMsgModel = newValue!
+            
+            self.setupNewUIMsgModel(model: _albumMsgModel!)
+        }
+    }
+
     //AlbumModel
     var _albumModel : CNLiveAlbumModel?
     var albumModel : CNLiveAlbumModel? {
@@ -76,6 +89,15 @@ class CNLiveAlbumCell:UITableViewCell{
         self.titleLabl.text = model.title
         self.subTitleLabel.text = model.subTitle
         self.iconImgView.kf.setImage(with: URL(string: model.poster))
+        self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80
+        self.playBtn.left = KSreenWidth-80
+    }
+    func setupNewUIMsgModel(model:CNLiveAlbumMsgModel){
+        self.titleLabl.text = model.albumName
+        self.subTitleLabel.text = model.subTitle
+        self.iconImgView.kf.setImage(with: URL(string: model.albumImg))
+        self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80-30
+        self.playBtn.left = KSreenWidth-80-30
     }
     @objc func playBtnAction(){
         showLoading(message: "")
@@ -84,7 +106,15 @@ class CNLiveAlbumCell:UITableViewCell{
     //获取专辑详情(简介等)
     func getAlbumMsg(){
-        CNLiveHomePageViewModel.getAlbumMsg(aid: self.albumModel!.contentId) { result, status in
+        var aid = ""
+        if self.albumModel != nil{
+            aid = self.albumModel!.contentId
+        }else if self.albumMsgModel != nil{
+            aid = self.albumMsgModel!.albumId
+        }else{
+            aid = ""
+        }
+        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
             hiddenLoading()
             if status == .success{
                 let model = result as! CNLiveAlbumMsgModel
@@ -100,7 +130,15 @@ class CNLiveAlbumCell:UITableViewCell{
     //获取专辑视频列表详情(播放地址 ,点赞数等信息)
     func getAlbumList(){
         showLoading(message: "")
-        CNLiveHomePageViewModel.getAlbumList(aid: self.albumModel!.contentId){ result, status in
+        var aid = ""
+        if self.albumModel != nil{
+            aid = self.albumModel!.contentId
+        }else if self.albumMsgModel != nil{
+            aid = self.albumMsgModel!.albumId
+        }else{
+            aid = ""
+        }
+        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
             hiddenLoading()
             if status == .success{
                 let arr = result as! Array<CNLiveAlbumListModel>
+//
+//  CNLiveDuanjuTitleCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/10.
+//  在追短剧详情页-title cell
+
+import Foundation
+
+class CNLiveDuanjuTitleCell:UITableViewCell{
+    
+    //MARK: - 懒加载
+    ///区块标题
+    lazy var blockTitleLabl: UILabel = {
+        let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: 10, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+        titleLbl.text = "在追短剧"
+        titleLbl.font = BoldFont_21
+        titleLbl.textColor = HexColor("#333333")
+        return titleLbl
+    }()
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        
+        setupUI()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupUI() {
+        contentView.backgroundColor = .white
+        self.contentView.addSubview(self.blockTitleLabl)
+    }
+    
+    
+}
@@ -12,15 +12,15 @@ import SnapKit
 class CNLivePlayletHomePageHeaderCell:UITableViewCell{
     //MARK: - 懒加载
     lazy var iconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: 20, y: 20, width: 100, height: 100))
+        let iconImgView = UIImageView(frame: CGRect(x: 20, y: 20, width: 112, height: 147))
         return iconImgView
     }()
     ///标题
     lazy var titleLabl: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+10, self.iconImgView.top+20, KSreenWidth-(self.iconImgView.right+15)-10, 21))
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.iconImgView.top, KSreenWidth-(self.iconImgView.right+15)-10, 21))
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
-        titleLabel.font = Font_20
+        titleLabel.font = Font_15
         titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
         let height = titleLabel.qmui_lineHeight
         titleLabel.height = height
@@ -33,11 +33,10 @@ class CNLiveHomePageViewModel:NSObject{
         }
     }
     /// 获取首页我的专辑收藏数据
-    static func requestGetHomePage(resultBlock: @escaping downSlideResultBlock) {
+    static func requestGetHomePageMyAlbum(page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
-        param.setValue("1", forKey: "page")
-        param.setValue("50", forKey: "pageSize")
+        param.setValue("\(page)", forKey: "page")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
@@ -47,10 +46,19 @@ class CNLiveHomePageViewModel:NSObject{
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
-                    let dataDic = resp["data"] as! Dictionary<String, Any>
-                    let dataMdl = newDictionaryToModel(dataDic, CNLiveHomePageModel.self)
+                    let dataArr = resp["data"] as! Array<Any>
+                    var resArr = []
+                    if dataArr.count > 0{
+                        //有在追短剧
+                        for dataDic in dataArr {
+                            let dataMdl = newDictionaryToModel(dataDic as! [String : Any], CNLiveAlbumMsgModel.self)
+                            resArr.append(dataMdl)
+                        }
+                    }else{
+                        //没有在追短剧
+                    }
-                    resultBlock(dataMdl,.success)
+                    resultBlock(resArr,.success)
                 }
                 else{
                     resultBlock(NSNull(),.failed)
@@ -59,9 +67,11 @@ class CNLiveHomePageViewModel:NSObject{
         }
     }
     /// 获取首页-全部专辑列表
-    static func getBlockContents(blockId:String,resultBlock: @escaping downSlideResultBlock) {
+    static func getBlockContents(blockId:String,page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(blockId, forKey: "blockId")
+        param.setValue("\(page)", forKey: "page")
+//        param.setValue("10", forKey: "pageSize")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getBlockContents", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -49,6 +49,7 @@ class CNLiveShopOrderListViewController: CNLiveBaseViewController, UITableViewDe
     var pageNum: NSInteger
     var network_type: CNLiveMineResponseType!
+    
     var _show_type:CNLiveShopOrderListShowType!
     init(show_type:CNLiveShopOrderListShowType) {
         self.pageNum = 1
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "authentication@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "authentication@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "authentication_unSelect@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "authentication_unSelect@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}