实时热榜详情页

“张旭”
1 parent 518398eb
Showing 7 changed files with 350 additions and 14 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideRealHotListCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveRealHotListDetailCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveRealHotListDetailImageCell.swift
metaCode/Classes/Main/HomePages/Controller/CNLiveTotalHotListController/CNLiveTotalHotListController.swift
metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
@@ -135,6 +135,9 @@
 		19C0F76F2BDB4CE10097CC8F /* CNBindingManageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C0F76E2BDB4CE10097CC8F /* CNBindingManageModel.swift */; };
 		19C0F7712BDE1A3B0097CC8F /* CNLiveMineChangePhoneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C0F7702BDE1A3B0097CC8F /* CNLiveMineChangePhoneController.swift */; };
 		19C0F7742BDF71CA0097CC8F /* CNLiveDigitalAuthController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C0F7732BDF71CA0097CC8F /* CNLiveDigitalAuthController.swift */; };
+		19C735C12BFDCEE900CACF4E /* CNLiveTotalHotListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735C02BFDCEE900CACF4E /* CNLiveTotalHotListController.swift */; };
+		19C735C32BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735C22BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift */; };
+		19C735C52BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735C42BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift */; };
 		19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */; };
 		19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */; };
 		19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */; };
@@ -419,6 +422,9 @@
 		19C0F76E2BDB4CE10097CC8F /* CNBindingManageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNBindingManageModel.swift; sourceTree = "<group>"; };
 		19C0F7702BDE1A3B0097CC8F /* CNLiveMineChangePhoneController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineChangePhoneController.swift; sourceTree = "<group>"; };
 		19C0F7732BDF71CA0097CC8F /* CNLiveDigitalAuthController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalAuthController.swift; sourceTree = "<group>"; };
+		19C735C02BFDCEE900CACF4E /* CNLiveTotalHotListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTotalHotListController.swift; sourceTree = "<group>"; };
+		19C735C22BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRealHotListDetailCell.swift; sourceTree = "<group>"; };
+		19C735C42BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRealHotListDetailImageCell.swift; sourceTree = "<group>"; };
 		19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNDownSlideSingleCourseCell.swift; sourceTree = "<group>"; };
 		19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Extension.swift"; sourceTree = "<group>"; };
 		19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideDetailViewController.swift; sourceTree = "<group>"; };
@@ -735,6 +741,7 @@
 		1938BD152B3D6C6000390A34 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				19C735BF2BFDCECD00CACF4E /* CNLiveTotalHotListController */,
 				1938BD272B48009600390A34 /* HomeController */,
 				1938BD1D2B46791400390A34 /* PlayletHomePage */,
 			);
@@ -852,6 +859,8 @@
 				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
 				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
 				19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */,
+				19C735C22BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift */,
+				19C735C42BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift */,
 			);
 			path = DownSlide;
 			sourceTree = "<group>";
@@ -1044,6 +1053,14 @@
 			path = DigitalAuth;
 			sourceTree = "<group>";
 		};
