幼教中国我的课程 , webView视频没有关闭问题

“张旭”
1 parent d7630ab6
Showing 12 changed files with 397 additions and 130 deletions
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideRecommendCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideTodayRecommendCell.swift
metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumModel.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveDuanjuTitleCell.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
metaCode/Classes/Main/Util/CNUpSlideAnimationTransition.swift
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/16.
-//  认证-下滑页原生页--课程 大图课程详情页/全部课程详情页
+//  认证-下滑页原生页-课程 大图课程详情页/全部课程详情页/我的课程详情页
 //  首页原生页--短剧 大图详情页
 import Foundation
@@ -18,6 +18,8 @@ enum CNLiveHomePageCellType {
     case playlet
     ///短剧控制器->课程
     case playletToCourse
+    ///课程控制器->我的课程
+    case courseToMyCurriculum
 }
 let allCourseCellHeight:CGFloat = 75
@@ -31,7 +33,17 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
             _slideModel
         }
         set{
-            _slideModel = newValue!
+            _slideModel = newValue
+        }
+    }
+    //albumModel
+    var _albumModel : CNLiveAlbumBaseModel?
+    var albumModel : CNLiveAlbumBaseModel? {
+        get{
+            _albumModel
+        }
+        set{
+            _albumModel = newValue
         }
     }
@@ -71,16 +83,21 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         return btn
     }()
-    init(cell: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel,cellType:CNLiveHomePageCellType) {
+    init(cell: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel?,albumModel:CNLiveAlbumBaseModel?,cellType:CNLiveHomePageCellType) {
         self.cellType = cellType
         self.pageNum = 1
         self.cell = cell
         super.init(nibName: nil, bundle: nil)
         self.slideModel = slideModel
+        self.albumModel = albumModel
         self.setupTranstion()
         setNeedsStatusBarAppearanceUpdate()
     }
+    deinit {
+        print("CNUPSlideDetailViewController-deinit")
+    }
+    
     private func setupTranstion() {
         modalPresentationStyle = .custom
         transitioningDelegate = self
@@ -93,7 +110,11 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-        self.getBlockContents(page: 1)
+        if self.cellType == .courseToMyCurriculum{
+            self.getYjzgMyCurriculum(page: 1)
+        }else{
+            self.getBlockContents(page: 1)
+        }
     }
     private func setupUI() {
@@ -219,30 +240,41 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                 cell.iconImgView.image = self.cell.bgImageView.image
                 cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
                 return cell
-            }else if self.cellType == .course || self.cellType == .playletToCourse{
-                
-                if self.slideModel?.type == SlideModelTypeAllCourse12{
-                    //全部课程
+            }else if self.cellType == .course || self.cellType == .playletToCourse || self.cellType == .courseToMyCurriculum{
+                if self.cellType == .courseToMyCurriculum{
+                    //我的课程
                     guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
                     else {
                         let cell = CNLiveDuanjuTitleCell()
                         return cell
                     }
-                    cell.cellType = .course
-                    cell.blockName = self.slideModel?.blockName
+                    cell.cellType = .courseToMyCurriculum
+                    cell.blockName = "我的课程"
                     return cell
-                    
-                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
-                    //大图课程
-                    guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
-                    else {
-                        let cell = CNLiveAlbumImageCell()
+                }else{
+                    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
+                        cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
+                        return cell
+                        
                     }
-                    cell.iconImgView.image = self.cell.bgImageView.image
-                    cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
-                    return cell
-                    
                 }
             }
@@ -304,6 +336,43 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         }
     }
