首页支持短剧 , 课程区块

张旭
1 parent 8ba7d542
Showing 9 changed files with 511 additions and 153 deletions
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNSlideBaseNavigationController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDetailViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDuanJuDetailViewController.swift
metaCode/Classes/Main/HomePages/View/HomePage/CNLiveHomePageDuanJuCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/Util/CNUpSlideAnimationTransition.swift
@@ -10,6 +10,18 @@ import Foundation
 class CNSlideBaseNavigationController: UINavigationController
     ,UIViewControllerTransitioningDelegate {
     var dismissClosure: (()->())?
+    var cellType:CNLiveHomePageCellType = .course
+    
+    init(rootViewController: UIViewController,cellType:CNLiveHomePageCellType) {
+        super.init(rootViewController: rootViewController)
+        self.cellType = cellType
+
+    }
+        
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+        
     override func viewDidLoad() {
         super.viewDidLoad()
         modalPresentationStyle = .custom
@@ -17,11 +29,11 @@ class CNSlideBaseNavigationController: UINavigationController
     }
     func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return CNUpSlideAnimationTransition(animationType: .present)
+        return CNUpSlideAnimationTransition(animationType: .present, cellType: self.cellType)
     }
     func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return CNUpSlideAnimationTransition(animationType:  .dismiss)
+        return CNUpSlideAnimationTransition(animationType:  .dismiss, cellType: self.cellType)
     }
     func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
@@ -3,11 +3,24 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/16.
-//  下滑页原生页--大图点击详情页
+//  下滑页原生页--课程 大图点击详情页
+//  首页原生页--短剧 大图详情页
 import Foundation
+import MJRefresh
+import EmptyDataSet_Swift
-class CNUpSlideDetailViewController: CNLiveBaseViewController {
+///首页课程或短剧类型
+enum CNLiveHomePageCellType {
+    ///课程控制器->课程
+    case course
+    ///短剧控制器->短剧
+    case playlet
+    ///短剧控制器->课程
+    case playletToCourse
+}
+
+class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate,EmptyDataSetSource, EmptyDataSetDelegate {
     //slideModel
     var _slideModel : CNLiveDownSlideModel?
@@ -20,6 +33,8 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController {
         }
     }
+    var cellType: CNLiveHomePageCellType = .course
+    
     var dismissClosure: (()->())?
     //the point when start to interactive
     var interactiveStartingPoint: CGPoint? = nil
@@ -54,7 +69,9 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController {
         return btn
     }()
-    init(cell: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel) {
+    init(cell: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel,cellType:CNLiveHomePageCellType) {
+        self.cellType = cellType
+        self.pageNum = 1
         self.cell = cell
         super.init(nibName: nil, bundle: nil)
         self.slideModel = slideModel
@@ -75,12 +92,20 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController {
         super.viewDidLoad()
         setupUI()
         getImageFromCell()
+        if self.cellType == .playlet{
+            self.getBlockContents(page: 1)
+        }
     }
     private func setupUI() {
         self.view.layer.masksToBounds = true
-        view.addSubview(scrollView)
-        scrollView.slideModel = _slideModel
+        if self.cellType == .playlet{
+            self.view.addSubview(self.tableView)
+            self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
+        }else{
+            view.addSubview(scrollView)
+            scrollView.slideModel = _slideModel
+        }
         view.addSubview(closeBtn)
         view.addGestureRecognizer(dismissPanGesture)
@@ -128,7 +153,6 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController {
             dismiss(animated: true, completion: nil)
             let nav = self.navigationController as! CNSlideBaseNavigationController
             nav.dismissClosure?()
-//            dismissClosure?()
             stopDismissPanGesture(gesture)
             return
         }
@@ -160,17 +184,132 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController {
             gesture.view?.transform = CGAffineTransform.identity
         }
     }
+    
+    // MARK: - 短剧cell列表详情页
+    let kCNLiveAlbumImageCellIdentifier = "kCNLiveAlbumImageCellIdentifier"
+    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(CNLiveAlbumImageCell.self, forCellReuseIdentifier: kCNLiveAlbumImageCellIdentifier)
+        return tableView
+    }()
+                        
+    
+    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: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
+            else {
+                let cell = CNLiveAlbumImageCell()
+                return cell
+            }
+            cell.iconImgView.image = self.cell.bgImageView.image
+            return cell
+        }else{
+            let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
+
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
+            else {
+                let cell = CNLiveAlbumCell()
+                return cell
+            }
+            cell.albumModel = albumModel
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0{
+            return KSreenWidth
+        }else{
+            return 75
+        }
+    }
+    
+    // MARK: - 获取全部专辑列表
+    func getBlockContents(page:NSInteger){
+        showLoading(message: "")
+        CNLiveHomePageViewModel.getBlockContents(blockId: self.slideModel!.blockId ?? "", page: page) {[weak self] result, status in
+            hiddenLoading()
+            if status == .success{
+                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)
+        })
+    }
 }
 extension CNUpSlideDetailViewController: UIViewControllerTransitioningDelegate {
     func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return CNUpSlideAnimationTransition(animationType: .present)
+        return CNUpSlideAnimationTransition(animationType: .present, cellType: self.cellType)
     }
     func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return CNUpSlideAnimationTransition(animationType: .dismiss)
