竖版短剧详情页

“张旭”
1 parent b409e70d
Showing 7 changed files with 228 additions and 23 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveDuanJuDetailCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveDuanjuTitleCell.swift
metaCode/Classes/Main/Util/CNUpSlideAnimationTransition.swift
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
@@ -107,6 +107,7 @@
 		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 */; };
+		19864E412BF6090400586E72 /* CNLiveDuanJuDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19864E402BF6090400586E72 /* CNLiveDuanJuDetailCell.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 */; };
@@ -390,6 +391,7 @@
 		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>"; };
+		19864E402BF6090400586E72 /* CNLiveDuanJuDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDuanJuDetailCell.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>"; };
@@ -817,6 +819,7 @@
 				1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */,
 				1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */,
 				1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */,
+				19864E402BF6090400586E72 /* CNLiveDuanJuDetailCell.swift */,
 			);
 			path = HomepageDetail;
 			sourceTree = "<group>";
@@ -1789,6 +1792,7 @@
 				1917332F2B16C7C9007BCC04 /* CNLiveTimer.swift in Sources */,
 				7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
 				1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */,
+				19864E412BF6090400586E72 /* CNLiveDuanJuDetailCell.swift in Sources */,
 				79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
 				79BB96A82AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift in Sources */,
 				19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
@@ -5,6 +5,7 @@
 //  Created by zx on 2023/10/16.
 //  认证-下滑页原生页-课程 大图课程详情页/全部课程详情页/我的课程详情页
 //  首页原生页--短剧 大图详情页
+//  首页原生页--1横排2个短剧-详情页
 import Foundation
 import MJRefresh
@@ -20,9 +21,14 @@ enum CNLiveHomePageCellType {
     case playletToCourse
     ///课程控制器->我的课程
     case courseToMyCurriculum
+    ///短剧控制器->短剧列表(1排2个)
+    case playletList
 }
 let allCourseCellHeight:CGFloat = 75
+let DuanJuDetailImageWidth:CGFloat = ((KSreenWidth-DownSlideRecommendLeftGap*3)/2)
+let DuanJuDetailImageHeight:CGFloat = 239/165*DuanJuDetailImageWidth
+let DuanJuDetailCellHeight:CGFloat = DuanJuDetailImageHeight+DownSlideRecommendLeftGap+10+20+36+10
 class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate,EmptyDataSetSource, EmptyDataSetDelegate {
@@ -191,6 +197,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     let kCNLiveCourseTitleCellIdentifier = "kCNLiveCourseTitleCellIdentifier"
     let kCNLiveAlbumImageCellIdentifier = "kCNLiveAlbumImageCellIdentifier"
     let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
+    let kCNLiveDuanJuDetailCellIdentifier = "kCNLiveDuanJuDetailCellIdentifier"
     var pageNum: NSInteger = 1
     var network_type: CNLiveMineResponseType!
@@ -211,7 +218,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
         tableView.register(CNLiveAlbumImageCell.self, forCellReuseIdentifier: kCNLiveAlbumImageCellIdentifier)
         tableView.register(CNLiveDuanjuTitleCell.self, forCellReuseIdentifier: kCNLiveCourseTitleCellIdentifier)
-
+        tableView.register(CNLiveDuanJuDetailCell.self, forCellReuseIdentifier: kCNLiveDuanJuDetailCellIdentifier)
         return tableView
     }()
@@ -223,7 +230,13 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         if section == 0{
             return 1
         }else{
-            return self.dataArray.count
+
+            if self.cellType == .playletList{
+                let count = (self.dataArray.count + 1) / 2
+                return count
+            }else{
+                return self.dataArray.count
+            }
         }
     }