+    // MARK: - 我的课程 -- 获取全部课程列表
+    func getYjzgMyCurriculum(page:NSInteger){
+        showLoading(message: "")
+        CNLiveDownSlideViewModel.getYjzgMyCurriculum(page: page) {[weak self] result, status in
+            hiddenLoading()
+            if status == .success{
+                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: albumBaseModel.list)
+                    if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
+                        self!.addRefreshView()
+                    }
+                }
+                
+                self!.tableView.mj_header?.endRefreshing()
+                
+                self!.tableView.reloadData()
+                if albumBaseModel.hasNextPage{
+                    self!.tableView.mj_footer?.endRefreshing()
+                }else{
+                    self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                }
+
+            }else if (status == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
+    }
+    
     // MARK: - 在追短剧--获取全部专辑列表
     func getBlockContents(page:NSInteger){
         showLoading(message: "")
@@ -24,6 +24,9 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
     let kCNLiveDownSlideTodayRecommendCellIdentifier = "kCNLiveDownSlideTodayRecommendCellIdentifier"
     let kCNLiveDownSlideSingleCourseCellIdentifier = "kCNLiveDownSlideSingleCourseCellIdentifier"
+    //我的课程cellID
+    let kCNLiveDownSlideMyCurriculumCellIdentifier = "kCNLiveDownSlideMyCurriculumCellIdentifier"
+    
     var totolNum = 0//一共显示多少行cell
     var selectedCell: CNDownSlideSingleCourseCell?
@@ -46,10 +49,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         }
         set{
             _idModel = newValue
-            if _idModel?.id == 6{
-                //幼教中国,请求我的课程接口
-                self.getYjzgMyCurriculumApi()
-            }
         }
     }
@@ -71,6 +70,16 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         return dataArray
     }()
+    // 我的课程 index
+    var myCurriculumIndex = -1
+    //是否第一个展示'我的课程'
+    var isFirstMyCurriculum = false
+    ///我的课程数据源
+    lazy var myCurriculumDataArray: NSMutableArray = {
+        var myCurriculumDataArray = NSMutableArray()
+        return myCurriculumDataArray
+    }()
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.updateStatusBarAndTabbarFrame(visible: true)
@@ -111,45 +120,58 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-                
-        let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
-        //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
-        if slideModel.type == SlideModelTypeRecommend4{
-            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell 
+        if indexPath.row == self.myCurriculumIndex{
+            //我的课程cell
+            let myCurriculumModel = self.dataArray[indexPath.row] as! CNLiveAlbumBaseModel
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideAllCourseCellIdentifier) as? CNDownSlideSingleCourseCell
             else {
-                return CNLiveDownSlideRecommendCell()
+                let cell = CNDownSlideSingleCourseCell()
+                return cell
             }
-            cell.slideModel = slideModel
+            cell.myCurriculum = myCurriculumModel
             return cell
-        }else if slideModel.type == SlideModelTypeTodayRecommend74{
-            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier) as? CNLiveDownSlideTodayRecommendCell 
-            else {
-                let cell = CNLiveDownSlideTodayRecommendCell()
+        }else{
+            
+            let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+            
+            //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
+            if slideModel.type == SlideModelTypeRecommend4{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell
+                else {
+                    return CNLiveDownSlideRecommendCell()
+                }
                 cell.slideModel = slideModel
                 return cell
-            }
-            cell.slideModel = slideModel
-            return cell
-        }else if slideModel.type == SlideModelTypeAllCourse12{
-            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideAllCourseCellIdentifier) as? CNDownSlideSingleCourseCell
-            else {
-                let cell = CNDownSlideSingleCourseCell()
+            }else if slideModel.type == SlideModelTypeTodayRecommend74{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier) as? CNLiveDownSlideTodayRecommendCell
+                else {
+                    let cell = CNLiveDownSlideTodayRecommendCell()
+                    cell.slideModel = slideModel
+                    return cell
+                }
                 cell.slideModel = slideModel
                 return cell
-            }
-            cell.slideModel = slideModel
-            return cell
-        }else if slideModel.type == SlideModelTypeOneCourse75{
-            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideSingleCourseCellIdentifier) as? CNDownSlideSingleCourseCell
-            else {
-                let cell = CNDownSlideSingleCourseCell()
+            }else if slideModel.type == SlideModelTypeAllCourse12{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideAllCourseCellIdentifier) as? CNDownSlideSingleCourseCell
+                else {
+                    let cell = CNDownSlideSingleCourseCell()
+                    cell.slideModel = slideModel
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeOneCourse75{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideSingleCourseCellIdentifier) as? CNDownSlideSingleCourseCell
+                else {
+                    let cell = CNDownSlideSingleCourseCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
                 return cell
+            }else{
+                return UITableViewCell()
             }
-            cell.slideModel = slideModel
-            return cell
-        }else{
-            return UITableViewCell()
         }
     }
@@ -169,54 +191,78 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        
-        let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
         var cellType:CNLiveHomePageCellType = .course