+		19C735BF2BFDCECD00CACF4E /* CNLiveTotalHotListController */ = {
+			isa = PBXGroup;
+			children = (
+				19C735C02BFDCEE900CACF4E /* CNLiveTotalHotListController.swift */,
+			);
+			path = CNLiveTotalHotListController;
+			sourceTree = "<group>";
+		};
 		19CC4D502ADD126D00308E2A /* Util */ = {
 			isa = PBXGroup;
 			children = (
@@ -1851,6 +1868,7 @@
 				191733642B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift in Sources */,
 				79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				19C735C12BFDCEE900CACF4E /* CNLiveTotalHotListController.swift in Sources */,
 				7939B0732B47F12F005AE981 /* CNLiveShortVideoViewController.swift in Sources */,
 				19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */,
 				191733132B109F7B007BCC04 /* CNLivePlayerGestureView.swift in Sources */,
@@ -1920,6 +1938,7 @@
 				19C0F76D2BDB48750097CC8F /* CNBindingManageCell.swift in Sources */,
 				1917331D2B10A15A007BCC04 /* CNLivePlayerFailureView.swift in Sources */,
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
+				19C735C32BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift in Sources */,
 				79D094DC2B0765DD008CB1F3 /* CNLiveShopBodyCouponGoodsListView.swift in Sources */,
 				798916EF2B048EC800D08302 /* CNLiveShopTransListViewController.swift in Sources */,
 				7989B5C52A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift in Sources */,
@@ -1995,6 +2014,7 @@
 				790D01912A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
 				19FA20192AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift in Sources */,
+				19C735C52BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift in Sources */,
 				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
 				794294AA2B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
@@ -46,12 +46,22 @@ class CNLiveDownSlideRealHotListCell: UICollectionViewCell {
         layerView.frame = CGRect(x: 5, y: 0, width: 20, height: 17)
         return layerView
     }()
+    lazy var numTitleLabel: UILabel = {
+        let titleLabel = UILabel(frame: self.firstIconView.bounds)
+        titleLabel.textAlignment = .center
+        titleLabel.text = "1"
+        titleLabel.font = Font_12
+        return titleLabel
+    }()
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.contentView.addSubview(self.iconImgView)
         self.contentView.addSubview(self.titleLabel)
         self.contentView.addSubview(self.firstIconView)
+        self.firstIconView.addSubview(self.numTitleLabel)
+
         self.firstIconView.isHidden = true
     }
@@ -64,15 +74,22 @@ class CNLiveDownSlideRealHotListCell: UICollectionViewCell {
         self.titleLabel.text = model.title
         if self.num == 1{
             self.firstIconView.isHidden = false
-            self.firstIconView.image = UIImage(named: "")
+            self.firstIconView.backgroundColor = HexColor("#F23A87")
+            self.numTitleLabel.text = "1"
+//            self.firstIconView.image = UIImage(named: "")
         }else if self.num == 2{
             self.firstIconView.isHidden = false
-            self.firstIconView.image = UIImage(named: "")
+            self.firstIconView.backgroundColor = HexColor("#FB723F")
+            self.numTitleLabel.text = "2"
+//            self.firstIconView.image = UIImage(named: "")
         }else if self.num == 3{
             self.firstIconView.isHidden = false
-            self.firstIconView.image = UIImage(named: "")
+            self.firstIconView.backgroundColor = HexColor("#FFB03D")
+            self.numTitleLabel.text = "3"
+//            self.firstIconView.image = UIImage(named: "")
         }else{
             self.firstIconView.isHidden = true
+            self.numTitleLabel.text = ""
         }
     }
 }