@@ -241,14 +254,18 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                 cell.blockName = "我的课程"
                 return cell
             }else{
-                if self.slideModel?.type == SlideModelTypeAllCourse12{
+                if self.slideModel?.type == SlideModelTypeAllCourse12 || self.slideModel?.type == SlideModelTypeTwoDuanJu5{
                     //全部课程
                     guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
                     else {
                         let cell = CNLiveDuanjuTitleCell()
                         return cell
                     }
-                    cell.cellType = .course
+                    if self.slideModel?.type == SlideModelTypeAllCourse12{
+                        cell.cellType = .course
+                    }else{
+                        cell.cellType = .playletList
+                    }
                     cell.blockName = self.slideModel?.blockName
                     return cell
@@ -268,17 +285,39 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         }else{
             //列表cell
             let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
+            if self.cellType == .playletList{
+                //1横排2个短剧列表
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDuanJuDetailCellIdentifier) as? CNLiveDuanJuDetailCell
+                else {
+                    let cell = CNLiveDuanJuDetailCell()
+                    return cell
+                }
-            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
-            else {
-                let cell = CNLiveAlbumCell()
+                let leftIndex = indexPath.row*2
+                let rightIndex = indexPath.row*2+1
+                let leftAlbumModel = self.dataArray[leftIndex] as! CNLiveAlbumModel
+                cell.albumModel = leftAlbumModel
+                if rightIndex < self.dataArray.count{
+                    let rightAlbumModel = self.dataArray[rightIndex] as! CNLiveAlbumModel
+                    cell.rightAlbumModel = rightAlbumModel
+                }
+//                cell.enterBlock = { albumModel in
+//                    CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumModel.model, contentId: albumModel.contentId, pid: albumModel.pid, shareUrl: albumModel.shareUrl, thirdUrl: albumModel.thirdUrl, title: albumModel.title, s_to: albumModel.s_to, trailerId: albumModel.trailerId, controller: self)
+//                }
+                return cell
+            }else{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
+                else {
+                    let cell = CNLiveAlbumCell()
+                    return cell
+                }
+                cell.albumModel = albumModel
+                cell.enterBlock = { albumModel in
+                    CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumModel.model, contentId: albumModel.contentId, pid: albumModel.pid, shareUrl: albumModel.shareUrl, thirdUrl: albumModel.thirdUrl, title: albumModel.title, s_to: albumModel.s_to, trailerId: albumModel.trailerId, controller: self)
+                }
                 return cell
             }
-            cell.albumModel = albumModel
-            cell.enterBlock = { albumModel in
-                CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumModel.model, contentId: albumModel.contentId, pid: albumModel.pid, shareUrl: albumModel.shareUrl, thirdUrl: albumModel.thirdUrl, title: albumModel.title, s_to: albumModel.s_to, trailerId: albumModel.trailerId, controller: self)
-            }
-            return cell
+            
         }
         return UITableViewCell()
     }
@@ -292,7 +331,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                 return KSreenWidth
             }
         }else{
-            return 75
+            return DuanJuDetailCellHeight
         }
         return 75
     }
@@ -244,31 +244,43 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             }else if slideModel.type == SlideModelTypeTodayRecommend74{
-            }else if slideModel.type == SlideModelTypeAllCourse12{
+            }else if slideModel.type == SlideModelTypeAllCourse12 || slideModel.type == SlideModelTypeOneCourse75{
                 guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
                 selectedCell = cell
-
                 let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, albumModel: nil, cellType: cellType), cellType: cellType)
                 detailVC.dismissClosure = { [weak self] in
                     guard let StrongSelf = self else { return }
                     StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
                 }
                 updateStatusBarAndTabbarFrame(visible: false)
-                
                 present(detailVC, animated: true, completion: nil)