-        ///model
-        ///(1) 1,2时跳转:sharelUrl后面拼接 ?contentId=contentId&videoId=pid
-        ///(2) 3,4时跳转:thirdUrl
-        ///(3)“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
-        if slideModel.contents.first?.model ?? "0" == "1" || slideModel.contents.first?.model ?? "0" == "2" || slideModel.contents.first?.model ?? "0" == "3" || slideModel.contents.first?.model ?? "0" == "4"{
-            cellType = .course
-        }else if slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModelAlbum_ugc{
-            cellType = .playlet
-        }else{
-            //新类型
-        }
-
-        //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
-        if slideModel.type == SlideModelTypeRecommend4{
-            
-        }else if slideModel.type == SlideModelTypeTodayRecommend74{
-            
-        }else if slideModel.type == SlideModelTypeAllCourse12{
+        
+        if indexPath.row == self.myCurriculumIndex{
+            //我的课程cell
+            let myCurriculumModel = self.dataArray[indexPath.row] as! CNLiveAlbumBaseModel
+            cellType = .courseToMyCurriculum
             guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
             selectedCell = cell
-            let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType), cellType: cellType)
+            let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: nil, albumModel: myCurriculumModel, 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{
-            guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
-            selectedCell = cell
-            
-            let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType), cellType: cellType)
-            
-            detailVC.dismissClosure = { [weak self] in
-                guard let StrongSelf = self else { return }
-                StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+        }else{
+            let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+            ///model
+            ///(1) 1,2时跳转:sharelUrl后面拼接 ?contentId=contentId&videoId=pid
+            ///(2) 3,4时跳转:thirdUrl
+            ///(3)“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
+            if slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModel1 || slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModel2 || slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModel3 || slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModel4{
+                cellType = .course
+            }else if slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModelAlbum_ugc{
+                cellType = .playlet
+            }else{
+                //新类型
+            }
+            //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
+            if slideModel.type == SlideModelTypeAllCourse12{
+                guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+                selectedCell = cell
+                let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, 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{
+                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)
             }
-            updateStatusBarAndTabbarFrame(visible: false)
-            present(detailVC, animated: true, completion: nil)
         }
+      
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
-        return CGFloat(slideModel.cellH)
+        if indexPath.row == self.myCurriculumIndex{
+            let myCurriculumModel = self.dataArray[indexPath.row] as! CNLiveAlbumBaseModel
+            let contentsNum = myCurriculumModel.list.count
+            //总显示块数/循环数
+            let totalNum = (contentsNum >= 4) ? 4 : contentsNum
+            let cellH = DownSlideAllCourseTitleH + DownSlideAllCourseRowH * CGFloat(totalNum)+DownSlideRecommendLeftGap
+            return cellH
+        }else{
+            if self.dataArray[indexPath.row] is CNLiveDownSlideModel{
+                let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+                return CGFloat(slideModel.cellH)
+            }else{
+                return 50
+            }
+        }
     }
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
@@ -233,6 +279,7 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
             hiddenLoading()
             if status == .success{
+                
                 self.dataArray.removeAllObjects()
                 let array = result as! [Any]
                 let newDataArray = NSMutableArray()
@@ -244,8 +291,19 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
                     }
                 }
                 self.dataArray.addObjects(from: newDataArray as! [Any])
