短剧首页cell , 热榜和横排短剧

“张旭”
1 parent cdcf28b7
Showing 17 changed files with 569 additions and 19 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/CNLiveConfigFontMacro.swift
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalAuthController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideRealHotListCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideRecommendCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumMsgModel.swift
metaCode/Classes/Main/Model/CNLiveDownSlideModelLayout.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
metaCode/Supporting Files/Assets.xcassets/AuthPage/Contents.json
metaCode/Supporting Files/Assets.xcassets/AuthPage/auth_blueBg.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/AuthPage/auth_blueBg.imageset/auth_blueBg@2x.png
metaCode/Supporting Files/Assets.xcassets/AuthPage/auth_blueBg.imageset/auth_blueBg@3x.png
@@ -106,6 +106,7 @@
 		1965FA402AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */; };
 		1965FA422AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */; };
 		197325D22BB11C18002E41A3 /* DatabaseManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197325D12BB11C18002E41A3 /* DatabaseManager.swift */; };
+		19864E3F2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */; };
 		19AB90642BB412C700B6A79B /* CNLiveDownslideOperationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AB90632BB412C700B6A79B /* CNLiveDownslideOperationManager.swift */; };
 		19AD65AA2BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */; };
 		19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */; };
@@ -132,6 +133,7 @@
 		19C0F76D2BDB48750097CC8F /* CNBindingManageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C0F76C2BDB48750097CC8F /* CNBindingManageCell.swift */; };
 		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 */; };
 		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 */; };
@@ -387,6 +389,7 @@
 		1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAddGoodsSelectUploadImageView.swift; sourceTree = "<group>"; };
 		1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsCategoryController.swift; sourceTree = "<group>"; };
 		197325D12BB11C18002E41A3 /* DatabaseManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseManager.swift; sourceTree = "<group>"; };
+		19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideRealHotListCell.swift; sourceTree = "<group>"; };
 		19AB90632BB412C700B6A79B /* CNLiveDownslideOperationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownslideOperationManager.swift; sourceTree = "<group>"; };
 		19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsDetailsTableViewCell.swift; sourceTree = "<group>"; };
 		19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCommentRequestShareModel.swift; sourceTree = "<group>"; };
@@ -413,6 +416,7 @@
 		19C0F76C2BDB48750097CC8F /* CNBindingManageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNBindingManageCell.swift; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
@@ -844,6 +848,7 @@
 				19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */,
 				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
 				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
+				19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */,
 			);
 			path = DownSlide;
 			sourceTree = "<group>";