-            }else if slideModel.type == SlideModelTypeOneCourse75{
+            }else if slideModel.type == SlideModelTypeTwoDuanJu5{
+                //竖版短剧
+                cellType = .playletList
                 guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
                 selectedCell = cell
-                let detailViewC = CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, albumModel: nil, cellType: cellType) 
-                let detailVC = CNSlideBaseNavigationController(rootViewController: detailViewC, cellType: cellType)
-                
+                let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, albumModel: nil, cellType: cellType), cellType: cellType)
                 detailVC.dismissClosure = { [weak self] in
                     guard let StrongSelf = self else { return }
                     StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
                 }
                 updateStatusBarAndTabbarFrame(visible: false)
                 present(detailVC, animated: true, completion: nil)
+            }else if slideModel.type == SlideModelTypeRealHotList7{
+                //实时热榜
             }
+//                else if slideModel.type == SlideModelTypeOneCourse75{
+//                guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+//                selectedCell = cell
+//                let detailViewC = CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, albumModel: nil, cellType: cellType) 
+//                let detailVC = CNSlideBaseNavigationController(rootViewController: detailViewC, cellType: cellType)
+//                
+//                detailVC.dismissClosure = { [weak self] in
+//                    guard let StrongSelf = self else { return }
+//                    StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+//                }
+//                updateStatusBarAndTabbarFrame(visible: false)
+//                present(detailVC, animated: true, completion: nil)
         }
     }