+//
+//  CNLiveRealHotListDetailCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/5/11.
+//  实时热榜详情页列表cell
+
+import Foundation
+import Kingfisher
+
+class CNLiveRealHotListDetailCell: UICollectionViewCell {
+    
+    //是前三
+    var num = 0//第几
+    
+    //contentsModel
+    var _contentsModel : CNLiveDownSlideContentsModel?
+    var contentsModel : CNLiveDownSlideContentsModel? {
+        get{
+            _contentsModel
+        }
+        set{
+            _contentsModel = newValue!
+            setupNewUI(model: _contentsModel!)
+        }
+    }
+    
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 0, width: 95, height: 138))
+        iconImgView.contentMode = .scaleAspectFill
+        iconImgView.clipsToBounds = true
+        return iconImgView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.iconImgView.top, KSreenWidth-(self.iconImgView.right+15)-15, 23))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = BoldFont_16
+        return titleLabel
+    }()
+    lazy var subTitleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.titleLabel.left, self.titleLabel.bottom+5, self.titleLabel.width, 50))
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.numberOfLines = 3
+        titleLabel.font = BoldFont_12
+        return titleLabel
+    }()
+
+    //第一第二第三角标
+    lazy var firstIconView :UIImageView = {
+        let layerView = UIImageView()
+        layerView.frame = CGRect(x: 15+5, y: 0, width: 20, height: 17)
+        return layerView
+    }()
+    lazy var numTitleLabel: UILabel = {
+        let titleLabel = UILabel(frame: self.firstIconView.bounds)
+        titleLabel.textAlignment = .center
+        titleLabel.text = "1"
+        titleLabel.font = Font_12
+        return titleLabel
+    }()
+
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.contentView.addSubview(self.iconImgView)
+        self.contentView.addSubview(self.titleLabel)
+        self.contentView.addSubview(self.subTitleLabel)
+        self.contentView.addSubview(self.firstIconView)
+        self.firstIconView.addSubview(self.numTitleLabel)
+        self.firstIconView.isHidden = true
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setupNewUI(model:CNLiveDownSlideContentsModel){
+        self.iconImgView.kf.setImage(with: URL(string:model.poster))
+        self.titleLabel.text = model.title
+        self.subTitleLabel.text = model.subTitle
+        if self.num == 1{
+            self.firstIconView.isHidden = false
+            self.firstIconView.backgroundColor = HexColor("#F23A87")
+            self.numTitleLabel.text = "1"
+//            self.firstIconView.image = UIImage(named: "")
+        }else if self.num == 2{
+            self.firstIconView.isHidden = false
+            self.firstIconView.backgroundColor = HexColor("#FB723F")
+            self.numTitleLabel.text = "2"
+//            self.firstIconView.image = UIImage(named: "")
+        }else if self.num == 3{
+            self.firstIconView.isHidden = false
+            self.firstIconView.backgroundColor = HexColor("#FFB03D")
+            self.numTitleLabel.text = "3"
+//            self.firstIconView.image = UIImage(named: "")
+        }else{
+            self.firstIconView.isHidden = true
+            self.numTitleLabel.text = ""
+        }
+    }
+}
+
+//
+//  CNLiveRealHotListDetailImageCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/5/23.
+//  实时热榜详情页 顶部image cell
+
+import Foundation
+import Kingfisher
+
+class CNLiveRealHotListDetailImageCell: UICollectionViewCell {
+        
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 174.0*375/KSreenWidth))
+        iconImgView.contentMode = .scaleAspectFill
+        iconImgView.clipsToBounds = true
+        iconImgView.backgroundColor = .red
+        return iconImgView
+    }()
+        
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.contentView.addSubview(self.iconImgView)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+//
+//  CNLiveTotalHotListController.swift
+//  metaCode
+//
+//  Created by zx on 2024/5/22.
+//  实时热榜详情页
+
+import Foundation
+
+class CNLiveTotalHotListController:CNLiveBaseViewController, UICollectionViewDelegate, UICollectionViewDataSource{
+    var slideModel:CNLiveDownSlideModel?
+
+    //实时热榜的列表
+    lazy var realHotArr: NSMutableArray = {
+        var realHotArr = NSMutableArray()
+        return realHotArr
+    }()
+    let kRealHotListCollectionViewCellIdentifier = "kRealHotListCollectionViewCellIdentifier"
+    let kRealHotListCollectionViewImageCellIdentifier = "kRealHotListCollectionViewImageCellIdentifier"
+
+    lazy var realHotCollectionView: UICollectionView = {
+        let layout = UICollectionViewFlowLayout()
+        layout.scrollDirection = .vertical
+        layout.itemSize = CGSizeMake(KSreenWidth, 138+15)
+        layout.sectionInset = .init(top: 0, left: 0, bottom: 0, right: 0)
+        layout.minimumLineSpacing = 15
+        let cv = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        cv.delegate = self
+        cv.dataSource = self
+        cv.backgroundColor = .white
+        cv.register(CNLiveRealHotListDetailCell.self, forCellWithReuseIdentifier: kRealHotListCollectionViewCellIdentifier)
+        cv.register(CNLiveRealHotListDetailImageCell.self, forCellWithReuseIdentifier: kRealHotListCollectionViewImageCellIdentifier)
+        return cv
+    }()
+    
+    lazy var closeBtn: UIButton = {
+        let  closeBtn = UIButton(type: .custom)
+        closeBtn.frame = CGRect(x: 15, y: KStatusBarHeight, width: 20, height: 20)
+        closeBtn.centerY = self.titleLabel.centerY
+        closeBtn.setImage(UIImage(named: "mine_header_icon_white_back"), for: .normal)
+        closeBtn.addTarget(self, action: #selector(changeCancelAction), for: .touchUpInside)
+        return closeBtn
+    }()
+
+    /// 初始化播放器,第多少集
+    init(slideModel:CNLiveDownSlideModel?) {
+        super.init(nibName:nil, bundle:nil)
+        self.slideModel = slideModel
+        
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .white
+                
+        self.view.addSubview(self.realHotCollectionView)
+        self.realHotCollectionView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
+        self.realHotArr = NSMutableArray(array: self.slideModel!.contents)
+        self.realHotCollectionView.reloadData()
+
+        self.view.addSubview(self.closeBtn)
+    }
+    
+    func initUI(){
+        self.view.addSubview(self.realHotCollectionView)
+    }
+    
+    
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        
+        self.realHotArr.count+1
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        if indexPath.row == 0{
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kRealHotListCollectionViewImageCellIdentifier, for: indexPath) as! CNLiveRealHotListDetailImageCell
+            // 加载和设置图片到 cell.imageView
+            cell.iconImgView.kf.setImage(with: URL(string: self.slideModel?.background ?? ""))
+            return cell
+        }else{
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kRealHotListCollectionViewCellIdentifier, for: indexPath) as! CNLiveRealHotListDetailCell
+            cell.num = indexPath.row
+            // 加载和设置图片到 cell.imageView
+            cell.contentsModel = self.realHotArr[indexPath.row-1] as? CNLiveDownSlideContentsModel
+            return cell
+        }
+    }
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        if indexPath.row == 0{
+        }else{
+            if let contentMdl = self.realHotArr[indexPath.row-1] as? CNLiveDownSlideContentsModel{
+                //实时热榜点击短剧
+                CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl.model , contentId: contentMdl.contentId , pid: contentMdl.pid , shareUrl: contentMdl.shareUrl , thirdUrl: contentMdl.thirdUrl , title: contentMdl.title , s_to: contentMdl.s_to ,trailerId: contentMdl.trailerId , controller: nil, slideModel: self.slideModel)
+            }
+        }
+    }
+
+    
+    @objc func changeCancelAction() {
+        self.navigationController?.popViewController(animated: true)
+    }
+    
+    deinit {
+        
+    }
+}
@@ -268,6 +268,18 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                 present(detailVC, animated: true, completion: nil)
             }else if slideModel.type == SlideModelTypeRealHotList7{
                 //实时热榜
+                //在当前堆栈里遍历删除 播放控制器CNLiveShortVideoViewController
+                let tempArray = NSMutableArray.init()
+                self.navigationController?.viewControllers.forEach({ item in
+                    if (item.isKind(of: CNLiveTotalHotListController.self)) {
+                        tempArray.remove(item)
+                    }else{
+                        tempArray.add(item)
+                    }
+                })
+                self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
+
+                self.navigationController?.pushViewController(CNLiveTotalHotListController(slideModel: slideModel), animated: true)
             }
 //                else if slideModel.type == SlideModelTypeOneCourse75{
 //                guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