@@ -1028,6 +1033,14 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
+		19C0F7722BDF71890097CC8F /* DigitalAuth */ = {
+			isa = PBXGroup;
+			children = (
+				19C0F7732BDF71CA0097CC8F /* CNLiveDigitalAuthController.swift */,
+			);
+			path = DigitalAuth;
+			sourceTree = "<group>";
+		};
 		19CC4D502ADD126D00308E2A /* Util */ = {
 			isa = PBXGroup;
 			children = (
@@ -1487,6 +1500,7 @@
 		7CD6754D2A2840B9008354C1 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				19C0F7722BDF71890097CC8F /* DigitalAuth */,
 				1938BD1A2B4554A800390A34 /* AuthMainController */,
 				1938BD1C2B4555A000390A34 /* WebController */,
 				1938BD1B2B45557700390A34 /* DownSlideController */,
@@ -1953,6 +1967,7 @@
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
 				19C0F7672BD8DC4D0097CC8F /* CNThreeLoginModel.swift in Sources */,
 				794FF1092B02131300385E85 /* CNLiveSaveSearchDB.swift in Sources */,
+				19864E3F2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift in Sources */,
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
 				1917331B2B10A0EF007BCC04 /* CNLivePlayerLoadingView.swift in Sources */,
 				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
@@ -1981,6 +1996,7 @@
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
 				19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */,
 				191733022B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift in Sources */,
+				19C0F7742BDF71CA0097CC8F /* CNLiveDigitalAuthController.swift in Sources */,
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
 				1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
@@ -62,6 +62,9 @@ let Font_18 = Font(18)
 let Font_19 = Font(19)
 let Font_20 = Font(20)
 let Font_21 = Font(21)
+let Font_22 = Font(22)
+let Font_23 = Font(23)
+let Font_24 = Font(24)
 let Font_25 = Font(25)
 let Font_30 = Font(30)
+//
+//  CNLiveDigitalAuthController.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/29.
+//  数字认证页面-选择领域
+
+import Foundation
+import SnapKit
+
+class CNLiveDigitalAuthController:CNLiveBaseViewController{
+    
+    lazy var bgImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "auth_blueBg")
+        return iconImgView
+    }()
+    
+    lazy var yuanmaLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = .white
+        titleLabel.text = "元码数字认证"
+        titleLabel.font = Font_24
+        titleLabel.adjustsFontSizeToFitWidth=true
+        return titleLabel
+    }()
+
+    lazy var yuanmaDescLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = .white
+        titleLabel.text = "真我，连接世界\n元码数字认证，为我赋能"
+        titleLabel.numberOfLines = 2
+        titleLabel.font = Font_13
+        return titleLabel
+    }()
+    
+    lazy var whiteBgView :UIView = {
+        let whiteBgView = UIView()
+        whiteBgView.backgroundColor = .white
+        whiteBgView.layer.cornerRadius = 12
+        whiteBgView.clipsToBounds = true
+        return whiteBgView
+    }()
+    lazy var blueLineView :UIView = {
+        let blueLineView = UIView()
+        blueLineView.backgroundColor = HexColor("#1F64E3")
+        blueLineView.layer.cornerRadius = 1.75
+        blueLineView.clipsToBounds = true
+        return blueLineView
+    }()
+    lazy var changeLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.text = "选择您当前所在领域"
+        titleLabel.font = Font_16
+        return titleLabel
+    }()
+    
+    lazy var dataArray :NSMutableArray = {
+        let dataArray = NSMutableArray()
+        return dataArray
+    }()
+
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBarHidden = false
+        titleName = "元码数字认证"
+        self.initUI()
+        self.loadData()
+    }
+    
+    deinit {
+        
+    }
+    
+    func initUI(){
+        self.view.addSubview(self.bgImgView)
+        self.bgImgView.snp.makeConstraints { make in
+            make.top.equalTo(KNavigationHeight)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(KSreenWidth*457/375)
+        }
+        
+        self.view.addSubview(self.yuanmaLabel)
+        self.yuanmaLabel.snp.makeConstraints { make in
+            make.top.equalTo(KNavigationHeight+adapt_length(length: 45))
+            make.left.equalTo(adapt_length(length: 30))
+        }
+        
+        self.view.addSubview(self.yuanmaDescLabel)
+        self.yuanmaDescLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.yuanmaLabel.snp.bottom).offset(adapt_length(length: 10))
+            make.left.equalTo(adapt_length(length: 30))
+        }
+        
+        self.view.addSubview(self.whiteBgView)
+        self.whiteBgView.snp.makeConstraints { make in
+            make.top.equalTo(self.yuanmaDescLabel.snp.bottom).offset(adapt_length(length: 31))
+            make.bottom.equalToSuperview()
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+        }
+        
+        self.whiteBgView.addSubview(self.blueLineView)
+        self.blueLineView.snp.makeConstraints { make in
+            make.top.equalTo(24)
+            make.left.equalTo(17)
+            make.width.equalTo(3)
+            make.height.equalTo(15)
+        }
+        
+        self.whiteBgView.addSubview(self.changeLabel)
+        self.changeLabel.snp.makeConstraints { make in
+            make.centerY.equalTo(self.blueLineView.snp.centerY)
+            make.left.equalTo(30)
+        }
+        
+    }
+    
+    func loadData(){
+        self.dataArray = NSMutableArray(array: ["来华留学生","大学生"])
+        self.setDataUI()
+    }
+    
+    func setDataUI(){
+        var lieNum = 0//列
+        var hangNum = 0//行
+        let padding = adapt_length(length: 55)//水平方向
+        let topMargin = self.changeLabel.bottom + adapt_length(length: 15.5)
+        let btnPadding = adapt_length(length: 30)//垂直方向
+        let W = (KSreenWidth - 30 - 3*adapt_length(length: 55))/2
+        let H = W*136/90.0
+        
+        for str in self.dataArray {
+            let iconBtn = UIButton(frame: CGRect(x: padding+CGFloat(lieNum)*(padding+W), y: topMargin+CGFloat(hangNum)*(btnPadding+H), width: W, height: H))
+            iconBtn.setupButtonImageAndTitlePossitionWith(padding: 10, style: .top)
+            iconBtn.setTitle(str as? String, for: .normal)
+            iconBtn.setTitleColor(HexColor("#1F64E3"), for: .normal)
+            iconBtn.setTitleColor(HexColor("#333333"), for: .selected)
+            iconBtn.setImage(UIImage(named: ""), for: .normal)
+            iconBtn.setImage(UIImage(named: ""), for: .selected)
+            iconBtn.backgroundColor = .red
+            self.whiteBgView.addSubview(iconBtn)
+            
+            iconBtn.snp.makeConstraints { make in
+                make.left.equalTo(padding+CGFloat(lieNum)*(padding+W))
+                make.top.equalTo(self.changeLabel.snp.bottom).offset(adapt_length(length: 15.5)+CGFloat(hangNum)*(btnPadding+H))
+                make.width.equalTo(W)
+                make.height.equalTo(H)
+            }
+            
+            lieNum = lieNum + 1
+            if lieNum == 2{
+                hangNum = hangNum + 1
+                lieNum = 0
+            }
+        }
+    }
+}
@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
-//下滑tableview背景颜色
+//下滑tableview背景颜色 浅灰色
 let kCNDownSlideBackgroundColorHex: String = "#F7F8FA"
 ///CNliveDownSlideModel Type