+                if self.idModel?.id == 16{//后面改成6
+                    //幼教中国,请求我的课程接口
+                    self.getYjzgMyCurriculumApi()
+                    let firMdl = self.dataArray.firstObject as! CNLiveDownSlideModel
+                    if firMdl.type == SlideModelTypeTodayRecommend74{
+                        self.isFirstMyCurriculum = false
+                    }else{
+                        self.isFirstMyCurriculum = true
+                    }
+                }else{
+                    self.tableView.reloadData()
+                }
-                self.tableView.reloadData()
             }else if (status == .failed){
 //                self.NetApiStatus = .apiError
             }else if (status == .noNetwork){
@@ -262,8 +320,25 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         CNLiveDownSlideViewModel.getYjzgMyCurriculum(page: 1) { result, status in
             hiddenLoading()
             if status == .success{
+                self.myCurriculumDataArray.removeAllObjects()
                 let albumBaseModel = result as! CNLiveAlbumBaseModel
-                
+                self.myCurriculumDataArray.addObjects(from: [albumBaseModel])
+                self.myCurriculumIndex = -1
+                if self.myCurriculumDataArray.count>0{
+                    //有我的课程
+                    if self.isFirstMyCurriculum{
+                        //第一个区块显示
+                        self.myCurriculumIndex = 0
+                    }else{
+                        //第二个区块显示
+                        self.myCurriculumIndex = 1
+                    }
+                }else{
+                    //没有我的课程
+                    self.myCurriculumIndex = -1
+                }
+                self.dataArray.insert(albumBaseModel, at: self.myCurriculumIndex)
+                self.tableView.reloadData()
             }else if (status == .failed){
 //                self.NetApiStatus = .apiError
             }else if (status == .noNetwork){
@@ -58,19 +58,32 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         }
     }
+    deinit {
+        self.webView.cnWebView.stopLoading()
+        self.webView.cnWebView.navigationDelegate = nil
+        self.webView.cnWebView.uiDelegate = nil
+        print("WKWebView dealloc")
+    }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        self.h5StopVideoPlayer()
+    }
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBarHidden = false
         self.view.addSubview(self.webView)
-        self.webView.webControllerUpdateNavBlock = { isFinish , title,isDecidePolicy ,urlStr in
+        self.webView.webControllerUpdateNavBlock = { [weak self] isFinish , title,isDecidePolicy ,urlStr in
             if isFinish{
-                self.titleName = title
+                self!.titleName = title
             }else if isDecidePolicy{
                 if urlStr.contains("&isWjjReport=true") || urlStr.contains("?isWjjReport=true"){
-                    self.rightNavBtns = [self.moreNavBtn]
-                    self.moreNavBtn.isHidden = false
+                    self!.rightNavBtns = [self!.moreNavBtn]
+                    self!.moreNavBtn.isHidden = false
                 }else{
-                    self.moreNavBtn.isHidden = true
+                    self!.moreNavBtn.isHidden = true
                 }
             }
         }
@@ -80,6 +93,14 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         }
     }
+    func h5StopVideoPlayer(){
+        // call h5停止播放视频
+        let data = ["stop": true]
+        self.bridge?.callHandler("wjjStopVideoPlayer", data: data, responseCallback: { responseData in
+            print("\(responseData ?? "")")
+        })
+    }
+    
     //点击...分享获取h5参数oc call js
     func configBridgeCallHander() -> Void {
         self.webView.bridge?.callHandler("wjjClientGetShareParaFromJS", data: ["":""], responseCallback: { data in
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/16.
-//  单课程大图专辑 | 全部课程列表
+//  单课程大图专辑 | 全部课程列表 | 我的课程列表
 import Foundation
@@ -64,6 +64,18 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
         }
     }
+    //myCurriculum
+    var _myCurriculum : CNLiveAlbumBaseModel?
+    var myCurriculum : CNLiveAlbumBaseModel? {
+        get{
+            _myCurriculum
+        }
+        set{
+            _myCurriculum = newValue!
+            self.setupMyCurriculumUI(model: _myCurriculum!)
+        }
+    }
+    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
@@ -229,10 +241,90 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
         }
     }
