短剧,课程详情页添加分页请求

张旭
1 parent 75b5e01a
Showing 9 changed files with 202 additions and 65 deletions
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDuanJuDetailViewController.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumModel.swift
metaCode/Classes/Main/HomePages/Model/CNLiveHomePageModel.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveDuanjuTitleCell.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
@@ -3,8 +3,8 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/16.
-//  认证-下滑页原生页--课程 大图点击详情页
-//  首页原生页--短剧 大图点击详情页
+//  认证-下滑页原生页--课程 大图课程详情页/全部课程详情页
+//  首页原生页--短剧 大图详情页
 import Foundation
 import MJRefresh
@@ -91,35 +91,38 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-        getImageFromCell()
-        if self.cellType == .playlet{
+//        getImageFromCell()
+//        if self.cellType == .playlet{
             self.getBlockContents(page: 1)
-        }
+//        }
     }
     private func setupUI() {
         self.view.layer.masksToBounds = true
+        self.view.addSubview(self.tableView)
+        self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
+        
         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
+//            self.view.addSubview(self.tableView)
+//            self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
+        }else if self.cellType == .course{//课程 大图
+            if self.slideModel!.type == SlideModelTypeAllCourse12{
+                //全部课程
+                
+            }else if self.slideModel!.type == SlideModelTypeOneCourse75{
+                //大图课程
+                
+            }
+//            view.addSubview(scrollView)
+//            scrollView.slideModel = _slideModel
+        }else if self.cellType == .playletToCourse{
+            //首页->课程
+            
         }
         view.addSubview(closeBtn)
         view.addGestureRecognizer(dismissPanGesture)
-        
-        if #available(iOS 11.0, *) {
-            scrollView.contentInsetAdjustmentBehavior = .never
-        } else {
-            automaticallyAdjustsScrollViewInsets = false
-        }
-    }
-    
-    private func getImageFromCell() {
-        scrollView.imageView.image = cell.bgImageView.image
     }
-    
+        
     @objc private func closeAction() {
         dismiss(animated: true, completion: nil)
         let nav = self.navigationController as! CNSlideBaseNavigationController
@@ -162,12 +165,9 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         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
@@ -178,18 +178,18 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     private func stopDismissPanGesture(_ gesture: UIPanGestureRecognizer) {
         draggingDownToDismiss = false
         interactiveStartingPoint = nil
-        scrollView.showsVerticalScrollIndicator = true
         UIView.animate(withDuration: 0.2) {
             gesture.view?.transform = CGAffineTransform.identity
         }
     }
-    // MARK: - 短剧cell列表详情页
+    // MARK: - 列表详情页
+    let kCNLiveCourseTitleCellIdentifier = "kCNLiveCourseTitleCellIdentifier"
     let kCNLiveAlbumImageCellIdentifier = "kCNLiveAlbumImageCellIdentifier"
     let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
-    var pageNum: NSInteger
+    var pageNum: NSInteger = 1
     var network_type: CNLiveMineResponseType!
     // MARK: - 懒加载
     ///数据源
@@ -207,6 +207,8 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         tableView.tableFooterView = UIView.init()
         tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
         tableView.register(CNLiveAlbumImageCell.self, forCellReuseIdentifier: kCNLiveAlbumImageCellIdentifier)
+        tableView.register(CNLiveDuanjuTitleCell.self, forCellReuseIdentifier: kCNLiveCourseTitleCellIdentifier)
+
         return tableView
     }()
@@ -225,14 +227,43 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     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()
+            if self.cellType == .playlet{
+                //短剧大图
+                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 if self.cellType == .course || self.cellType == .playletToCourse{
+                
+                if self.slideModel?.type == SlideModelTypeAllCourse12{
+                    //全部课程
+                    guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
+                    else {
+                        let cell = CNLiveDuanjuTitleCell()
+                        return cell
+                    }
+                    cell.cellType = .course
+                    cell.blockName = self.slideModel?.blockName
+                    return cell
+                    
+                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                    //大图课程
+                    guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
+                    else {
+                        let cell = CNLiveAlbumImageCell()
+                        return cell
+                    }
+                    cell.iconImgView.image = self.cell.bgImageView.image
+                    return cell
+                    
+                }
             }
-            cell.iconImgView.image = self.cell.bgImageView.image
-            return cell
+            
         }else{
+            //列表cell
             let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
@@ -241,42 +272,60 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                 return cell
             }
             cell.albumModel = albumModel
+            cell.enterBlock = { albumModel in
+                CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
+            }
             return cell
         }
+        return UITableViewCell()
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0{
-            return KSreenWidth
+            if self.cellType == .playlet{
+                //短剧大图
+                return KSreenWidth
+            }else if self.cellType == .course || self.cellType == .playletToCourse{
+                if self.slideModel?.type == SlideModelTypeAllCourse12{
+                    //全部课程
+                    return 75
+                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                    //大图课程
+                    return KSreenWidth
+                }
+            }
         }else{
             return 75
         }