@@ -16,6 +16,8 @@ let SlideModelTypeRecommend4: String = &quot;4&quot;//4一排两个 推荐课程&amp;推荐活
 let SlideModelTypeTodayRecommend74: String = "74"//74今日推荐
 let SlideModelTypeAllCourse12: String = "12"//12列表全部课程
 let SlideModelTypeOneCourse75: String = "75"//75单课程大图
+let SlideModelTypeTwoDuanJu5: String = "5"//5竖版短剧 一排两个
+let SlideModelTypeRealHotList7: String = "7"//7实时热榜
 class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/16.
-//  单课程大图专辑 | 全部课程列表 | 我的课程列表
+//  单课程大图专辑 | 全部课程列表 | 我的课程列表 | 短剧竖图一排2个 | 实时热榜
 import Foundation
@@ -46,8 +46,12 @@ let DownSlideSingleCourseImgH: CGFloat = 345
 let DownSlideSingleCourseMoreH: CGFloat = 60
 ///单节课程 宽度
 let DownSlideSingleCourseW: CGFloat = KSreenWidth - DownSlideRecommendLeftGap*2
+//竖版短剧 副标题与底部间距
+let DownSlideTwoDuanJuBottomYGap: CGFloat = 25
+///竖版短剧标题左间距
+let DownSlideTwoDuanJuLeftGap: CGFloat = 10
-class CNDownSlideSingleCourseCell: UITableViewCell {
+class CNDownSlideSingleCourseCell: UITableViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
     let bgBackView = UIView()
     let bgImageView = UIImageView()
@@ -76,6 +80,26 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
         }
     }
+    //实时热榜的列表
+    lazy var realHotArr: NSMutableArray = {
+        var realHotArr = NSMutableArray()
+        return realHotArr
+    }()
+    let kRealHotListCollectionViewCellIdentifier = "kRealHotListCollectionViewCellIdentifier"
+    lazy var realHotCollectionView: UICollectionView = {
+        let layout = UICollectionViewFlowLayout()
+        layout.scrollDirection = .horizontal
+        layout.itemSize = CGSizeMake(69, 100+24)
+        layout.sectionInset = .init(top: 0, left: 0, bottom: 0, right: 0)
+        layout.minimumLineSpacing = 6
+        let cv = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        cv.delegate = self
+        cv.dataSource = self
+        cv.backgroundColor = .white
+        cv.register(CNLiveDownSlideRealHotListCell.self, forCellWithReuseIdentifier: kRealHotListCollectionViewCellIdentifier)
+        return cv
+    }()
+    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
@@ -243,9 +267,175 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
             moreImgView.left = moreLabel.right
             moreImgView.centerY = moreLabel.centerY
             singleCourseBottomView.addSubview(moreImgView)