+    func setupMyCurriculumUI(model:CNLiveAlbumBaseModel){
+        contentView.subviews.forEach { view in
+            view.removeFromSuperview()
+        }
+        bgBackView.subviews.forEach { view in
+            view.removeFromSuperview()
+        }
+        bgImageView.subviews.forEach { view in
+            view.removeFromSuperview()
+        }
+        //全部课程列表
+        contentView.addSubview(bgBackView)
+
+        let contentsNum = model.list.count
+        //总显示块数/循环数
+        var totalNum = (contentsNum >= 4) ? 4 : contentsNum
+        var cellH = DownSlideAllCourseTitleH + DownSlideAllCourseRowH * CGFloat(totalNum)+DownSlideRecommendLeftGap
+        
+        bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height: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
+        let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: titleTop, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+        titleLbl.text = "我的课程"
+        titleLbl.font = BoldFont_21
+        titleLbl.textColor = HexColor("#333333")
+        bgBackView.addSubview(titleLbl)
+        
+        for i in 0..<totalNum{//i是第几行
+            let contentMdl = model.list[i]
+            
+            //小icon
+            let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, titleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(i)*(DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowImageWH+DownSlideAllCourseRowBottomYGap), CGFloat(DownSlideAllCourseRowImageWH), CGFloat(DownSlideAllCourseRowImageWH)))
+            imageView.kf.setImage(with: URL(string:contentMdl.poster ))
+            imageView.layer.cornerRadius = 12
+            imageView.clipsToBounds = true
+            imageView.contentMode = .scaleAspectFill
+            bgBackView.addSubview(imageView)
+            
+            let titleLbl = UILabel(frame: CGRect(x: imageView.right+DownSlideRecommendLeftGap, y: imageView.top, width: DownSlideSingleCourseW-90-imageView.right, height: 21))
+            titleLbl.text = contentMdl.title 
+            titleLbl.font = Font_15
+            titleLbl.textColor = HexColor("#333333")
+            bgBackView.addSubview(titleLbl)
+            
+            let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
+            subTitleLbl.text =  contentMdl.subTitle 
+            subTitleLbl.font = Font_12
+            subTitleLbl.textColor = HexColor("#999999")
+            bgBackView.addSubview(subTitleLbl)
+            
+            let enterBtn = UIButton(type: .custom)
+            enterBtn.frame = CGRect(x: bgBackView.right-25-65, y: 0, width: 65, height: 30)
+            enterBtn.centerY = imageView.centerY
+            enterBtn.setBackgroundImage(UIImage(named: "homepage_down_enter"), for: .normal)
+            enterBtn.setTitle("进入", for: .normal)
+            enterBtn.titleLabel?.font = BoldFont_13
+            enterBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+            enterBtn.addTarget(self, action: #selector(enterBtnAction(_:)), for: .touchUpInside)
+            enterBtn.tag = i
+            bgBackView.addSubview(enterBtn)
+        }
+    }
     //MARK: - 事件
     @objc func enterBtnAction(_ sender: UIButton){
         let tag = sender.tag
-        let contentMdl = self.slideModel?.contents[tag]
-        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl!)
+        if self.myCurriculum?.list.count ?? 0 > 0{
+            let albumMdl = self.myCurriculum?.list[tag]
+            CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumMdl?.model ?? "", contentId: albumMdl?.contentId ?? "", pid: albumMdl?.pid ?? "", shareUrl: albumMdl?.shareUrl ?? "", thirdUrl: albumMdl?.thirdUrl ?? "", title: albumMdl?.title ?? "", s_to: albumMdl?.s_to ?? "")
+
+        }else if self.slideModel?.contents.count ?? 0 > 0{
+            let contentMdl = self.slideModel?.contents[tag]
+            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 ?? "")
+        }
     }
 }
@@ -86,7 +86,7 @@ class CNLiveDownSlideRecommendCell: UITableViewCell {
         let imageView = ges.view as! UIImageView
         let i = imageView.tag
         let contentMdl = (self.slideModel?.contents[i])!
-        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl)
+        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 ?? "")
     }
 }
@@ -66,6 +66,6 @@ class CNLiveDownSlideTodayRecommendCell: UITableViewCell {
         let imageView = ges.view as! UIImageView
         let i = imageView.tag
         let contentMdl = self.slideModel?.contents[i]
-        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl!)
+        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 ?? "")
     }
 }
@@ -235,7 +235,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                 guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
                 selectedCell = cell