+        return 75
     }
-    // MARK: - 获取全部专辑列表
+    // 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])
+                let albumBaseModel = result as! CNLiveAlbumBaseModel
+                if self!.pageNum > 1 && albumBaseModel.list.count > 0 {
+                    self!.dataArray.addObjects(from: albumBaseModel.list)
                 }
                 if self!.pageNum == 1 {
                     self!.dataArray.removeAllObjects()
-                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumModel])
+                    self!.dataArray.addObjects(from: albumBaseModel.list)
                     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!.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 {
+                if albumBaseModel.hasNextPage{
+                    self!.tableView.mj_footer?.endRefreshing()
+                }else{
                     self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
-                    self!.tableView.reloadData()
                 }
             }else if (status == .noNetwork) {
@@ -187,7 +187,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
                 StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
             }
             updateStatusBarAndTabbarFrame(visible: false)
-            
             present(detailVC, animated: true, completion: nil)
         }else if slideModel.type == SlideModelTypeOneCourse75{
             guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
@@ -121,6 +121,8 @@ class CNHomepageDuanJuDetailViewController: CNLiveBaseViewController  ,UITableVi
                 let cell = CNLiveDuanjuTitleCell()
                 return cell
             }
+            cell.cellType = .playlet
+            cell.blockName = "在追短剧"
             return cell
         }else{
             let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumMsgModel
@@ -7,6 +7,28 @@
 import Foundation
+class CNLiveAlbumBaseModel:BaseModel{
+    var endRow = 0
+    var firstPage = 0
+    var hasNextPage = false
+    var nextPage = 0
+    var hasPreviousPage = false
+    var isFirstPage = true
+    var isLastPage = true
+    var lastPage = 0
+    var list = [CNLiveAlbumModel]()
+    var navigateFirstPage = 0
+    var navigateLastPage = 0
+    var navigatePages = 0
+    var navigatepageNums:Array<Any> = []
+    var pageNum = 0
+    var pageSize = 0
+    var pages = 0
+    var prePage = 0
+    var size = 0
+    var startRow = 0
+    var total = 0
+}
 class CNLiveAlbumModel:BaseModel{
     var title = ""
     var subTitle = ""
@@ -11,6 +11,7 @@ class CNLiveHomePageModel:BaseModel{
     var endRow = 0
     var firstPage = 0
     var hasNextPage = false
+    var nextPage = 0
     var hasPreviousPage = false
     var isFirstPage = true
     var isLastPage = true
@@ -20,7 +21,6 @@ class CNLiveHomePageModel:BaseModel{
     var navigateLastPage = 0
     var navigatePages = 0
     var navigatepageNums:Array<Any> = []
-    var nextPage = 0
     var pageNum = 0
     var pageSize = 0
     var pages = 0
@@ -7,11 +7,16 @@
 import Foundation
 import QMUIKit
+
+typealias CNLiveAlbumCellEnterBlock = (_ albumModel:CNLiveAlbumModel)->Void;
+
 class CNLiveAlbumCell:UITableViewCell{
+    var enterBlock:CNLiveAlbumCellEnterBlock?
     var albumModelArr:Array<CNLiveAlbumListModel>?
     var isDetail:Bool = false
+    var cellType:CNLiveHomePageCellType = .course
     var _albumMsgModel : CNLiveAlbumMsgModel?
     var albumMsgModel : CNLiveAlbumMsgModel? {
@@ -88,7 +93,15 @@ class CNLiveAlbumCell:UITableViewCell{
         fatalError("init(coder:) has not been implemented")
     }
     func setupNewUI(model:CNLiveAlbumModel){
-        
+        if model.model == "1" || model.model == "2" || model.model == "3" || model.model == "4"{
+            //课程-跳转h5网页
+            self.cellType = .course
+            self.playBtn.setTitle("进入", for: .normal)
+        }else if model.model == "album_ugc"{
+            //短剧-跳转短剧播放页
+            self.cellType = .playlet
+            self.playBtn.setTitle("播放", for: .normal)
+        }
         self.titleLabl.text = model.title
         self.subTitleLabel.text = model.subTitle
         self.iconImgView.kf.setImage(with: URL(string: model.poster))
@@ -109,7 +122,6 @@ class CNLiveAlbumCell:UITableViewCell{
         }
     }
     @objc func playBtnAction(){
-        showLoading(message: "")
         var aid = ""
         if self.albumModel != nil{
             aid = self.albumModel!.contentId
@@ -118,6 +130,19 @@ class CNLiveAlbumCell:UITableViewCell{
         }else{
             aid = ""
         }
-        navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+        if (self.albumModel != nil){
+            if (self.albumModel?.model == "1" || self.albumModel?.model == "2" || self.albumModel?.model == "3" || self.albumModel?.model == "4"){
+                //课程-跳转h5网页
+                self.enterBlock!(self.albumModel!)
+            }else if self.albumModel?.model == "album_ugc"{
+                //短剧-跳转短剧播放页
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+            }
+        }else if (self.albumMsgModel != nil){
+            //短剧-跳转短剧播放页
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+
+        }
+        
     }
 }
@@ -3,12 +3,31 @@
 //  metaCode
 //
 //  Created by zx on 2024/1/10.
-//  在追短剧详情页-title cell
+//  在追短剧详情页/全部课程详情页 --title cell
 import Foundation
 class CNLiveDuanjuTitleCell:UITableViewCell{
-    
+    var _blockName:String?
+    var blockName:String?{
+        get{
+            _blockName
+        }
+        set{
+            _blockName = newValue!
+            
+            if self.cellType == .course || self.cellType == .playletToCourse{
+                self.blockTitleLabl.text = _blockName ?? "全部课程"
+                self.blockTitleLabl.top = KStatusBarHeight+10
+            }else if self.cellType == .playlet{
+                self.blockTitleLabl.text = _blockName ?? "在追短剧"
+                self.blockTitleLabl.top = 10
+
+            }
+        }
+    }
+    var cellType:CNLiveHomePageCellType = .course
+
     //MARK: - 懒加载
     ///区块标题
     lazy var blockTitleLabl: UILabel = {
@@ -90,7 +90,7 @@ class CNLiveHomePageViewModel:NSObject{
             }
         }
     }
-    /// 获取首页-全部专辑列表
+    /// 获取首页-全部专辑列表,区块内容分页
     static func getBlockContents(blockId:String,page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(blockId, forKey: "blockId")
@@ -105,14 +105,8 @@ class CNLiveHomePageViewModel:NSObject{
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
                     let dataDic = resp["data"] as! Dictionary<String, Any>
-                    let dataList = dataDic["list"] as! Array<Any>
-                    var listArr = Array<Any>()
-                    for listDic in dataList{
-                        let dataMdl = newDictionaryToModel(listDic as! [String : Any], CNLiveAlbumModel.self)
-                        listArr.append(dataMdl)
-                    }
-                    
-                    resultBlock(listArr,.success)
+                    let dataMdl = newDictionaryToModel(dataDic , CNLiveAlbumBaseModel.self)
+                    resultBlock(dataMdl,.success)
                 }
                 else{
                     resultBlock(NSNull(),.failed)
@@ -19,14 +19,11 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            navigationViewController().pushViewController(webVC, animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
-           
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)           
         }else if (contentMdl.model == kCNDownSlideContentsModelModel3) || (contentMdl.model == kCNDownSlideContentsModelModel4){
             let webVC = CNWebViewController()
             webVC.url = URL(string: (contentMdl.thirdUrl)!)
-            navigationViewController().pushViewController(webVC, animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
         }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
             let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
@@ -37,8 +34,38 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            navigationViewController().pushViewController(webVC, animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+        }else{
+            return
+        }
+    }
+    class func pushWebVCWithCNLiveAlbumMdl(albumModel:CNLiveAlbumModel,controller:UIViewController){
+        
+        if (albumModel.model == kCNDownSlideContentsModelModel1) || (albumModel.model == kCNDownSlideContentsModelModel2){
+            
+            let queryItem = URLQueryItem(name: "contentId", value: albumModel.contentId)
+            let queryItem1 = URLQueryItem(name: "videoId", value: albumModel.pid)
+            let urlComponents = NSURLComponents(string: (albumModel.shareUrl))!
+            urlComponents.queryItems = [queryItem, queryItem1]
+            let regURL = urlComponents.url
+            let webVC = CNWebViewController()
+            webVC.url = regURL
+            controller.navigationController?.pushViewController(webVC, animated: pushAnimated)
+        }else if (albumModel.model == kCNDownSlideContentsModelModel3) || (albumModel.model == kCNDownSlideContentsModelModel4){
+            let webVC = CNWebViewController()
+            webVC.url = URL(string: (albumModel.thirdUrl))
+            controller.navigationController?.pushViewController(webVC, animated: pushAnimated)
+        }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum) || (albumModel.model == kCNDownSlideContentsModelModelAlbum_ugc) || (albumModel.model == kCNDownSlideContentsModelModelAlbum_video){
+            
+            let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
+            let queryItem = URLQueryItem(name: "aid", value: albumModel.contentId)
+            let queryItem1 = URLQueryItem(name: "title", value: albumModel.title)
+            let urlComponents = NSURLComponents(string: urlString)
+            urlComponents!.queryItems = [queryItem, queryItem1]
+            let regURL = urlComponents?.url
+            let webVC = CNWebViewController()
+            webVC.url = regURL
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
         }else{
             return
         }