+        }else if model.type == SlideModelTypeTwoDuanJu5 {
+            //竖版短剧 1排2个
+            contentView.addSubview(bgBackView)
+
+            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:CGFloat(model.cellH)-DownSlideRecommendLeftGap)
+            // 设置阴影效果
+            bgBackView.layer.masksToBounds = false
+            //定义view的阴影颜色
+            bgBackView.layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.1).cgColor
+            //定义view的阴影透明度，注意:如果view没有设置背景色阴影也是不会显示的
+            bgBackView.layer.shadowOpacity = 1
+            //定义view的阴影宽度，模糊计算的半径
+            bgBackView.layer.shadowRadius = 10.0
+            //阴影偏移量
+            bgBackView.layer.shadowOffset = CGSize(width: 0, height: 0)
+            bgBackView.layer.cornerRadius = 12
+            bgBackView.backgroundColor = .white
+            
+            var titleTop:CGFloat = DownSlideRecommendLeftGap
+            if model.blockSubTitle.count > 0{
+                let subtitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 17))
+                subtitleLbl.text = model.blockSubTitle
+                subtitleLbl.font = Font_12
+                subtitleLbl.textColor = HexColor("#999999")
+                bgBackView.addSubview(subtitleLbl)
+                titleTop = DownSlideRecommendLeftGap+17+1
+            }
+            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: titleTop, 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*2) ? row*2 : contentsNum
+            if row == 0{//row为0 , contents全部显示
+                totalNum = contentsNum
+            }
+            //lieIndex 当前是contents的第0列还是第1列
+            var lieIndex = 0
+            //hangIndex 当前是第几行,1...n
+            var hangIndex = 1
+
+            for i in 0..<totalNum{//i是第几行
+                var contentMdl = model.contents[i]
+                var imageX:CGFloat = 0
+                var imageY:CGFloat = 0
+                
+                if lieIndex == 0{
+                    //显示左边的块
+                    contentMdl = model.contents[(hangIndex-1)*2+(lieIndex)]
+                    imageX = DownSlideRecommendLeftGap
+                    imageY = titleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(hangIndex-1)*(DownSlideTwoDuanJuImageH+DownSlideAllCourseRowTopYGap+56+DownSlideTwoDuanJuBottomYGap)
+                    lieIndex = 1
+                }else{
+                    //lieIndex==1显示右边的块
+                    contentMdl = model.contents[(hangIndex-1)*2+(lieIndex)]
+                    imageX = CGFloat(DownSlideRecommendLeftGap*2)+CGFloat(DownSlideTwoDuanJuImageW)
+                    imageY = titleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(hangIndex-1)*(DownSlideTwoDuanJuImageH+DownSlideAllCourseRowTopYGap+56+DownSlideTwoDuanJuBottomYGap)
+                    lieIndex = 0
+                    hangIndex += 1
+                }
+                let imageView = UIImageView(frame: CGRectMake(imageX, imageY, CGFloat(DownSlideTwoDuanJuImageW), CGFloat(DownSlideTwoDuanJuImageH)))
+                imageView.kf.setImage(with: URL(string:contentMdl.poster ))
+                let path = UIBezierPath.init(roundedRect: CGRect(x: 0, y: 0, width: imageView.width, height:imageView.height ), byRoundingCorners: [.topLeft,.topRight], cornerRadii: CGSizeMake(10, 10))
+                let masklayer = CAShapeLayer()
+                masklayer.path = path.cgPath
+                imageView.layer.mask = masklayer
+                imageView.clipsToBounds = true
+                imageView.tag = i
+                imageView.contentMode = .scaleAspectFill
+                imageView.isUserInteractionEnabled = true
+                imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
+                bgBackView.addSubview(imageView)
+                
+                
+                let grayBgView = UIView(frame: CGRect(x: imageView.left, y: imageView.bottom, width: imageView.width, height: 0))
+                grayBgView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+                bgBackView.addSubview(grayBgView)
+                grayBgView.snp.makeConstraints { make in
+                    make.left.equalTo(imageView.snp.left)
+                    make.top.equalTo(imageView.snp.bottom)
+                    make.width.equalTo(imageView.snp.width)
+                    make.bottom.equalToSuperview().offset(-DownSlideRecommendLeftGap)
+                }
+                
+                let titleLbl = UILabel(frame: CGRect(x: imageView.left+DownSlideTwoDuanJuLeftGap, y: imageView.bottom+DownSlideTwoDuanJuLeftGap, width:imageView.width-2*DownSlideTwoDuanJuLeftGap, height: 20))
+                titleLbl.text = contentMdl.title
+                titleLbl.font = Font_14
+                titleLbl.textColor = HexColor("#333333")
+                bgBackView.addSubview(titleLbl)
+                
+                let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 33))
+                subTitleLbl.text =  contentMdl.subTitle
+                subTitleLbl.font = Font_12
+                subTitleLbl.textColor = HexColor("#999999")
+                subTitleLbl.sizeToFit()
+                let subLblWidth = subTitleLbl.bounds.size.width
+                if subLblWidth > titleLbl.width{
+                    subTitleLbl.numberOfLines = 2
+                    subTitleLbl.width = titleLbl.width
+                    subTitleLbl.height = 33
+                }else{
+                    subTitleLbl.numberOfLines = 1
+                    subTitleLbl.width = titleLbl.width
+                    subTitleLbl.height = subTitleLbl.bounds.size.height
+                }
+                bgBackView.addSubview(subTitleLbl)
+                
+            }
+        }else if model.type == SlideModelTypeRealHotList7 {
+            //实时热榜
+            contentView.addSubview(bgBackView)
+
+            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:CGFloat(model.cellH))
+            // 设置阴影效果
+            bgBackView.layer.masksToBounds = false
+            //定义view的阴影颜色
+            bgBackView.layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.1).cgColor
+            //定义view的阴影透明度，注意:如果view没有设置背景色阴影也是不会显示的
+            bgBackView.layer.shadowOpacity = 1
+            //定义view的阴影宽度，模糊计算的半径
+            bgBackView.layer.shadowRadius = 10.0
+            //阴影偏移量
+            bgBackView.layer.shadowOffset = CGSize(width: 0, height: 0)
+            bgBackView.layer.cornerRadius = 12
+            bgBackView.backgroundColor = .white
+            
+            let imageView = UIImageView(frame: CGRectMake(0, 0, bgBackView.width, CGFloat(bgBackView.width*140/345.0)))
+            imageView.kf.setImage(with: URL(string:model.background))
+            let path = UIBezierPath.init(roundedRect: CGRect(x: 0, y: 0, width: imageView.width, height:imageView.height), byRoundingCorners: [.topLeft,.topRight], cornerRadii: CGSizeMake(10, 10))
+            let masklayer = CAShapeLayer()
+            masklayer.path = path.cgPath
+            imageView.layer.mask = masklayer
+            imageView.clipsToBounds = true
+            imageView.contentMode = .scaleAspectFill
+            bgBackView.addSubview(imageView)
+            
+            bgBackView.addSubview(self.realHotCollectionView)
+            self.realHotCollectionView.frame = CGRect(x: DownSlideRecommendLeftGap, y: imageView.bottom, width: imageView.width-2*DownSlideRecommendLeftGap, height: bgBackView.height-imageView.height)
+            self.realHotArr = NSMutableArray(array: model.contents)
+            self.realHotCollectionView.reloadData()
         }
     }