+        return CNUpSlideAnimationTransition(animationType: .dismiss, cellType: self.cellType)
     }
     func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
@@ -193,3 +332,48 @@ extension CNUpSlideDetailViewController: UIGestureRecognizerDelegate {
         return true
     }
 }
+
+extension CNUpSlideDetailViewController {
+    
+    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)
+        }
+    }
+}
@@ -160,6 +160,19 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+        var cellType:CNLiveHomePageCellType = .course
+        ///model
+        ///(1) 1,2时跳转:sharelUrl后面拼接 ?contentId=contentId&videoId=pid
+        ///(2) 3,4时跳转:thirdUrl
+        ///(3)“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
+        if slideModel.contents.first?.model ?? "0" == "1" || slideModel.contents.first?.model ?? "0" == "2" || slideModel.contents.first?.model ?? "0" == "3" || slideModel.contents.first?.model ?? "0" == "4"{
+            cellType = .course
+        }else if slideModel.contents.first?.model ?? "0" == "album_ugc"{
+            cellType = .playlet
+        }else{
+            //新类型
+        }
+
         //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
         if slideModel.type == SlideModelTypeRecommend4{
@@ -168,7 +181,7 @@ class CNUpSlideViewController: 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 = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType), cellType: cellType)
             detailVC.dismissClosure = { [weak self] in
                 guard let StrongSelf = self else { return }
                 StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
@@ -180,7 +193,7 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
             guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
             selectedCell = cell
-            let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel))
+            let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType), cellType: cellType)
             detailVC.dismissClosure = { [weak self] in
                 guard let StrongSelf = self else { return }
@@ -213,6 +213,19 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         }else{
             let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+            var cellType:CNLiveHomePageCellType = .course
+            ///model
+            ///(1) 1,2时跳转:sharelUrl后面拼接 ?contentId=contentId&videoId=pid
+            ///(2) 3,4时跳转:thirdUrl
+            ///(3)“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
+            if slideModel.contents.first?.model ?? "0" == "1" || slideModel.contents.first?.model ?? "0" == "2" || slideModel.contents.first?.model ?? "0" == "3" || slideModel.contents.first?.model ?? "0" == "4"{
+                cellType = .playletToCourse
+            }else if slideModel.contents.first?.model ?? "0" == "album_ugc"{
+                cellType = .playlet
+            }else{
+                //新类型
+            }
+
             //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
             if slideModel.type == SlideModelTypeRecommend4{
@@ -221,7 +234,8 @@ 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 = CNHomePageBaseNavigationController(rootViewController: CNHomepageDetailViewController(cell: cell,slideModel: slideModel))
+
+                let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType), cellType: cellType)
                 detailVC.dismissClosure = { [weak self] in
                     guard let StrongSelf = self else { return }
                     StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
@@ -232,8 +246,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             }else if slideModel.type == SlideModelTypeOneCourse75{
                 guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
                 selectedCell = cell
-                
-                let detailVC = CNHomePageBaseNavigationController(rootViewController:CNHomepageDetailViewController(cell: cell,slideModel: slideModel))
+                let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType), cellType: cellType)
                 detailVC.dismissClosure = { [weak self] in
                     guard let StrongSelf = self else { return }
@@ -318,7 +331,6 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         //        showLoading(message: "")
         CNLiveDownSlideViewModel.requestGetPage(pageId: pageID as NSString) { result, status in
             hiddenLoading()
-            
             if status == .success{
                 self.dataArray.removeAllObjects()
                 let array = result as! [Any]
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2024/1/5.
-//  首页短剧--大图点击详情页
+//  首页--短剧大图点击详情页
 import Foundation
 import MJRefresh
@@ -11,30 +11,6 @@ import EmptyDataSet_Swift
 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 = {
-        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(CNLiveAlbumImageCell.self, forCellReuseIdentifier: kCNLiveAlbumImageCellIdentifier)
-        return tableView
-    }()
-    
     //slideModel
     var _slideModel : CNLiveDownSlideModel?
     var slideModel : CNLiveDownSlideModel? {
@@ -49,11 +25,9 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     var dismissClosure: (()->())?
     //the point when start to interactive
     var interactiveStartingPoint: CGPoint? = nil
-
     var draggingDownToDismiss = false
-    
     let cell: CNDownSlideSingleCourseCell!
-    
+
     private lazy var dismissPanGesture: UIPanGestureRecognizer = {
         let ges = UIPanGestureRecognizer()
         ges.maximumNumberOfTouches = 1
@@ -79,7 +53,6 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
         btn.addTarget(self, action: #selector(closeAction), for: .touchUpInside)
         return btn
     }()
-    
     init(cell: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel) {
         self.pageNum = 1
         self.cell = cell
@@ -98,7 +71,6 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
@@ -125,12 +97,98 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     private func getImageFromCell() {
         scrollView.imageView.image = cell.bgImageView.image
     }
-    
     @objc private func closeAction() {
         dismiss(animated: true, completion: nil)
         let nav = self.navigationController as! CNHomePageBaseNavigationController
         nav.dismissClosure?()
     }
+    @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:
+            scrollView.isScrollEnabled = false
+            gesture.view?.transform = CGAffineTransform(scaleX: currentScale, y: currentScale)
+            gesture.view?.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius * (progress)
+            scrollView.showsVerticalScrollIndicator = false
+        case .cancelled,.ended:
+            scrollView.isScrollEnabled = true
+            stopDismissPanGesture(gesture)
+        default:
+            break
+        }
+    }
+    
+    //当下拉Offset超过100或取消下拉手势时，执行此方法
+    private func stopDismissPanGesture(_ gesture: UIPanGestureRecognizer) {
+        draggingDownToDismiss = false
+        interactiveStartingPoint = nil
+        scrollView.showsVerticalScrollIndicator = true
+        
+        UIView.animate(withDuration: 0.2) {
+            gesture.view?.transform = CGAffineTransform.identity
+        }
+    }
+
+    
+    
+    
+    let kCNLiveAlbumImageCellIdentifier = "kCNLiveAlbumImageCellIdentifier"
+    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(CNLiveAlbumImageCell.self, forCellReuseIdentifier: kCNLiveAlbumImageCellIdentifier)
+        return tableView
+    }()
+                        
     func numberOfSections(in tableView: UITableView) -> Int {
         2
@@ -220,67 +278,6 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
             self!.getBlockContents(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:
-            scrollView.isScrollEnabled = false
-            gesture.view?.transform = CGAffineTransform(scaleX: currentScale, y: currentScale)
-            gesture.view?.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius * (progress)
-            scrollView.showsVerticalScrollIndicator = false
-        case .cancelled,.ended:
-            scrollView.isScrollEnabled = true
-            stopDismissPanGesture(gesture)
-        default:
-            break
-        }
-    }
-    
-    //当下拉Offset超过100或取消下拉手势时，执行此方法
-    private func stopDismissPanGesture(_ gesture: UIPanGestureRecognizer) {
-        draggingDownToDismiss = false
-        interactiveStartingPoint = nil
-        scrollView.showsVerticalScrollIndicator = true
-        
-        UIView.animate(withDuration: 0.2) {
-            gesture.view?.transform = CGAffineTransform.identity
-        }
-    }
-
 }
 extension CNHomepageDetailViewController: UIViewControllerTransitioningDelegate {
@@ -130,7 +130,7 @@ class CNHomepageDuanJuDetailViewController: CNLiveBaseViewController  ,UITableVi
                 let cell = CNLiveAlbumCell()
                 return cell
             }
-            cell.albumMsgModel = albumModel
+            cell.setupNewUIMsgModel(model: albumModel,isDetail: true)
             return cell
         }
     }