@@ -27,6 +27,17 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         hotListImgView.clipsToBounds = true
         return hotListImgView
     }()
+    lazy var totalHotListBtn: UIButton = {
+        let  totalHotListBtn = UIButton(type: .custom)
+        totalHotListBtn.frame = CGRect(x: KSreenWidth-110, y: 0, width: 100, height: 50)
+        totalHotListBtn.bottom = self.realHotCollectionView.top - 5
+        totalHotListBtn.setTitle("完整榜单", for: .normal)
+        totalHotListBtn.setTitleColor(.white, for: .normal)
+        totalHotListBtn.isHidden = true
+        totalHotListBtn.addTarget(self, action: #selector(totalHotListBtnAction), for: .touchUpInside)
+        return totalHotListBtn
+    }()
+
     //实时热榜的列表
     lazy var realHotArr: NSMutableArray = {
         var realHotArr = NSMutableArray()
@@ -201,18 +212,22 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         super.viewDidLoad()
         view.backgroundColor = .black
         view.addSubview(tableView)
-        view.addSubview(hotListView)
-        hotListView.addSubview(self.hotListImgView)
-        self.hotListImgView.kf.setImage(with: URL(string: self.slideModel!.background))
-        hotListView.addSubview(self.realHotCollectionView)
-        view.addSubview(backBtn)
-        view.addSubview(hotListBtn)
-        self.realHotCollectionView.frame = CGRect(x: 0, y: DownSlideRealHotListDetaiH-DownSlideRealHotListDetaiCollectCellH, width: KSreenWidth, height: DownSlideRealHotListDetaiCollectCellH)
-        self.realHotArr = NSMutableArray(array: self.slideModel!.contents)
-        self.realHotCollectionView.reloadData()
-        
-        self.updateHotListView(isShow: self.slideModel == nil ? false : true)
+
+        if self.slideModel != nil{
+            view.addSubview(hotListView)
+            hotListView.addSubview(self.hotListImgView)
+            self.hotListImgView.kf.setImage(with: URL(string: self.slideModel!.background))
+            hotListView.addSubview(self.realHotCollectionView)
+            view.addSubview(hotListBtn)
+            self.realHotCollectionView.frame = CGRect(x: 0, y: DownSlideRealHotListDetaiH-DownSlideRealHotListDetaiCollectCellH, width: KSreenWidth, height: DownSlideRealHotListDetaiCollectCellH)
+            self.realHotArr = NSMutableArray(array: self.slideModel!.contents)
+            self.realHotCollectionView.reloadData()
+            self.updateHotListView(isShow: self.slideModel == nil ? false : true)
+            view.addSubview(self.totalHotListBtn)
+            self.totalHotListBtn.isHidden = false
+        }
+        view.addSubview(backBtn)
         if self.dataArray.count == 0 {
             requestData {noMore in }
         }
@@ -278,6 +293,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                     self.tableView.top = self.hotListView.bottom
                 }
                 self.hotListBtn.isSelected = false
+                self.totalHotListBtn.isHidden = false
             }else{
                 //隐藏热榜
                 UIView.animate(withDuration: 0.25) {
@@ -285,6 +301,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                     self.tableView.top = self.hotListView.bottom
                 }
                 self.hotListBtn.isSelected = true
+                self.totalHotListBtn.isHidden = true
             }
         }else{
             //隐藏热榜
@@ -293,6 +310,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                 self.tableView.top = self.hotListView.bottom
             }
             self.hotListBtn.isSelected = true