+    // MARK: - 实时热榜里横向列表
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        self.realHotArr.count
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kRealHotListCollectionViewCellIdentifier, for: indexPath) as! CNLiveDownSlideRealHotListCell
+        cell.num = indexPath.row+1
+        // 加载和设置图片到 cell.imageView
+        cell.contentsModel = self.realHotArr[indexPath.row] as? CNLiveDownSlideContentsModel
+        return cell
+
+    }
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        if let contentMdl = self.realHotArr[indexPath.row] 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)
+        }
+    }
+    
+    
     func setupMyCurriculumUI(model:CNLiveAlbumBaseModel){
         contentView.subviews.forEach { view in
             view.removeFromSuperview()
@@ -334,4 +524,10 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
             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)
         }
     }
+    @objc func pushWebAction(ges: UITapGestureRecognizer){
+        let imageView = ges.view as! UIImageView
+        let i = imageView.tag
+        let contentMdl = (self.slideModel?.contents[i])!
+        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)
+    }
 }
+//
+//  CNLiveDownSlideRealHotListCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/5/11.
+//  实时热榜里的 水平列表cell
+
+import Foundation
+import Kingfisher
+
+class CNLiveDownSlideRealHotListCell: 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: 0, y: 0, width: 69, height: 100))
+        iconImgView.contentMode = .scaleAspectFill
+        iconImgView.clipsToBounds = true
+        return iconImgView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(0, self.iconImgView.bottom+5, self.iconImgView.width, 19))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = BoldFont_13
+        return titleLabel
+    }()
+
+    //第一第二第三角标
+    lazy var firstIconView :UIImageView = {
+        let layerView = UIImageView()
+        layerView.frame = CGRect(x: 5, y: 0, width: 20, height: 17)
+        return layerView
+    }()
+    
+    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.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
+        if self.num == 1{
+            self.firstIconView.isHidden = false
+            self.firstIconView.image = UIImage(named: "")
+        }else if self.num == 2{
+            self.firstIconView.isHidden = false
+            self.firstIconView.image = UIImage(named: "")
+        }else if self.num == 3{
+            self.firstIconView.isHidden = false
+            self.firstIconView.image = UIImage(named: "")
+        }else{
+            self.firstIconView.isHidden = true
+        }
+    }
+}
@@ -11,6 +11,15 @@ import Foundation
 let DownSlideRecommendLeftGap: CGFloat = 15
 ///推荐课程宽高
 let DownSlideRecommendWH: CGFloat = (KSreenWidth-DownSlideRecommendLeftGap*3)*0.5