-                let detailVC = CNSlideBaseNavigationController(rootViewController: CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType), 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)
@@ -246,7 +246,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             }else if slideModel.type == SlideModelTypeOneCourse75{
                 guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
                 selectedCell = cell
-                let detailViewC = CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, cellType: cellType) 
+                let detailViewC = CNUpSlideDetailViewController(cell: cell,slideModel: slideModel, albumModel: nil, cellType: cellType) 
                 let detailVC = CNSlideBaseNavigationController(rootViewController: detailViewC, cellType: cellType)
                 detailVC.dismissClosure = { [weak self] in
@@ -36,7 +36,7 @@ class CNLiveAlbumModel:BaseModel{
     var contentId = ""
     var pid = ""
     var tag = ""
-    var model = ""//1,2,3,4课程 album_ugc短剧
+    var model = ""//1,2,3,4课程 album_ugc短剧 ,album_video专辑h5
     var thirdUrl = ""
     var publishTime = ""
     var shareUrl = ""
@@ -103,7 +103,7 @@ 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"{
+        if model.model == kCNDownSlideContentsModelModel1 || model.model == kCNDownSlideContentsModelModel2 || model.model == kCNDownSlideContentsModelModel3 || model.model == kCNDownSlideContentsModelModel4{
             //课程-跳转h5网页
             self.cellType = .course
             self.playBtn.setTitle("进入", for: .normal)
@@ -114,6 +114,11 @@ class CNLiveAlbumCell:UITableViewCell{
         }else if model.model == kCNDownSlideContentsModelModelServing{
             self.cellType = .course
             self.playBtn.setTitle("进入", for: .normal)
+        }else if model.model == kCNDownSlideContentsModelModelAlbum_video{
+            self.cellType = .courseToMyCurriculum
+            self.playBtn.setTitle("进入", for: .normal)
+        }else{
+            
         }
         self.titleLabl.text = model.title
         self.subTitleLabel.text = model.subTitle
@@ -147,12 +152,17 @@ class CNLiveAlbumCell:UITableViewCell{
             aid = ""
         }
         if (self.albumModel != nil){
-            if (self.albumModel?.model == "1" || self.albumModel?.model == "2" || self.albumModel?.model == "3" || self.albumModel?.model == "4"){
+            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{
                 //短剧-跳转短剧播放页
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+            }else if self.albumModel?.model == kCNDownSlideContentsModelModelAlbum_video{
+                //课程-跳转h5视频专辑页
+                self.enterBlock!(self.albumModel!)
+            }else{
+                
             }
         }else if (self.albumMsgModel != nil){
             //短剧-跳转短剧播放页
@@ -16,7 +16,7 @@ class CNLiveDuanjuTitleCell:UITableViewCell{
         set{
             _blockName = newValue!
-            if self.cellType == .course || self.cellType == .playletToCourse{
+            if self.cellType == .course || self.cellType == .playletToCourse || self.cellType == .courseToMyCurriculum{
                 self.blockTitleLabl.text = _blockName ?? "全部课程"
                 self.blockTitleLabl.top = (allCourseCellHeight-30)/2+get_system_statusBar_height()
             }else if self.cellType == .playlet{
@@ -9,53 +9,53 @@ import Foundation
 import CNLiveShareToolKit
 class CNLiveDownSlideTool:NSObject{
-    class func pushWebVCWithContentsMdl(contentMdl:CNLiveDownSlideContentsModel){
+    class func pushWebVCWithContentsMdl(model:String,contentId:String,pid:String,shareUrl:String,thirdUrl:String,title:String,s_to:String){//contentMdl:CNLiveDownSlideContentsModel
-        if (contentMdl.model == kCNDownSlideContentsModelModel1) || (contentMdl.model == kCNDownSlideContentsModelModel2){
+        if (model == kCNDownSlideContentsModelModel1) || (model == kCNDownSlideContentsModelModel2){
-            let queryItem = URLQueryItem(name: "contentId", value: contentMdl.contentId)
-            let queryItem1 = URLQueryItem(name: "videoId", value: contentMdl.pid)
-            let urlComponents = NSURLComponents(string: (contentMdl.shareUrl)!)!
+            let queryItem = URLQueryItem(name: "contentId", value: contentId)
+            let queryItem1 = URLQueryItem(name: "videoId", value: pid)
+            let urlComponents = NSURLComponents(string: shareUrl)!
             urlComponents.queryItems = [queryItem, queryItem1]
             let regURL = urlComponents.url
             let webVC = CNWebViewController()
             webVC.url = regURL
             navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)           
-        }else if (contentMdl.model == kCNDownSlideContentsModelModel3) || (contentMdl.model == kCNDownSlideContentsModelModel4){
+        }else if (model == kCNDownSlideContentsModelModel3) || (model == kCNDownSlideContentsModelModel4){
             let webVC = CNWebViewController()
-            webVC.url = URL(string: (contentMdl.thirdUrl)!)
+            webVC.url = URL(string: thirdUrl)
             navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
-        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum){
+        }else if (model == kCNDownSlideContentsModelModelAlbum){
             let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
-            let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
-            let queryItem1 = URLQueryItem(name: "title", value: contentMdl.title)
+            let queryItem = URLQueryItem(name: "aid", value: contentId)
+            let queryItem1 = URLQueryItem(name: "title", value: 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 if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
+        }else if (model == kCNDownSlideContentsModelModelAlbum_video){
             let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
-            let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
-            let queryItem1 = URLQueryItem(name: "title", value: contentMdl.title)
+            let queryItem = URLQueryItem(name: "aid", value: contentId)
+            let queryItem1 = URLQueryItem(name: "title", value: title)
             let queryItem2 = URLQueryItem(name: "channelName", value: "yjzg")
             let queryItem3 = URLQueryItem(name: "isShowTitle", value: "true")
             let queryItem4 = URLQueryItem(name: "isWjjReport", value: "true")
             let urlComponents = NSURLComponents(string: urlString)
-            urlComponents!.queryItems = [queryItem, queryItem1]
+            urlComponents!.queryItems = [queryItem, queryItem1,queryItem2,queryItem3,queryItem4]
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
             navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
-        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc){
+        }else if (model == kCNDownSlideContentsModelModelAlbum_ugc){
             //短剧-跳转短剧播放页
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentMdl.contentId ?? ""), animated: pushAnimated)
-        }else if contentMdl.model == kCNDownSlideContentsModelModelServing{
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentId), animated: pushAnimated)
+        }else if model == kCNDownSlideContentsModelModelServing{
             //跳转微信小程序
-            if let data = (contentMdl.s_to ?? "").data(using: .utf8) {
+            if let data = s_to.data(using: .utf8) {
                 do {
                     let jsonResult = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any]
                     let miniAppId = jsonResult!["id"] as! String
@@ -98,7 +98,7 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            controller.navigationController?.pushViewController(webVC, animated: true)
         }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum_video){
             let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
             let queryItem = URLQueryItem(name: "aid", value: albumModel.contentId)
@@ -107,11 +107,11 @@ class CNLiveDownSlideTool:NSObject{
             let queryItem3 = URLQueryItem(name: "isShowTitle", value: "true")
             let queryItem4 = URLQueryItem(name: "isWjjReport", value: "true")
             let urlComponents = NSURLComponents(string: urlString)
-            urlComponents!.queryItems = [queryItem, queryItem1]
+            urlComponents!.queryItems = [queryItem, queryItem1,queryItem2,queryItem3,queryItem4]
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            controller.navigationController?.pushViewController(webVC, animated: true)
         }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum_ugc){
             //短剧-跳转短剧播放页
             navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
@@ -172,11 +172,11 @@ class CNLiveDownSlideTool:NSObject{
             let queryItem3 = URLQueryItem(name: "isShowTitle", value: "true")
             let queryItem4 = URLQueryItem(name: "isWjjReport", value: "true")
             let urlComponents = NSURLComponents(string: urlString)
-            urlComponents!.queryItems = [queryItem, queryItem1]
+            urlComponents!.queryItems = [queryItem, queryItem1,queryItem2,queryItem3,queryItem4]
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            viewController.navigationController?.pushViewController(webVC, animated: true)
         }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc){
             //短剧-跳转短剧播放页
             navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentMdl.contentId!), animated: pushAnimated)
@@ -87,7 +87,7 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
             }else{
                 return
             }
-        }else if self.cellType == .course{
+        }else if self.cellType == .course || self.cellType == .courseToMyCurriculum{
             //1.Get fromVC and toVC
             guard let fromVC = transitionContext.viewController(forKey: .from) as? CNUpSlideViewController else { return }
             guard let toNaviVC = transitionContext.viewController(forKey: .to) as? CNSlideBaseNavigationController else { return }
@@ -181,7 +181,7 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
                 return
             }
-        }else if self.cellType == .course{
+        }else if self.cellType == .course || self.cellType == .courseToMyCurriculum{
             guard let fromNaviVC = transitionContext.viewController(forKey: .from) as? CNSlideBaseNavigationController else { return }
             guard let toVC = transitionContext.viewController(forKey: .to) as? CNUpSlideViewController else { return }
             guard let selectedCell = toVC.selectedCell else { return }