+//
+//  CNLiveDuanJuDetailCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/5/16.
+//  1排2个短剧列表cell
+
+import Foundation
+import QMUIKit
+
+class CNLiveDuanJuDetailCell:UITableViewCell{
+    
+    
+    var cellType:CNLiveHomePageCellType = .playletList
+
+    //AlbumModel
+    var _albumModel : CNLiveAlbumModel?
+    var albumModel : CNLiveAlbumModel? {
+        get{
+            _albumModel
+        }
+        set{
+            _albumModel = newValue!
+            self.setupNewUI(model: _albumModel!)
+        }
+    }
+    
+    //AlbumModel
+    var _rightAlbumModel : CNLiveAlbumModel?
+    var rightAlbumModel : CNLiveAlbumModel? {
+        get{
+            _rightAlbumModel
+        }
+        set{
+            _rightAlbumModel = newValue!
+            self.setupRightNewUI(model: _rightAlbumModel!)
+        }
+    }
+    //MARK: - 懒加载
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 15, width: DuanJuDetailImageWidth, height: DuanJuDetailImageHeight))
+        iconImgView.layer.cornerRadius = 5
+        iconImgView.clipsToBounds = true
+        iconImgView.contentMode = .scaleAspectFill
+        return iconImgView
+    }()
+    ///标题
+    lazy var titleLabl: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.left+10, self.iconImgView.bottom+10, self.iconImgView.width-20, 20))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = BoldFont_14
+        titleLabel.text = "标题"
+        return titleLabel
+    }()
+    ///副标题
+    lazy var subTitleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.left+10, self.titleLabl.bottom+3, self.iconImgView.width-20, 33))
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_12
+        titleLabel.text = "副标题"
+        return titleLabel
+    }()
+    
+    lazy var rightIconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 15+DuanJuDetailImageWidth+15, y: 15, width: DuanJuDetailImageWidth, height: DuanJuDetailImageHeight))
+        iconImgView.layer.cornerRadius = 5
+        iconImgView.clipsToBounds = true
+        iconImgView.contentMode = .scaleAspectFill
+        return iconImgView
+    }()
+    ///标题
+    lazy var rightTitleLabl: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.rightIconImgView.left+10, self.rightIconImgView.bottom+10, self.rightIconImgView.width-20, 20))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = BoldFont_14
+        titleLabel.text = ""
+        return titleLabel
+    }()
+    ///副标题
+    lazy var rightSubTitleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.rightIconImgView.left+10, self.rightTitleLabl.bottom+3, self.rightIconImgView.width-20, 33))
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_12
+        titleLabel.text = ""
+        return titleLabel
+    }()
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.contentView.addSubview(self.iconImgView)
+        self.contentView.addSubview(self.titleLabl)
+        self.contentView.addSubview(self.subTitleLabel)
+        self.contentView.addSubview(self.rightIconImgView)
+        self.contentView.addSubview(self.rightTitleLabl)
+        self.contentView.addSubview(self.rightSubTitleLabel)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    func setupNewUI(model:CNLiveAlbumModel){
+        self.titleLabl.text = model.title
+        self.subTitleLabel.text = model.subTitle
+        self.iconImgView.kf.setImage(with: URL(string: model.poster))
+    }
+    func setupRightNewUI(model:CNLiveAlbumModel){
+        self.rightTitleLabl.text = model.title
+        self.rightSubTitleLabel.text = model.subTitle
+        self.rightIconImgView.kf.setImage(with: URL(string: model.poster))
+    }
+  
+//    @objc func playBtnAction(){
+//        var aid = ""
+//        if self.albumModel != nil{
+//            aid = self.albumModel!.contentId
+//        }else if self.albumMsgModel != nil{
+//            aid = self.albumMsgModel!.albumId
+//        }else{
+//            aid = ""
+//        }
+//        if (self.albumModel != nil){
+//            if (self.albumModel?.model == kCNDownSlideContentsModelModel1 || self.albumModel?.model == kCNDownSlideContentsModelModel2 || self.albumModel?.model == kCNDownSlideContentsModelModel3 || self.albumModel?.model == kCNDownSlideContentsModelModel4){
+//                //课程-跳转h5网页
+//                self.enterBlock!(self.albumModel!)
+//            }else if self.albumModel?.model == kCNDownSlideContentsModelModelAlbum_ugc{
+//                //短剧-跳转短剧播放页
+//                CNLiveDownSlideTool.pushShortVideoController(contentId: aid, navigationVC: navigationViewController().visibleViewController?.navigationController)
+//            }else if self.albumModel?.model == kCNDownSlideContentsModelModelAlbum_video{
+//                //课程-跳转h5视频专辑页
+//                self.enterBlock!(self.albumModel!)
+//            }else{
+//                
+//            }
+//        }else if (self.albumMsgModel != nil){
+//            //短剧-跳转短剧播放页
+//            CNLiveDownSlideTool.pushShortVideoController(contentId: aid, navigationVC: navigationViewController().visibleViewController?.navigationController)
+//
+//        }
+//        
+//    }
+}
@@ -22,6 +22,9 @@ class CNLiveDuanjuTitleCell:UITableViewCell{
             }else if self.cellType == .playlet{
                 self.blockTitleLabl.text = _blockName ?? "在追短剧"
                 self.blockTitleLabl.top = (45-30)/2
+            }else if self.cellType == .playletList{
+                self.blockTitleLabl.text = _blockName ?? ""
+                self.blockTitleLabl.top = (allCourseCellHeight-30)/2+get_system_statusBar_height()
             }
         }
     }
@@ -41,7 +41,7 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
     func animationForPresent(using transitionContext: UIViewControllerContextTransitioning) {
         let containerView = transitionContext.containerView
-        if self.cellType == .playlet{
+        if self.cellType == .playlet || self.cellType == .playletList{
             //1.Get fromVC and toVC
             guard let fromVCtemp = transitionContext.viewController(forKey: .from) as? CNLiveBaseTabBarViewController else { return }
             let fromNavi = fromVCtemp.viewControllers![0] as! CNLiveBaseNavigationController
@@ -142,7 +142,7 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
     }
     func animationForDismiss(using transitionContext: UIViewControllerContextTransitioning) {
-        if self.cellType == .playlet{
+        if self.cellType == .playlet || self.cellType == .playletList{
             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
@@ -134,7 +134,9 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         self.player.currentPlayerManager.play()
-        self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex!)*KSreenHeight), animated: true)//校正偏移量
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+            self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex!)*KSreenHeight), animated: true)//校正偏移量
+        }
     }
     override func viewWillDisappear(_ animated: Bool) {