+///type5 竖版短剧图片的高
+let DownSlideTwoDuanJuImageH: CGFloat = 217/150.0*DownSlideRecommendWH
+///type5 竖版短剧图片的宽
+let DownSlideTwoDuanJuImageW: CGFloat = (KSreenWidth-DownSlideRecommendLeftGap*5)*0.5
+///type5 竖版短剧cell的高
+let DownSlideTwoDuanJuH: CGFloat = 15+17+30+15+217/150.0*DownSlideRecommendWH+10+20+3+33+25+10
+///type7 实时热榜的高
+let DownSlideRealHotListH: CGFloat = CGFloat(DownSlideSingleCourseW*140/345.0)+154
+
 class CNLiveDownSlideRecommendCell: UITableViewCell {
@@ -787,6 +787,11 @@ class CNFrontMainView : UIView{
     //弹出弹窗
     func show17Alert(index:Int){
+        
+        //test
+        navigationViewController().pushViewController(CNLiveDigitalAuthController(), animated: true)
+        
+        
         delegate.window?.addSubview(self.alertBgView)
         delegate.window?.addSubview(self.alertBgImgView)
         alertBgImgView.snp.makeConstraints { make in
@@ -8,21 +8,14 @@
 import Foundation
 import MJRefresh
 class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
-        
-    //下滑tableview背景颜色 浅灰色
-    let kCNDownSlideBackgroundColorHex: String = "#F7F8FA"
-    
-    ///CNliveDownSlideModel Type
-    let SlideModelTypeRecommend4: String = "4"//4一排两个 推荐课程&推荐活动
-    let SlideModelTypeTodayRecommend74: String = "74"//74今日推荐
-    let SlideModelTypeAllCourse12: String = "12"//12列表全部课程
-    let SlideModelTypeOneCourse75: String = "75"//75单课程大图
-            
+                        
     let kCNLiveDownSlideAllCourseCellIdentifier = "kCNLiveDownSlideAllCourseCellIdentifier"
     let kCNLiveDownSlideRecommendCellIdentifier = "kCNLiveDownSlideRecommendCellIdentifier"
     let kCNLiveDownSlideTodayRecommendCellIdentifier = "kCNLiveDownSlideTodayRecommendCellIdentifier"
     let kCNLiveDownSlideSingleCourseCellIdentifier = "kCNLiveDownSlideSingleCourseCellIdentifier"
     let kCNLiveHomePageDuanJuCellIdentifier = "kCNLiveHomePageDuanJuCellIdentifier"
+    let kCNLiveDownSlideTwoDuanJuCellIdentifier = "kCNLiveDownSlideTwoDuanJuCellIdentifier"
+    let kCNLiveDownSlideRealHotListCellIdentifier = "kCNLiveDownSlideRealHotListCellIdentifier"
     var isHaveDuanJU = false//是否有在追短剧
     var totolNum = 0//一共显示多少行cell
@@ -80,6 +73,10 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         tableView.register(CNLiveDownSlideTodayRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier)
         tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideAllCourseCellIdentifier)
         tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier:kCNLiveDownSlideSingleCourseCellIdentifier)
+        
+        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier:kCNLiveDownSlideTwoDuanJuCellIdentifier)
+        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier:kCNLiveDownSlideRealHotListCellIdentifier)
+        
         tableView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         return tableView
     }()
@@ -164,6 +161,22 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                 }
                 cell.slideModel = slideModel
                 return cell