+            self.totalHotListBtn.isHidden = true
         }
     }
@@ -311,6 +329,16 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     }
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         if let contentMdl = self.realHotArr[indexPath.row] as? CNLiveDownSlideContentsModel{
+            //在当前堆栈里遍历删除 播放控制器CNLiveShortVideoViewController
+            let tempArray = NSMutableArray.init()
+            self.navigationController?.viewControllers.forEach({ item in
+                if (item.isKind(of: CNLiveShortVideoViewController.self)) {
+                    tempArray.remove(item)
+                }else{
+                    tempArray.add(item)
+                }
+            })
+            self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
             //实时热榜点击短剧
             CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl.model , contentId: contentMdl.contentId , pid: contentMdl.pid , shareUrl: contentMdl.shareUrl , thirdUrl: contentMdl.thirdUrl , title: contentMdl.title , s_to: contentMdl.s_to ,trailerId: contentMdl.trailerId , controller: nil, slideModel: self.slideModel)
         }
@@ -452,6 +480,20 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             self.updateHotListView(isShow: true)
         }
     }
+    @objc func totalHotListBtnAction(_ sender: UIButton) {
+        //在当前堆栈里遍历删除 播放控制器CNLiveShortVideoViewController
+        let tempArray = NSMutableArray.init()
+        self.navigationController?.viewControllers.forEach({ item in
+            if (item.isKind(of: CNLiveTotalHotListController.self)) {
+                tempArray.remove(item)
+            }else{
+                tempArray.add(item)
+            }
+        })
+        self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
+        self.navigationController?.pushViewController(CNLiveTotalHotListController(slideModel: self.slideModel), animated: true)
+    }
+    
     func playVideo(at indexPath: IndexPath) {
         let data: CNLiveAlbumListModel = dataArray[indexPath.row] as! CNLiveAlbumListModel