@@ -105,8 +105,7 @@ class CNLiveHomePageDuanJuCell:UITableViewCell,UITableViewDelegate,UITableViewDa
             let cell = CNLiveAlbumCell()
             return cell
         }
-        cell.albumMsgModel = model
-
+        cell.setupNewUIMsgModel(model: model,isDetail: false)
         return cell
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -18,8 +18,6 @@ class CNLiveAlbumCell:UITableViewCell{
         }
         set{
             _albumMsgModel = newValue!
-            
-            self.setupNewUIMsgModel(model: _albumMsgModel!)
         }
     }
@@ -31,8 +29,6 @@ class CNLiveAlbumCell:UITableViewCell{
         }
         set{
             _albumModel = newValue!
-            
-            self.setupNewUI(model: _albumModel!)
         }
     }
     //MARK: - 懒加载
@@ -86,18 +82,25 @@ class CNLiveAlbumCell:UITableViewCell{
         fatalError("init(coder:) has not been implemented")
     }
     func setupNewUI(model:CNLiveAlbumModel){
+        self.albumModel = model
         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){
+    func setupNewUIMsgModel(model:CNLiveAlbumMsgModel,isDetail:Bool){
+        self.albumMsgModel = model
+        //在追短剧model
         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
+        if isDetail{
+            self.playBtn.left = KSreenWidth-80
+        }else{
+            self.playBtn.left = KSreenWidth-80-30
+        }
     }
     @objc func playBtnAction(){
         showLoading(message: "")
@@ -17,8 +17,9 @@ enum AnimationType {
 class CNUpSlideAnimationTransition: NSObject {
     let animationType: AnimationType!
-    
-    init(animationType: AnimationType) {
+    var cellType:CNLiveHomePageCellType = .course
+    init(animationType: AnimationType,cellType:CNLiveHomePageCellType) {
+        self.cellType = cellType
         self.animationType = animationType
         super.init()
     }
@@ -39,48 +40,185 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
     func animationForPresent(using transitionContext: UIViewControllerContextTransitioning) {
         let containerView = transitionContext.containerView
-        //1.Get fromVC and toVC
-        guard let fromVC = transitionContext.viewController(forKey: .from) as? CNUpSlideViewController else { return }
-        guard let toNaviVC = transitionContext.viewController(forKey: .to) as? CNSlideBaseNavigationController else { return }
-        guard let selectedCell = fromVC.selectedCell else { return }
-        let toVC = toNaviVC.topViewController as! CNUpSlideDetailViewController
-        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 self.cellType == .playlet{
+            //1.Get fromVC and toVC
+            guard let fromVCtemp = transitionContext.viewController(forKey: .from) as? CNLiveBaseTabBarViewController else { return }
+            let fromNavi = fromVCtemp.viewControllers![0] as! CNLiveBaseNavigationController
+            let fromVC = fromNavi.viewControllers.first as! CNLiveAuthViewController
+            guard let toNaviVC = transitionContext.viewController(forKey: .to) as? CNSlideBaseNavigationController else { return }
+            if  toNaviVC.topViewController is CNUpSlideDetailViewController{
+                guard let selectedCell = fromVC.selectedCell else { return }
+                let toVC = toNaviVC.topViewController as! CNUpSlideDetailViewController
+                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)
+                
+                //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
+            }
+        }else if self.cellType == .course{
+            //1.Get fromVC and toVC
+            guard let fromVC = transitionContext.viewController(forKey: .from) as? CNUpSlideViewController else { return }
+            guard let toNaviVC = transitionContext.viewController(forKey: .to) as? CNSlideBaseNavigationController else { return }
+            guard let selectedCell = fromVC.selectedCell else { return }
+            let toVC = toNaviVC.topViewController as! CNUpSlideDetailViewController
+            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)
-        }) { (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.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 self.cellType == .playletToCourse{
+            //1.Get fromVC and toVC
+            guard let fromVCtemp = transitionContext.viewController(forKey: .from) as? CNLiveBaseTabBarViewController else { return }
+            let fromNavi = fromVCtemp.viewControllers![0] as! CNLiveBaseNavigationController
+            let fromVC = fromNavi.viewControllers.first as! CNLiveAuthViewController
+//            guard let fromVC = transitionContext.viewController(forKey: .from) as? CNUpSlideViewController else { return }
+            guard let toNaviVC = transitionContext.viewController(forKey: .to) as? CNSlideBaseNavigationController else { return }
+            guard let selectedCell = fromVC.selectedCell else { return }
+            let toVC = toNaviVC.topViewController as! CNUpSlideDetailViewController
+            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)
+            }
         }
     }
     func animationForDismiss(using transitionContext: UIViewControllerContextTransitioning) {
-        guard let fromNaviVC = transitionContext.viewController(forKey: .from) as? CNSlideBaseNavigationController else { return }
-        guard let toVC = transitionContext.viewController(forKey: .to) as? CNUpSlideViewController else { return }
-        guard let selectedCell = toVC.selectedCell else { return }
-        let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
-        
-        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 self.cellType == .playlet{
+            guard let fromNaviVC = transitionContext.viewController(forKey: .from) as? CNSlideBaseNavigationController else { return }
+            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
+            if fromNaviVC.topViewController is CNUpSlideDetailViewController{
+                guard let selectedCell = toVC.selectedCell else { return }
+                let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
+                
+                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
+            }
+
+        }else if self.cellType == .course{
+            guard let fromNaviVC = transitionContext.viewController(forKey: .from) as? CNSlideBaseNavigationController else { return }
+            guard let toVC = transitionContext.viewController(forKey: .to) as? CNUpSlideViewController else { return }
+            guard let selectedCell = toVC.selectedCell else { return }
+            let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
+            
+            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 self.cellType == .playletToCourse{
+            guard let fromNaviVC = transitionContext.viewController(forKey: .from) as? CNSlideBaseNavigationController else { return }
+            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! CNUpSlideDetailViewController
-        }) { (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)
+            }
+
         }
+        
     }
 }