+            }else if slideModel.type == SlideModelTypeTwoDuanJu5{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideTwoDuanJuCellIdentifier) as? CNDownSlideSingleCourseCell
+                else {
+                    let cell = CNDownSlideSingleCourseCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeRealHotList7{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRealHotListCellIdentifier) as? CNDownSlideSingleCourseCell
+                else {
+                    let cell = CNDownSlideSingleCourseCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
             }else{
                 return UITableViewCell()
             }
@@ -346,7 +359,12 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                     if let model = slideModel as? CNLiveDownSlideModel{
                         let layout = CNLiveDownSlideModelLayout.init(model: model)
-                        newDataArray.addObjects(from: [layout.getCellHModel()])
+                        let cellModel = layout.getCellHModel()
+                        if cellModel.blockId == "11939"{
+                            newDataArray.insert(cellModel, at: 0)
+                        }else{
+                            newDataArray.addObjects(from: [cellModel])
+                        }
                     }
                 }
                 self.dataArray.addObjects(from: newDataArray as! [Any])
@@ -24,7 +24,7 @@ class CNLiveAlbumMsgModel:BaseModel{
     var episodeAll = ""
     var subscriptions = ""
     var subscribe = false
-    var episodeLast = ""
-    var contentIdLast = ""
+    var episodeLast = 1//上次播放集数
+    var contentIdLast = ""//上次播放集的id
     var collection = false //是否追剧
 }
@@ -58,9 +58,22 @@ class CNLiveDownSlideModelLayout:NSObject{
         }else if(_slideModel?.type == SlideModelTypeOneCourse75){//单节课程
             _slideModel?.cellH = Float(DownSlideSingleCourseImgH + DownSlideSingleCourseMoreH+DownSlideRecommendLeftGap)
+        }else if(_slideModel?.type == SlideModelTypeTwoDuanJu5){//竖版短剧 一排2个
+            
+            //总显示块数/循环数
+            var totalNum = (contentsNum >= row*2) ? row*2 : contentsNum
+            if row == 0{//row为0 , contents全部显示
+                totalNum = contentsNum
+            }
+            _slideModel?.cellH = Float(ceil(CGFloat(totalNum)*0.5)*(DownSlideTwoDuanJuH))
+        }else if(_slideModel?.type == SlideModelTypeRealHotList7){//7实时热榜
+            
+            _slideModel?.cellH = Float(DownSlideRealHotListH)//+Float(DownSlideRecommendLeftGap)
         }else{
             _slideModel?.cellH = 0
         }        
+        
+        
     }
     func getCellHModel()->CNLiveDownSlideModel{
         return _slideModel!
@@ -83,7 +83,6 @@ class CNLiveDownSlideTool:NSObject{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
         }else if (model == kCNDownSlideContentsModelModelAlbum_ugc){
-            
             //短剧-跳转短剧播放页
             navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentId), animated: pushAnimated)
         }else if model == kCNDownSlideContentsModelModelServing{
@@ -74,9 +74,9 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     var aid: String! = ""
-    var pageNum: NSInteger! = 1
+    var pageNum: NSInteger! = 1//页数
     var isSelectable: Bool! = false
-    var currentIndex: NSInteger! = 0
+    var currentIndex: NSInteger! = 0//播放集数
     var pickerView: CNLiveShortVideoContentListView!
     var footerRefreshView: CNLiveFooterRefresh!
 //    var playerManager = ZFIJKPlayerManager.init()
@@ -109,6 +109,18 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         super.init(nibName:nil, bundle:nil)
     }
+    /// 初始化播放器,第多少集
+    /// - Parameter aid: 专辑 id ,第多少集
+    init(aid: String,currentIndex: NSInteger) {
+        self.aid = aid
+        self.isSelectable = false
+        self.currentIndex = currentIndex
+        super.init(nibName:nil, bundle:nil)
+        let page = self.roundUpToNearestTen(currentIndex)
+        self.pageNum = page/10
+        
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         if self.dataArray.count > 0 && self.isSelectable {
@@ -323,6 +335,17 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         controlView.resetControlView()
         controlView.showCoverView(withUrl: data.poster)
     }
+    //10倍数向上取整
+    func roundUpToNearestTen(_ number: Int) -> Int {
+        // 如果余数为0，则已经是10的倍数
+        if number % 10 == 0 {
+            return number
+        } else {
+            // 否则，向上取整到最近的10的倍数
+            // 可以通过除以10，向上取整，然后再乘以10来得到结果
+            return ((number + 9) / 10) * 10
+        }
+    }
     deinit {
         NotificationCenter.default.removeObserver(self)
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "auth_blueBg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "auth_blueBg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}