Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

liushiyu
2 parents fad828e0 3ec37552
Showing 199 changed files with 2029 additions and 443 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNCertificationView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveRoundedRectView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveRoundedRectView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveSelUplSingleImageView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveSelUplSingleImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopAddGoodsSingleView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopAddGoodsSingleView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopAssociatedGoodsTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopAssociatedGoodsTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifyCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifyCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifyInputTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifyInputTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifySectionHeaderView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifySectionHeaderView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifySwitchTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifySwitchTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassilyIconTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassilyIconTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassilyManageHeaderView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassilyManageHeaderView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassilyManageTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassilyManageTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsListCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopGoodsListCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsListClassifyView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopGoodsListClassifyView.swift
@@ -90,6 +90,9 @@
 		1938BD3D2B4BDD4B00390A34 /* CNLiveAlbumCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */; };
 		1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD3E2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift */; };
 		1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */; };
+		1938BD432B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */; };
+		1938BD452B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */; };
+		1938BD472B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */; };
 		19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */; };
 		19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */; };
 		19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */; };
@@ -352,6 +355,9 @@
 		1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumCell.swift; sourceTree = "<group>"; };
 		1938BD3E2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumMsgModel.swift; sourceTree = "<group>"; };
 		1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumListModel.swift; sourceTree = "<group>"; };
+		1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomepageDuanJuDetailViewController.swift; sourceTree = "<group>"; };
+		1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDuanjuTitleCell.swift; sourceTree = "<group>"; };
+		1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveIntegralAlertTool.swift; sourceTree = "<group>"; };
 		19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailBtnsCell.swift; sourceTree = "<group>"; };
 		19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailOrderAssetCell.swift; sourceTree = "<group>"; };
 		19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopProductManagerController.swift; sourceTree = "<group>"; };
@@ -759,6 +765,7 @@
 			isa = PBXGroup;
 			children = (
 				1938BD292B48014E00390A34 /* CNHomepageDetailViewController.swift */,
+				1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */,
 				1938BD2B2B4801A700390A34 /* CNHomePageAnimationTransition.swift */,
 				1938BD2D2B48021E00390A34 /* CNHomePageBaseNavigationController.swift */,
 			);
@@ -768,6 +775,7 @@
 		1938BD392B4BDC2900390A34 /* HomepageDetail */ = {
 			isa = PBXGroup;
 			children = (
+				1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */,
 				1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */,
 				1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */,
 			);
@@ -791,6 +799,80 @@
 			path = PlayletHomePage;
 			sourceTree = "<group>";
 		};
+		1938BD482B512C5800390A34 /* DownSlide */ = {
+			isa = PBXGroup;
+			children = (
+				7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */,
+				7CD6753A2A2740B0008354C1 /* CNDownSlideViewRemindView.swift */,
+				19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */,
+				19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */,
+				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
+				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
+			);
+			path = DownSlide;
+			sourceTree = "<group>";
+		};
+		1938BD492B512CA300390A34 /* UpSlide */ = {
+			isa = PBXGroup;
+			children = (
+				7CD675392A2740B0008354C1 /* CNUpSlideView.swift */,
+				7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */,
+			);
+			path = UpSlide;
+			sourceTree = "<group>";
+		};
+		1938BD4A2B512CCE00390A34 /* MainView */ = {
+			isa = PBXGroup;
+			children = (
+				7CD675382A2740B0008354C1 /* CNMainView.swift */,
+				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
+				19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
+				7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
+				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
+			);
+			path = MainView;
+			sourceTree = "<group>";
+		};
+		1938BD4B2B512D3000390A34 /* Shop */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD4C2B512EBF00390A34 /* ShopConsole */,
+				191733402B284D4A007BCC04 /* ShopCoupon */,
+				19565ED02AF8D904007D6727 /* GoodsManager */,
+				1938BD4D2B512F4600390A34 /* ShopDetail */,
+			);
+			path = Shop;
+			sourceTree = "<group>";
+		};
+		1938BD4C2B512EBF00390A34 /* ShopConsole */ = {
+			isa = PBXGroup;
+			children = (
+				19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */,
+			);
+			path = ShopConsole;
+			sourceTree = "<group>";
+		};
+		1938BD4D2B512F4600390A34 /* ShopDetail */ = {
+			isa = PBXGroup;
+			children = (
+				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
+				19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */,
+				19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */,
+			);
+			path = ShopDetail;
+			sourceTree = "<group>";
+		};
+		1938BD4E2B51316200390A34 /* VerticalViews */ = {
+			isa = PBXGroup;
+			children = (
+				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
+				1938BD482B512C5800390A34 /* DownSlide */,
+				1938BD4A2B512CCE00390A34 /* MainView */,
+				1938BD492B512CA300390A34 /* UpSlide */,
+			);
+			path = VerticalViews;
+			sourceTree = "<group>";
+		};
 		19565EC32AF8ACC2007D6727 /* GoodsManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -996,6 +1078,7 @@
 			children = (
 				792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */,
 				792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */,
+				1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -1321,26 +1404,8 @@
 		7CD675232A26F8F8008354C1 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				191733402B284D4A007BCC04 /* ShopCoupon */,
-				19565ED02AF8D904007D6727 /* GoodsManager */,
-				7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */,
-				7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */,
-				7CD675382A2740B0008354C1 /* CNMainView.swift */,
-				7CD6753A2A2740B0008354C1 /* CNDownSlideViewRemindView.swift */,
-				7CD675392A2740B0008354C1 /* CNUpSlideView.swift */,
-				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
-				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
-				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
-				7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
-				19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
-				19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */,
-				19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */,
-				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
-				19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */,
-				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
-				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
-				19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */,
-				19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */,
+				1938BD4E2B51316200390A34 /* VerticalViews */,
+				1938BD4B2B512D3000390A34 /* Shop */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -1762,6 +1827,7 @@
 				191733562B2FE855007BCC04 /* CNLivePickerReusingModel.swift in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */,
+				1938BD452B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				19CC4D4F2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift in Sources */,
 				191733642B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift in Sources */,
@@ -1796,6 +1862,7 @@
 				191732FE2B0B3EBF007BCC04 /* CNLiveShopGoodsDetailsViewController.swift in Sources */,
 				79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
+				1938BD472B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift in Sources */,
 				19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
@@ -1882,6 +1949,7 @@
 				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */,
+				1938BD432B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				7999415C2B4E8E8E0014C721 /* CNLiveRefresh.swift in Sources */,
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
@@ -64,7 +64,7 @@ class CNLiveBaseTabBarViewController: UITabBarController
         creatTabbarView(viewController: homeVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "首页")
-        creatTabbarView(viewController: authVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "认证")
+        creatTabbarView(viewController: authVC, image: "tabbar_authentication_unSelect", selectImage: "tabbar_authentication", title: "认证")
         creatTabbarView(viewController: mineVC, image: "tabbar_mine_icon_default", selectImage: "tabbar_mine_icon_selected", title: "我的")
+//
+//  CNLiveIntegralAlertTool.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/11.
+//  积分支付弹窗
+
+import Foundation
+import QMUIKit
+import SnapKit
+
+///积分支付状态类型
+enum CNLiveIntegralPayStatus {
+    ///积分充足
+    case integralEnough
+    ///积分不足
+    case integralNotEnough
+    ///支付中
+    case paying
+    ///支付成功
+    case paySuccess
+    ///支付失败
+    case payFailed
+    
+}
+
+class CNLiveIntegralAlertTool:NSObject{
+    static let shared = CNLiveIntegralAlertTool()
+    
+    var homePageNeedReloadActionBlock:homePageNeedReloadBlockActionBlock?
+
+    ///当前积分支付状态
+    var currentIntegralPayStatus: CNLiveIntegralPayStatus = .integralEnough
+
+    let delegate = UIApplication.shared.delegate as! AppDelegate
+    /// 专辑名称
+    var title:String = ""
+    
+    /// 专辑积分值
+    var integralCount:String = "0"
+    /// 支付的商品id
+    var productId:String = ""
+    /// 用户积分值
+    var point:Int = 0
+    /// 用户积分model
+    var checkInModel:MinePointCheckInModel?
+
+    lazy var bgBtnView: UIButton = {
+        let bgBtnView = UIButton(frame: self.delegate.window!.bounds)
+        bgBtnView.backgroundColor = HexColor("#000000")
+        bgBtnView.alpha = 0.6
+        bgBtnView.addTarget(self, action: #selector(bgBtnViewAction), for: .touchUpInside)
+        return bgBtnView
+    }()
+
+    lazy var bottomBgView :UIView = {
+        let bottomBgView = UIView(frame: CGRect(x: 0, y: KSreenHeight-267, width: KSreenWidth, height: 267))
+        bottomBgView.backgroundColor = HexColor("#FFFFFF")
+        bottomBgView.layer.cornerRadius = 9
+        bottomBgView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+        bottomBgView.tag = 10000
+        return bottomBgView
+    }()
+    
+    ///专辑标题
+    lazy var albumTitleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(15, 15, KSreenWidth-15-60, 20))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_16
+        titleLabel.text = "剧集名称45集"
+        return titleLabel
+    }()
+    
+    lazy var closeBtn: UIButton = {
+        let  closeBtn = UIButton(type: .custom)
+        closeBtn.frame = CGRect(x: self.albumTitleLabel.right, y: 0, width: 50, height: 50)
+        closeBtn.setImage(UIImage(named: "point_alert_close"), for: .normal)
+        closeBtn.addTarget(self, action: #selector(closeBtnAction), for: .touchUpInside)
+        return closeBtn
+    }()
+
+    lazy var bottomLineView :UIView = {
+        let bottomLineView = UIView(frame: CGRect(x: 0, y: self.closeBtn.bottom+2, width: KSreenWidth, height: 1))
+        bottomLineView.backgroundColor = HexColor("#E4E4E4")
+        return bottomLineView
+    }()
+    
+    ///积分数量
+    lazy var integralCountLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(0, self.bottomLineView.bottom+30, 100, 66))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = UIFont.boldSystemFont(ofSize: 55)
+        titleLabel.text = "8000"
+        return titleLabel
+    }()
+    ///余额XXX积分
+    lazy var balanceIntegralLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(0, 0, 100, 20))
+        titleLabel.textColor = HexColor("#696969")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_14
+        return titleLabel
+    }()
+    
+    lazy var payBtn: UIButton = {
+        let  payBtn = UIButton(type: .custom)
+        payBtn.frame = CGRect(x: 15, y: self.bottomBgView.height-15-44, width: KSreenWidth-30, height: 44)
+        payBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        // fillCode
+        let bgLayer1 = CAGradientLayer()
+        bgLayer1.colors = [UIColor(red: 0.4, green: 0.77, blue: 1, alpha: 1).cgColor, UIColor(red: 0.38, green: 0.6, blue: 1, alpha: 1).cgColor]
+        bgLayer1.locations = [0, 1]
+        bgLayer1.frame = payBtn.bounds
+        bgLayer1.startPoint = CGPoint(x: 0, y: 0.5)
+        bgLayer1.endPoint = CGPoint(x: 0.5, y: 0.5)
+        payBtn.layer.addSublayer(bgLayer1)
+        payBtn.addTarget(self, action: #selector(payBtnAction), for: .touchUpInside)
+        return payBtn
+    }()
+    
+    ///支付中img
+    lazy var payingImgView :UIImageView = {
+        let payingImgView = UIImageView(frame: CGRect(x: (KSreenWidth-45)/2.0, y: self.bottomLineView.bottom+65, width: 45, height: 43))
+        payingImgView.image = UIImage(named: "jifen_paying")
+        return payingImgView
+    }()
+    ///支付成功img
+    lazy var paySuccessImgView :UIImageView = {
+        let paySuccessImgView = UIImageView(frame: CGRect(x: (KSreenWidth-78)/2.0, y: 60, width: 78, height: 78))
+        paySuccessImgView.image = UIImage(named: "jifen_paySuccess")
+        return paySuccessImgView
+    }()
+
+    ///支付中
+    lazy var payingLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(0, self.payingImgView.bottom+15, KSreenWidth-40, 20))
+        titleLabel.centerX = self.payingImgView.centerX
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .center
+        titleLabel.font = Font_14
+        return titleLabel
+    }()
+    
+    // MARK: - show
+    ///弹出积分购买弹窗
+    func showIntegralAlert(title:String,integralCount:String,productId:String){
+        self.title = title
+        self.integralCount = integralCount
+        self.productId = productId
+        
+        delegate.window?.addSubview(self.bgBtnView)
+        delegate.window?.addSubview(self.bottomBgView)
+
+        //专辑所需积分值
+        let intIntegralCount = Int(integralCount)!
+        //用户积分值
+        self.getCheckIn { result, status in
+            let checkInModel = result as! MinePointCheckInModel
+            self.checkInModel = checkInModel
+            let pointStr = checkInModel.integral ?? "0"
+            let intPoint = Int(pointStr)!
+            self.point = intPoint
+            if intPoint > intIntegralCount{
+                //可以支付积分
+                self.currentIntegralPayStatus = .integralEnough
+                
+            }else{
+                //积分不足
+                self.currentIntegralPayStatus = .integralNotEnough
+            }
+            self.initUI()
+
+        }
+    }
+    
+    //隐藏积分购买弹窗
+    func hiddenIntegralAlert(){
+        delegate.window?.subviews.forEach({ view in
+            if view.tag == 10000{
+                UIView.animate(withDuration: 0.25) {
+                    view.removeFromSuperview()
+                    self.bgBtnView.removeFromSuperview()
+                }
+            }
+        })
+    }
+    
+    func initUI(){
+        self.bottomBgView.subviews.forEach { view in
+            view.removeFromSuperview()
+        }
+
+        if self.currentIntegralPayStatus == .integralEnough{
+            //积分充足
+            self.bottomBgView.addSubview(self.albumTitleLabel)
+            self.albumTitleLabel.text = self.title
+            self.bottomBgView.addSubview(self.closeBtn)
+            self.bottomBgView.addSubview(self.bottomLineView)
+            self.bottomBgView.addSubview(self.integralCountLabel)
+            let integralCountStr = "\(self.integralCount)积分"
+            let priceAttri = NSMutableAttributedString.init(string: integralCountStr)
+            priceAttri.addAttribute(.font, value: regular_adapt_font(pointSize: 55), range: NSMakeRange(0, integralCountStr.count-2))
+            priceAttri.addAttribute(.foregroundColor, value: HexColor("#333333")!, range: NSMakeRange(0, integralCountStr.count-2))
+            priceAttri.addAttribute(.font, value: regular_adapt_font(pointSize: 16), range: NSMakeRange(integralCountStr.count-2, 2))
+            priceAttri.addAttribute(.foregroundColor, value: HexColor("#333333")!, range: NSMakeRange(integralCountStr.count-2, 2))
+            self.integralCountLabel.attributedText = priceAttri
+
+            self.bottomBgView.addSubview(self.balanceIntegralLabel)
+            
+            self.balanceIntegralLabel.text = String(format: "余额%d积分", self.point)
+            
+            self.bottomBgView.addSubview(self.payBtn)
+            self.payBtn.setTitle("确认支付", for: .normal)
+            
+            self.integralCountLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(self.bottomBgView.snp.centerX)
+                make.top.equalTo(self.bottomLineView.snp.bottom).offset(30)
+                make.width.lessThanOrEqualToSuperview().offset(-10)
+            }
+            self.balanceIntegralLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(self.bottomBgView.snp.centerX)
+                make.top.equalTo(self.integralCountLabel.snp.bottom).offset(5)
+                make.width.lessThanOrEqualToSuperview()
+            }
+            
+        }else if self.currentIntegralPayStatus == .integralNotEnough{
+            //积分不足
+            self.bottomBgView.addSubview(self.albumTitleLabel)
+            self.albumTitleLabel.text = self.title
+            self.bottomBgView.addSubview(self.closeBtn)
+            self.bottomBgView.addSubview(self.bottomLineView)
+            self.bottomBgView.addSubview(self.integralCountLabel)
+            let integralCountStr = "\(self.integralCount)积分"
+            let priceAttri = NSMutableAttributedString.init(string: integralCountStr)
+            priceAttri.addAttribute(.font, value: regular_adapt_font(pointSize: 55), range: NSMakeRange(0, integralCountStr.count-2))
+            priceAttri.addAttribute(.foregroundColor, value: HexColor("#333333")!, range: NSMakeRange(0, integralCountStr.count-2))
+            priceAttri.addAttribute(.font, value: regular_adapt_font(pointSize: 16), range: NSMakeRange(integralCountStr.count-2, 2))
+            priceAttri.addAttribute(.foregroundColor, value: HexColor("#333333")!, range: NSMakeRange(integralCountStr.count-2, 2))
+            self.integralCountLabel.attributedText = priceAttri
+
+            self.bottomBgView.addSubview(self.balanceIntegralLabel)
+            self.balanceIntegralLabel.text = String(format: "余额%d积分   积分不足", self.point)
+
+            self.bottomBgView.addSubview(self.payBtn)
+            self.payBtn.setTitle("去赚积分", for: .normal)
+
+            self.integralCountLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(self.bottomBgView.snp.centerX)
+                make.top.equalTo(self.bottomLineView.snp.bottom).offset(30)
+                make.width.lessThanOrEqualToSuperview().offset(-10)
+            }
+            self.balanceIntegralLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(self.bottomBgView.snp.centerX)
+                make.top.equalTo(self.integralCountLabel.snp.bottom).offset(5)
+                make.width.lessThanOrEqualToSuperview()
+            }
+        }else if self.currentIntegralPayStatus == .paying{
+            //支付中
+            self.bottomBgView.addSubview(self.albumTitleLabel)
+            self.albumTitleLabel.text = self.title
+            self.bottomBgView.addSubview(self.closeBtn)
+            self.bottomBgView.addSubview(self.bottomLineView)
+            self.bottomBgView.addSubview(self.payingImgView)
+            self.payingImgView = UIImageView(frame: CGRect(x: (KSreenWidth-45)/2.0, y: self.bottomLineView.bottom+65, width: 45, height: 43))
+            self.payingImgView.image = UIImage(named: "jifen_paying")
+            
+            self.bottomBgView.addSubview(self.payingLabel)
+            self.payingLabel.text = "支付中..."
+            
+        }else if self.currentIntegralPayStatus == .paySuccess{
+            //支付成功
+            self.bottomBgView.addSubview(self.paySuccessImgView)
+            self.paySuccessImgView = UIImageView(frame: CGRect(x: (KSreenWidth-78)/2.0, y: 60, width: 78, height: 78))
+            self.paySuccessImgView.image = UIImage(named: "jifen_paySuccess")
+
+            self.bottomBgView.addSubview(self.payingLabel)
+            self.payingLabel.text = "支付成功\(self.integralCount)积分"
+            
+            self.bottomBgView.addSubview(self.payBtn)
+            self.payBtn.setTitle("完成", for: .normal)
+            
+        }else if self.currentIntegralPayStatus == .payFailed{
+            //支付失败
+        }else{
+            //其他
+        }
+    }
+    
+    //获取用户积分
+    func getCheckIn(resultBlock: @escaping downSlideResultBlock){
+        CNLiveMineViewModel.requestWithCheckIn { result, respStatue in
+            if respStatue == .success {
+                let checkModel = result as! MinePointCheckInModel
+                resultBlock(checkModel, .success)
+            } else {
+                resultBlock(NSNull(), .failed)
+            }
+        }
+    }
+    
+    // MARK: - BtnAction
+    @objc func bgBtnViewAction(){
+        self.hiddenIntegralAlert()
+    }
+    @objc func closeBtnAction(){
+        self.hiddenIntegralAlert()
+    }
+    @objc func payBtnAction(){
+        if self.currentIntegralPayStatus == .integralEnough{
+            self.postOrderVideoByPoint()
+        }else if self.currentIntegralPayStatus == .integralNotEnough{
+            self.hiddenIntegralAlert()
+            //跳转任务中心
+            navigationViewController().pushViewController(CNLiveMineQuestViewController(checkModel: self.checkInModel!), animated: pushAnimated)
+
+        }else if self.currentIntegralPayStatus == .paying{
+            
+        }else if self.currentIntegralPayStatus == .paySuccess{
+            self.hiddenIntegralAlert()
+        }else if self.currentIntegralPayStatus == .payFailed{
+            self.currentIntegralPayStatus = .integralEnough
+            self.initUI()
+        }else{
+            
+        }
+    }
+    // MARK: - 积分付费接口
+    func postOrderVideoByPoint(){
+        self.currentIntegralPayStatus = .paying
+        self.initUI()
+        //付费接口
+        CNLiveHomePageViewModel.orderVideoByPoint(prdId: self.productId) { result, status in
+            if status == .success{
+                //购买成功
+                self.currentIntegralPayStatus = .paySuccess
+                self.initUI()
+                //刷新短剧首页数据
+                self.homePageNeedReloadActionBlock!()
+            }else{
+                //购买失败
+                if self.point > Int(self.integralCount)!{
+                    //可以支付积分
+                    self.currentIntegralPayStatus = .integralEnough
+                }else{
+                    //积分不足
+                    self.currentIntegralPayStatus = .integralNotEnough
+                }
+                self.initUI()
+                let errMsg = result as! String
+                showMessage(message: errMsg)
+            }
+        }
+        
+    }
+
+    
+}
@@ -166,7 +166,6 @@ func hiddenLoading() {
     MBProgressHUD.hide(for: delegate.window!, animated: true)
 }
-
 ///####模型转换#########
 /**
  *  Json转对象
@@ -370,8 +370,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         return true
     }
-    // MARK: - NewPagedFlowView代理
-    
+    // MARK: - NewPagedFlowView代理 水平方向滑动
     func numberOfPages(in flowView: NewPagedFlowView!) -> Int {
         self.dataArray.count
     }
@@ -411,39 +410,37 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         return CGSize(width: MainViewW, height: Height)
     }
-    ///NewPagedFlowView 开始滑动
+    ///NewPagedFlowView 水平方向开始滑动
     func willBeginScroll(_ scrollView: UIScrollView!) {
         beginOffset = scrollView.contentOffset.x
     }
     ///NewPagedFlowView 滑动中
     func didScroll(_ scrollView: UIScrollView!) {
-        
         let currentOffset:CGFloat = scrollView.contentOffset.x
         if(currentOffset > beginOffset){
             if let rightView = self.backgroupView.getRightView(){
-                
                 if let currentApearView = self.backgroupView.currentApearView{
                     self.backgroupView.insertSubview(rightView, belowSubview: currentApearView)
                 }
                 self.backgroupView.currentApearView?.maskLayer.right = KSreenWidth - (currentOffset-beginOffset)*2.5
             }else{
-                
+
             }
         }
         if(currentOffset < beginOffset){
             if let leftView = self.backgroupView.getLeftView(){
-                
+
                 if let currentApearView = self.backgroupView.currentApearView{
                     self.backgroupView.insertSubview(leftView, belowSubview: currentApearView)
                 }
                 self.backgroupView.currentApearView?.maskLayer.left = (beginOffset-currentOffset)*2.5
             }else{
-                
+
             }
         }
     }
-//
-//  CNCertificationView.swift
-//  metaCode
-//
-//  Created by daojian on 2023/6/12.
-//
-
-import Foundation
-
-///身份认证View
-class CNCertificationView : UIView{
-    ///添加身份点击事件回调
-    var addCertificationAction: closeBlock?
-    
-    lazy var contentView: UIView = {
-        let W = self.width-50
-        let H = W*1.5
-        let contentView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
-        contentView.backgroundColor = UIColor.white
-        contentView.clipsToBounds = true
-        contentView.layer.cornerRadius = 20
-        
-        return contentView
-        
-    }()
-    
-//    ///添加身份认证按钮
-//    lazy var addCerBtn: UIButton = {
-//        let addCerBtn = UIButton(type: .custom)
-//        addCerBtn.frame = CGRect(x: 0, y: 0, width: 145, height: 141)
-//        addCerBtn.centerX = self.contentView.width/2
-//        addCerBtn.centerY = self.contentView.height/2
-//        addCerBtn.setImage(UIImage(named: "homePage_addCertification_icon"), for: .normal)
-//        addCerBtn.addTarget(self, action: #selector(addCerBtnAction), for: .touchUpInside)
-//        return addCerBtn
-//    }()
-//
-//    ///添加身份按钮底部标题
-//    lazy var addCerBtnBottomTitle: UILabel = {
-//        let addCerBtnBottomTitle = UILabel(frame: CGRect(x: 0, y: self.addCerBtn.bottom - 10, width: 100, height: 22))
-//        addCerBtnBottomTitle.centerX = self.addCerBtn.centerX
-//        addCerBtnBottomTitle.textColor = UIColor("#0066FE")
-//        addCerBtnBottomTitle.textAlignment = .center
-//        addCerBtnBottomTitle.font = UIFont.systemFont(ofSize: 15, weight: .regular)
-//        addCerBtnBottomTitle.text = "身份认证"
-//        return addCerBtnBottomTitle
-//
-//    }()
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        self.initUI()
-        
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    func initUI()
-    {
-        self.addSubview(self.contentView)
-//        self.contentView.addSubview(self.addCerBtn)
-//        self.contentView.addSubview(self.addCerBtnBottomTitle)
-//    }
-    
-//    @objc func addCerBtnAction(){
-//
-//        if(self.addCertificationAction != nil){
-//            self.addCertificationAction!()
-//        }
-//
-    }
-}
@@ -50,7 +50,7 @@ class CNLiveShopGoodsListCell: UITableViewCell {
         titleLabel.textAlignment = .left
         titleLabel.font = Font_15
         titleLabel.adjustsFontSizeToFitWidth=true
-        titleLabel.text = "啊啊啊啊啊"
+        titleLabel.text = "标题"
         return titleLabel
     }()
     ///副标题
@@ -60,7 +60,7 @@ class CNLiveShopGoodsListCell: UITableViewCell {
         subTitleLabel.textAlignment = .left
         subTitleLabel.font = Font_13
         subTitleLabel.adjustsFontSizeToFitWidth=true
-        subTitleLabel.text = "啊啊啊啊"
+        subTitleLabel.text = "副标题"
         return subTitleLabel
     }()
     ///价格
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/30.
-//
+//  电商控制台cell
 import Foundation
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/3.
-//
+//  电商上滑详情页(下面的页) banner下的按钮cell
 import Foundation
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/4.
-//  我的订单,我的资产
+//  电商上滑详情页(下面的页) banner下的 我的订单,我的资产cell
 import Foundation
 enum CNLiveShopDetailDisplayType {
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/1.
-//
+//  电商上滑详情页(下面的页) bannercell
 import Foundation
 import FSPagerView
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by daojian on 2023/5/31.
-//
+//  认证-上下滑的容器View
 import Foundation
+////
+////  CNCertificationView.swift
+////  metaCode
+////
+////  Created by daojian on 2023/6/12.
+////  旧卡片(废弃)
+//
+//import Foundation
+//
+/////身份认证View
+//class CNCertificationView : UIView{
+//    ///添加身份点击事件回调
+//    var addCertificationAction: closeBlock?
+//    
+//    lazy var contentView: UIView = {
+//        let W = self.width-50
+//        let H = W*1.5
+//        let contentView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
+//        contentView.backgroundColor = UIColor.white
+//        contentView.clipsToBounds = true
+//        contentView.layer.cornerRadius = 20
+//        
+//        return contentView
+//        
+//    }()
+//    
+////    ///添加身份认证按钮
+////    lazy var addCerBtn: UIButton = {
+////        let addCerBtn = UIButton(type: .custom)
+////        addCerBtn.frame = CGRect(x: 0, y: 0, width: 145, height: 141)
+////        addCerBtn.centerX = self.contentView.width/2
+////        addCerBtn.centerY = self.contentView.height/2
+////        addCerBtn.setImage(UIImage(named: "homePage_addCertification_icon"), for: .normal)
+////        addCerBtn.addTarget(self, action: #selector(addCerBtnAction), for: .touchUpInside)
+////        return addCerBtn
+////    }()
+////
+////    ///添加身份按钮底部标题
+////    lazy var addCerBtnBottomTitle: UILabel = {
+////        let addCerBtnBottomTitle = UILabel(frame: CGRect(x: 0, y: self.addCerBtn.bottom - 10, width: 100, height: 22))
+////        addCerBtnBottomTitle.centerX = self.addCerBtn.centerX
+////        addCerBtnBottomTitle.textColor = UIColor("#0066FE")
+////        addCerBtnBottomTitle.textAlignment = .center
+////        addCerBtnBottomTitle.font = UIFont.systemFont(ofSize: 15, weight: .regular)
+////        addCerBtnBottomTitle.text = "身份认证"
+////        return addCerBtnBottomTitle
+////
+////    }()
+//    
+//    override init(frame: CGRect) {
+//        super.init(frame: frame)
+//        self.initUI()
+//        
+//    }
+//    
+//    required init?(coder: NSCoder) {
+//        fatalError("init(coder:) has not been implemented")
+//    }
+//    
+//    func initUI()
+//    {
+//        self.addSubview(self.contentView)
+////        self.contentView.addSubview(self.addCerBtn)
+////        self.contentView.addSubview(self.addCerBtnBottomTitle)
+////    }
+//    
+////    @objc func addCerBtnAction(){
+////
+////        if(self.addCertificationAction != nil){
+////            self.addCertificationAction!()
+////        }
+////
+//    }
+//}
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by daojian on 2023/6/6.
-//
+//  认证-添加身份背景视图
 import Foundation
 import UIKit
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/9/16.
-//
+//  身份认证卡片
 import Foundation
@@ -28,7 +28,8 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     var totolNum = 0//一共显示多少行cell
     var selectedCell: CNDownSlideSingleCourseCell?
-    
+    var selectedDuanjuCell: CNLiveHomePageDuanJuCell?
+
     var statusBarShouldBeHidden = false
     //we need to set `View controller-based status bar appearance = YES` in info.plist.
     //so we can be able to hide statusBar.
@@ -40,16 +41,6 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         return .slide
     }
-    var _downPath:String?
-    var downPath:String? {
-        get{
-            return _downPath
-        }
-        set{
-            _downPath = newValue!
-        }
-    }
-    
     // MARK: - 懒加载
     ///数据源
     lazy var dataArray: NSMutableArray = {
@@ -57,9 +48,16 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         return dataArray
     }()
+    //短剧的数据源
+    lazy var duanjuDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.updateStatusBarAndTabbarFrame(visible: true)
+        self.getMyAlbumCollection(page: 1)
     }
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -115,6 +113,20 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             else {
                 return CNLiveHomePageDuanJuCell()
             }
+            cell.setModelArr(modelArr: self.duanjuDataArray)
+            cell.DuanJUCellSelectedCallBack = {
+                duanJuCell in
+                self.selectedDuanjuCell = duanJuCell
+
+                let detailVC = CNHomePageBaseNavigationController(rootViewController:CNHomepageDuanJuDetailViewController(cell: duanJuCell))
+                
+                detailVC.dismissClosure = { [weak self] in
+                    guard let StrongSelf = self else { return }
+                    StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+                }
+                self.updateStatusBarAndTabbarFrame(visible: false)
+                self.present(detailVC, animated: true, completion: nil)
+            }
             return cell
         }else{
             let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
@@ -189,6 +201,18 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if self.isHaveDuanJU && indexPath.section == 0{
+            //点击在追短剧
+            guard let cell = tableView.cellForRow(at: indexPath) as? CNLiveHomePageDuanJuCell else { return }
+            selectedDuanjuCell = cell
+            
+            let detailVC = CNHomePageBaseNavigationController(rootViewController:CNHomepageDuanJuDetailViewController(cell: selectedDuanjuCell!))
+            
+            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{
@@ -201,7 +225,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             }else 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))
+                let detailVC = CNHomePageBaseNavigationController(rootViewController: CNHomepageDetailViewController(cell: cell,slideModel: slideModel))
                 detailVC.dismissClosure = { [weak self] in
                     guard let StrongSelf = self else { return }
                     StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
@@ -227,7 +251,8 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if self.isHaveDuanJU && indexPath.section == 0{
-            return 300
+            //标题55+n个cell*(45+15*2)+首尾15
+            return CGFloat(self.duanjuDataArray.count)*(45+15*2)+CGFloat(55)+15+15
         }else{
             let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
             return CGFloat(slideModel.cellH)
@@ -250,23 +275,33 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                 for listModel in homePageListMdls {
                     if listModel.type == 3{
                         //在追短剧
-                        self.isHaveDuanJU = true
+                        self.getMyAlbumCollection(page: 1)
                     }else if listModel.type == 1{
                         //页面
                         self.getPageApi(pageID: listModel.content)
                     }
                 }
             }else{
-                
+                self.getHomePageConfigListApi()
             }
         }
     }
     //我的专辑收藏--在追短剧
-    func getMyAlbumCollection(){
-        CNLiveHomePageViewModel.requestGetHomePage { result, status in
+    func getMyAlbumCollection(page:NSInteger){
+        CNLiveHomePageViewModel.requestGetHomePageMyAlbum(page: page){ result, status in
             if status == .success{
-                
+                let arr = result as! Array<CNLiveAlbumMsgModel>
+                if arr.count>0{
+                    //显示在追短剧cell
+                    self.isHaveDuanJU = true
+                    self.duanjuDataArray = NSMutableArray(array: arr)
+                }else{
+                    //隐藏在追短剧cell
+                    self.isHaveDuanJU = false
+                }
+                self.tableView.reloadData()
+
             }else{
             }
@@ -39,26 +39,47 @@ extension CNHomePageAnimationTransition: UIViewControllerAnimatedTransitioning {
         let fromNavi = fromVCtemp.viewControllers![0] as! CNLiveBaseNavigationController
         let fromVC = fromNavi.viewControllers.first as! CNLiveAuthViewController
         guard let toNaviVC = transitionContext.viewController(forKey: .to) as? CNHomePageBaseNavigationController else { return }
-        guard let selectedCell = fromVC.selectedCell else { return }
-        let toVC = toNaviVC.topViewController as! CNHomepageDetailViewController
-        let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: fromVC.view)
-        //2.Set presentation original size.
-        toVC.view.frame = frame
-        toVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
-        toVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
-        
-        containerView.addSubview(toNaviVC.view)
-        
-        //3.Change original size to final size with animation.
-        UIView.animate(withDuration: transitonDuration, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
-            toVC.view.frame = UIScreen.main.bounds
-            toVC.scrollView.imageView.frame.size.width = KSreenWidth
-            toVC.scrollView.imageView.frame.size.height = KSreenWidth*DownSlideSingleCourseImgH/DownSlideSingleCourseW
-            toVC.closeBtn.alpha = 1
+        if  toNaviVC.topViewController is CNHomepageDetailViewController{
+            guard let selectedCell = fromVC.selectedCell else { return }
+            let toVC = toNaviVC.topViewController as! CNHomepageDetailViewController
+            let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: fromVC.view)
+            //2.Set presentation original size.
+            toVC.view.frame = frame
+            toVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+            toVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+            
+            containerView.addSubview(toNaviVC.view)
+            
+            //3.Change original size to final size with animation.
+            UIView.animate(withDuration: transitonDuration, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
+                toVC.view.frame = UIScreen.main.bounds
+                toVC.scrollView.imageView.frame.size.width = KSreenWidth
+                toVC.scrollView.imageView.frame.size.height = KSreenWidth*DownSlideSingleCourseImgH/DownSlideSingleCourseW
+                toVC.closeBtn.alpha = 1
+                
+            }) { (completed) in
+                transitionContext.completeTransition(completed)
+            }
+        }else if toNaviVC.topViewController is CNHomepageDuanJuDetailViewController{
+            guard let selectedCell = fromVC.selectedDuanjuCell else { return }
+            let toVC = toNaviVC.topViewController as! CNHomepageDuanJuDetailViewController
+            let frame = selectedCell.convert(selectedCell.totalView.frame, to: fromVC.view)
+            //2.Set presentation original size.
+            toVC.view.frame = frame            
+            containerView.addSubview(toNaviVC.view)
-        }) { (completed) in
-            transitionContext.completeTransition(completed)
+            //3.Change original size to final size with animation.
+            UIView.animate(withDuration: transitonDuration, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
+                toVC.view.frame = UIScreen.main.bounds
+                toVC.closeBtn.alpha = 1
+                
+            }) { (completed) in
+                transitionContext.completeTransition(completed)
+            }
+        }else{
+            return
         }
+        
     }
     func animationForDismiss(using transitionContext: UIViewControllerContextTransitioning) {
@@ -66,19 +87,36 @@ extension CNHomePageAnimationTransition: UIViewControllerAnimatedTransitioning {
         guard let toVCTabbar = transitionContext.viewController(forKey: .to) as? CNLiveBaseTabBarViewController else { return }
         let toVCNav = toVCTabbar.viewControllers?.first as! CNLiveBaseNavigationController
         let toVC = toVCNav.viewControllers.first as! CNLiveAuthViewController
-        guard let selectedCell = toVC.selectedCell else { return }
-        let fromVC = fromNaviVC.topViewController as! CNHomepageDetailViewController
-        
-        UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
-            let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
-            fromVC.view.frame = frame
-            fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
-            fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
-            fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
-            fromVC.closeBtn.alpha = 0
+        if fromNaviVC.topViewController is CNHomepageDetailViewController{
+            guard let selectedCell = toVC.selectedCell else { return }
+            let fromVC = fromNaviVC.topViewController as! CNHomepageDetailViewController
-        }) { (completed) in
-            transitionContext.completeTransition(completed)
+            UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+                let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
+                fromVC.view.frame = frame
+                fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+                fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+                fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+                fromVC.closeBtn.alpha = 0
+                
+            }) { (completed) in
+                transitionContext.completeTransition(completed)
+            }
+        }else if fromNaviVC.topViewController is CNHomepageDuanJuDetailViewController{
+            guard let selectedCell = toVC.selectedDuanjuCell else { return }
+            let fromVC = fromNaviVC.topViewController as! CNHomepageDuanJuDetailViewController
+            UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+                let frame = selectedCell.convert(selectedCell.totalView.frame, to: toVC.view)
+                fromVC.view.frame = frame
+                fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+                fromVC.closeBtn.alpha = 0
+                
+            }) { (completed) in
+                transitionContext.completeTransition(completed)
+            }
+
+        }else{
+            return
         }
     }
@@ -6,12 +6,16 @@
 //  首页短剧--大图点击详情页
 import Foundation
+import MJRefresh
+import EmptyDataSet_Swift
-class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewDataSource, UITableViewDelegate{
+class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewDataSource, UITableViewDelegate,EmptyDataSetSource, EmptyDataSetDelegate{
     let kCNLiveAlbumImageCellIdentifier = "kCNLiveAlbumImageCellIdentifier"
     let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
+    var pageNum: NSInteger
+    var network_type: CNLiveMineResponseType!
     // MARK: - 懒加载
     ///数据源
     lazy var dataArray: NSMutableArray = {
@@ -22,6 +26,8 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.dataSource = self
         tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.separatorStyle = .none
         tableView.tableFooterView = UIView.init()
         tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
@@ -75,11 +81,13 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     }()
     init(cell: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel) {
+        self.pageNum = 1
         self.cell = cell
         super.init(nibName: nil, bundle: nil)
         self.slideModel = slideModel
         self.setupTranstion()
         setNeedsStatusBarAppearanceUpdate()
+        
     }
     private func setupTranstion() {
@@ -95,7 +103,7 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
         super.viewDidLoad()
         setupUI()
         getImageFromCell()
-        self.getBlockContents()
+        self.getBlockContents(page: 1)
     }
     private func setupUI() {
@@ -137,7 +145,6 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        let goodsModel = self.dataArray[indexPath.row] as! CNLiveShopGoodsListModel
         if indexPath.section == 0{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
             else {
@@ -167,17 +174,52 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
     }
     // MARK: - 获取全部专辑列表
-    func getBlockContents(){
-        CNLiveHomePageViewModel.getBlockContents(blockId: self.slideModel!.blockId ?? "") { result, status in
+    func getBlockContents(page:NSInteger){
+        showLoading(message: "")
+        CNLiveHomePageViewModel.getBlockContents(blockId: self.slideModel!.blockId ?? "", page: page) {[weak self] result, status in
+            hiddenLoading()
             if status == .success{
-                let albumArr = result as! Array<CNLiveAlbumModel>
-                self.dataArray = NSMutableArray(array: albumArr)
-                self.tableView.reloadData()
-            }else{
+                if self!.pageNum > 1 {
+                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumModel])
+                }
+                if self!.pageNum == 1 {
+                    self!.dataArray.removeAllObjects()
+                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumModel])
+                    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!.tableView.mj_header?.endRefreshing()
+                self!.tableView.mj_footer?.endRefreshing()
+                self!.tableView.reloadData()
+                if (result as! Array<Any>).count == 0 {
+                    self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    self!.tableView.reloadData()
+                }
+
+            }else if (status == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
             }
         }
     }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.pageNum = 1
+            self!.getBlockContents(page: 1)
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self!.getBlockContents(page: self!.pageNum)
+        })
+    }
     @objc private func handleDismissPan(gesture: UIPanGestureRecognizer) {
         if !draggingDownToDismiss {
@@ -271,3 +313,48 @@ extension CNHomepageDetailViewController: UIGestureRecognizerDelegate {
         return true
     }
 }
+
+extension CNHomepageDetailViewController {
+    
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        if network_type == .failed  || network_type == .unkonw {
+            return UIImage(named: "mine_list_source_unusual_failed")
+        }
+        if dataArray.count == 0 {
+            return UIImage(named: "mine_list_source_unusual_empty")
+        }
+        if network_type == .noNetwork {
+            return UIImage(named: "mine_list_source_unusual_noNet")
+        }
+        return UIImage(named: "mine_list_source_unusual_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
+        if dataArray.count == 0 {
+            defult_string = "暂时没有数据～"
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
+        if network_type == .failed || network_type == .noNetwork {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷一刷", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
+        if network_type == .failed || network_type == .noNetwork  {
+            getBlockContents(page: 1)
+        }
+    }
+}
+//
+//  CNHomepageDuanJuDetailViewController.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/5.
+//  首页短剧--在追短剧点击详情页
+
+import Foundation
+import MJRefresh
+import EmptyDataSet_Swift
+
+class CNHomepageDuanJuDetailViewController: CNLiveBaseViewController  ,UITableViewDataSource, UITableViewDelegate,EmptyDataSetSource, EmptyDataSetDelegate{
+    
+    let kCNLiveDuanjuTitleCellIdentifier = "kCNLiveDuanjuTitleCellIdentifier"
+    let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
+
+    var pageNum: NSInteger
+    var network_type: CNLiveMineResponseType!
+    // MARK: - 懒加载
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
+        tableView.register(CNLiveDuanjuTitleCell.self, forCellReuseIdentifier: kCNLiveDuanjuTitleCellIdentifier)
+        return tableView
+    }()
+    
+    var dismissClosure: (()->())?
+    //the point when start to interactive
+    var interactiveStartingPoint: CGPoint? = nil
+
+    var draggingDownToDismiss = false
+    
+    let cell: CNLiveHomePageDuanJuCell!
+    
+    private lazy var dismissPanGesture: UIPanGestureRecognizer = {
+        let ges = UIPanGestureRecognizer()
+        ges.maximumNumberOfTouches = 1
+        ges.addTarget(self, action: #selector(handleDismissPan(gesture:)))
+        ges.delegate = self
+        return ges
+    }()
+        
+    lazy var closeBtn: UIButton = {
+        let btn = UIButton()
+        btn.frame = CGRect(x: KSreenWidth - 20 - 30, y: KStatusBarHeight+20, width: 30, height: 30)
+        btn.setImage(#imageLiteral(resourceName: "close_button"), for: .normal)
+        btn.addTarget(self, action: #selector(closeAction), for: .touchUpInside)
+        return btn
+    }()
+    
+    init(cell:CNLiveHomePageDuanJuCell) {
+        self.pageNum = 1
+        self.cell = cell
+        super.init(nibName: nil, bundle: nil)
+        self.setupTranstion()
+        setNeedsStatusBarAppearanceUpdate()
+        
+    }
+    
+    private func setupTranstion() {
+        modalPresentationStyle = .custom
+        transitioningDelegate = self
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+        self.getMyAlbum(page: 1)
+        self.view.backgroundColor = .white
+    }
+    
+    private func setupUI() {
+        self.view.layer.masksToBounds = true
+        self.view.addSubview(self.tableView)
+        self.tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-KStatusBarHeight)
+        view.addSubview(closeBtn)
+        view.addGestureRecognizer(dismissPanGesture)
+        
+        if #available(iOS 11.0, *) {
+        } else {
+            automaticallyAdjustsScrollViewInsets = false
+        }
+    }
+    
+    @objc private func closeAction() {
+        dismiss(animated: true, completion: nil)
+        let nav = self.navigationController as! CNHomePageBaseNavigationController
+        nav.dismissClosure?()
+    }
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        2
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0{
+            return 1
+        }else{
+            return self.dataArray.count
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDuanjuTitleCellIdentifier) as? CNLiveDuanjuTitleCell
+            else {
+                let cell = CNLiveDuanjuTitleCell()
+                return cell
+            }
+            return cell
+        }else{
+            let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumMsgModel
+
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
+            else {
+                let cell = CNLiveAlbumCell()
+                return cell
+            }
+            cell.albumMsgModel = albumModel
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0{
+            return 45//10+30+5
+        }else{
+            return 75
+        }
+    }
+    
+    // MARK: - 获取我的在追短剧列表
+    func getMyAlbum(page:NSInteger){
+        CNLiveHomePageViewModel.requestGetHomePageMyAlbum(page: page){[weak self] result, status in
+            if status == .success{
+                if self!.pageNum > 1 {
+                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumMsgModel])
+                }
+                if self!.pageNum == 1 {
+                    self!.dataArray.removeAllObjects()
+                    self!.dataArray.addObjects(from: result as! [CNLiveAlbumMsgModel])
+                    if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
+                        self!.addRefreshView()
+                        self!.pageNum = self!.pageNum + 1
+                        self!.getMyAlbum(page: self!.pageNum)
+
+                    }
+                }
+                
+                self!.tableView.mj_header?.endRefreshing()
+                self!.tableView.mj_footer?.endRefreshing()
+                self!.tableView.reloadData()
+                if (result as! Array<Any>).count == 0 {
+                    self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    self!.tableView.reloadData()
+                }
+
+            }else if (status == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
+    }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.pageNum = 1
+            self!.getMyAlbum(page: 1)
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self!.getMyAlbum(page: self!.pageNum)
+        })
+    }
+    
+    @objc private func handleDismissPan(gesture: UIPanGestureRecognizer) {
+        if !draggingDownToDismiss {
+            return
+        }
+        
+        let startingPoint: CGPoint
+        
+        if let p = interactiveStartingPoint {
+            startingPoint = p
+        } else {
+            startingPoint = gesture.location(in: nil)
+            interactiveStartingPoint = startingPoint
+        }
+
+        let currentLocation = gesture.location(in: nil)
+        
+        var progress = (currentLocation.y - startingPoint.y) / 100
+        
+        //prevent viewController bigger when scrolling up
+        if currentLocation.y <= startingPoint.y {
+            progress = 0
+        }
+        
+        if progress >= 1.0 {
+            dismiss(animated: true, completion: nil)
+            let nav = self.navigationController as! CNHomePageBaseNavigationController
+            nav.dismissClosure?()
+//            dismissClosure?()
+            stopDismissPanGesture(gesture)
+            return
+        }
+
+        let targetShrinkScale: CGFloat = 0.86
+        let currentScale: CGFloat = 1 - (1 - targetShrinkScale) * progress
+        
+        switch gesture.state {
+        case .began,.changed:
+            gesture.view?.transform = CGAffineTransform(scaleX: currentScale, y: currentScale)
+            gesture.view?.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius * (progress)
+        case .cancelled,.ended:
+            stopDismissPanGesture(gesture)
+        default:
+            break
+        }
+    }
+    
+    //当下拉Offset超过100或取消下拉手势时，执行此方法
+    private func stopDismissPanGesture(_ gesture: UIPanGestureRecognizer) {
+        draggingDownToDismiss = false
+        interactiveStartingPoint = nil        
+        UIView.animate(withDuration: 0.2) {
+            gesture.view?.transform = CGAffineTransform.identity
+        }
+    }
+
+}
+
+extension CNHomepageDuanJuDetailViewController: UIViewControllerTransitioningDelegate {
+    
+    func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNHomePageAnimationTransition(animationType: .present)
+    }
+    
+    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNHomePageAnimationTransition(animationType: .dismiss)
+    }
+    
+    func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
+        return CNUpSlideCardPresentationController(presentedViewController: presented, presenting: presenting)
+    }
+}
+
+extension CNHomepageDuanJuDetailViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        
+        if scrollView.contentOffset.y < 0 {
+            scrollView.contentOffset = .zero
+            draggingDownToDismiss = true
+        }
+    }
+}
+
+extension CNHomepageDuanJuDetailViewController: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+}
+
+extension CNHomepageDuanJuDetailViewController {
+    
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        if network_type == .failed  || network_type == .unkonw {
+            return UIImage(named: "mine_list_source_unusual_failed")
+        }
+        if dataArray.count == 0 {
+            return UIImage(named: "mine_list_source_unusual_empty")
+        }
+        if network_type == .noNetwork {
+            return UIImage(named: "mine_list_source_unusual_noNet")
+        }
+        return UIImage(named: "mine_list_source_unusual_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        var defult_string = ""
+        if network_type == .failed  || network_type == .unkonw {
+            defult_string = "接口请求错误,刷新试试～"
+        }
+        if network_type == .noNetwork {
+            defult_string = "网络开小差了,刷新试试～"
+        }
+        if dataArray.count == 0 {
+            defult_string = "暂时没有数据～"
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+    func buttonTitle(forEmptyDataSet scrollView: UIScrollView, for state: UIControl.State) -> NSAttributedString? {
+        if network_type == .failed || network_type == .noNetwork {
+            let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                              NSAttributedString.Key.foregroundColor: HexColor("#609BFF")]
+            return NSAttributedString(string: "刷一刷", attributes: attributes as [NSAttributedString.Key : Any])
+        }
+        return nil
+    }
+    
+    func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
+        if network_type == .failed || network_type == .noNetwork  {
+            getMyAlbum(page: 1)
+        }
+    }
+}
@@ -9,15 +9,15 @@ import Foundation
 class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+    var jianjieLblHeight:CGFloat = 36
+    
     let kCNLivePlayletCellIdentifier = "kCNLivePlayletCellIdentifier"
     let kCNLivePlayletHeaderCellIdentifier = "kCNLivePlayletHeaderCellIdentifier"
-
-    // MARK: - 懒加载
     ///数据源
-    lazy var dataArray: NSMutableArray = {
-        var dataArray = NSMutableArray()
-        return dataArray
-    }()
+    var albumModelArr:Array<CNLiveAlbumListModel> = [CNLiveAlbumListModel]()
+    var albumId = ""
+    // MARK: - 懒加载
+    
     lazy var tableView : UITableView = {
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.dataSource = self
@@ -29,6 +29,20 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
         return tableView
     }()
+    init(aid:String){
+        super.init(nibName: nil, bundle: nil)
+        self.albumId = aid
+        self.getAlbumList(aid: aid)// self.albumModel!.contentId 或 self.albumMsgModel!.albumId
+    }
+    init(albumModelArr:Array<CNLiveAlbumListModel>) {
+        self.albumModelArr = Array(albumModelArr)
+        super.init(nibName: nil, bundle: nil)
+        self.tableView.reloadData()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
         self.setUI()
@@ -38,6 +52,39 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
         self.view.addSubview(self.tableView)
         self.tableView.frame = CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight)
     }
+    
+    // MARK: - 获取短剧主页数据
+    //获取专辑视频列表详情(播放地址 ,点赞数等信息)
+    func getAlbumList(aid:String){
+        showLoading(message: "")
+        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
+            hiddenLoading()
+            if status == .success{
+                let arr = result as! Array<CNLiveAlbumListModel>
+                self.albumModelArr = Array(arr)
+                self.getAlbumMsg(aid: aid)
+            }else{
+                
+            }
+        }
+    }
+    //获取专辑详情(简介等)
+    func getAlbumMsg(aid:String){
+        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
+            hiddenLoading()
+            if status == .success{
+                let model = result as! CNLiveAlbumMsgModel
+                for listModel in self.albumModelArr {
+                    listModel.albumMsgModel = model
+                }
+                self.tableView.reloadData()
+            }else{
+                
+            }
+        }
+    }
+    
+    
     func numberOfSections(in tableView: UITableView) -> Int {
         2
     }
@@ -45,19 +92,28 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
         if section == 0{
             return 1
         }
-        return 30 //self.dataArray.count
+        return self.albumModelArr.count
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        let goodsModel = self.dataArray[indexPath.row] as! CNLiveShopGoodsListModel
         if indexPath.section == 0{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLivePlayletHeaderCellIdentifier) as? CNLivePlayletHomePageHeaderCell
             else {
                 let cell = CNLivePlayletHomePageHeaderCell()
                 return cell
             }
-
+            cell.homePageHeaderCellChangedBlock = { headerCell,jianjieHeight in
+                self.jianjieLblHeight = jianjieHeight
+                self.tableView.reloadData()
+            }
+            cell.homePageNeedReloadActionBlock = {
+                self.getAlbumList(aid: self.albumId)
+            }
+            if self.albumModelArr.count > 0{
+                let albumListModel = self.albumModelArr[0]
+                cell.albumListModel = albumListModel
+            }
             return cell
         }else{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLivePlayletCellIdentifier) as? CNLivePlayletHomePageCell
@@ -65,15 +121,24 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
                 let cell = CNLivePlayletHomePageCell()
                 return cell
             }
-            cell.iconImgView.backgroundColor = .red
+            let albumListModel = self.albumModelArr[indexPath.row] 
+            cell.albumListModel = albumListModel
             return cell
         }
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0{
-            return 300
+            return 15+147+20+self.jianjieLblHeight+25+39+23.5+15.5
+        }else{
+            return 75+12*2
+        }
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if indexPath.section == 0{
         }else{
-            return 100
+            let albumListModel = self.albumModelArr[indexPath.row]
+            let aid = albumListModel.albumMsgModel?.albumId ?? ""
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
         }
     }
 }
@@ -26,13 +26,13 @@ class CNLiveAlbumProductModel:BaseModel{
     var productId = ""
     var productTitle = ""
     var productImg = ""
-    var albumProductType = ""
-    var productType = ""
+    var albumProductType = ""//专辑类型
+    var productType = ""//类型 0免费 1积分 2付费  3 4试听
     var androidRmb = ""
     var androidOriginalRmb = ""
     var iosOriginalRmb = ""
     var iosRmb = ""
-    var point = ""
+    var point = ""//积分
     var promCode = ""
     var orderingGuide = ""
     var activityDesc = ""
@@ -40,7 +40,7 @@ class CNLiveAlbumProductModel:BaseModel{
     var validPeriod = ""
     var expiryDate = ""
     var effectiveDate = ""
-    var check = false
+    var check = false////false需要付费 true免费或者付过费
 }
@@ -10,7 +10,7 @@ import Foundation
 class CNLiveAlbumMsgModel:BaseModel{
     var albumId = ""
     var albumImg = ""
-    var albumName = ""
+    var albumName = ""//专辑名称
     var product:CNLiveAlbumProductModel?
     var desc = ""
     var descImg = ""
@@ -6,64 +6,83 @@
 //  首页-在追短剧cell
 import Foundation
-//enum GlobalConstants {
-//    static let leftMargin: CGFloat = 20
-//    
-//    static let toDayCardRowH: CGFloat = 440
-//    static let toDayCardCornerRadius: CGFloat = 12.0
-//    static let todayCardSize: CGSize = CGSize(width: KSreenWidth - 2 * 15, height: DownSlideSingleCourseImgH)
-//    static let cardDetailTopImageH: CGFloat = 500
-//    
-//    static let iconBorderColor: CGColor = UIColor(red: 239/255.0, green: 240/255.0, blue: 241/255.0, alpha: 1).cgColor
-//    static let iconBorderWidth: CGFloat = 0.8
-//    static let iconCornerRadius: CGFloat = 17.5
-//    
-//    static let textBlueColor = UIColor(red: 0/255.0, green: 122/255.0, blue: 255/255.0, alpha: 1.0)   //007AFF
-//    static let speratorLineColor = UIColor(red: 224/255.0, green: 224/255.0, blue: 224/255.0, alpha: 1)
-//
-//}
-//
-/////全部课程 标题高度
-//let DownSlideAllCourseTitleH: CGFloat = 55
-////全部课程 每row_topY间距
-//let DownSlideAllCourseRowTopYGap: CGFloat = 10
-////全部课程 每row_topY间距
-//let DownSlideAllCourseRowBottomYGap: CGFloat = 20
-////全部课程 每row_img宽高
-//let DownSlideAllCourseRowImageWH: CGFloat = 45
-//
-/////全部课程 每row高度
-//let DownSlideAllCourseRowH: CGFloat = DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowBottomYGap + DownSlideAllCourseRowImageWH
-/////全部课程 宽度
-//let DownSlideAllCourseW: CGFloat = KSreenWidth - DownSlideRecommendLeftGap*2
-//
-/////单节课程 大图高度
-//let DownSlideSingleCourseImgH: CGFloat = 345
-/////单节课程 更多课程高度
-//let DownSlideSingleCourseMoreH: CGFloat = 60
-/////单节课程 宽度
-//let DownSlideSingleCourseW: CGFloat = KSreenWidth - DownSlideRecommendLeftGap*2
+import QMUIKit
+
+typealias DuanJUCellSelectedCallBackBlock = (_ cell: CNLiveHomePageDuanJuCell) -> Void
+
+class CNLiveHomePageDuanJuCell:UITableViewCell,UITableViewDelegate,UITableViewDataSource{
+    let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
+//    let bgBackView = UIView()
-class CNLiveHomePageDuanJuCell:UITableViewCell{
+    var DuanJUCellSelectedCallBack:DuanJUCellSelectedCallBackBlock?
+    lazy var modelArr: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    func setModelArr(modelArr:NSMutableArray){
+        self.modelArr = NSMutableArray(array: modelArr)
-    let bgBackView = UIView()
-    let bgImageView = UIImageView()
+        self.tableView.height = CGFloat(self.modelArr.count)*(45+15*2)
+        self.totalView.height = CGFloat(self.modelArr.count)*(45+15*2) + 55
+        self.tableView.reloadData()
+        
+//        //定义view的阴影颜色
+//        self.totalView.layer.shadowColor = UIColor.black.cgColor
+//        //阴影偏移量
+//        self.totalView.layer.shadowOffset=CGSize(width:1, height:1)
+//        //定义view的阴影宽度，模糊计算的半径
+//        self.totalView.layer.shadowRadius = 12
+//        //定义view的阴影透明度，注意:如果view没有设置背景色阴影也是不会显示的
+//        self.totalView.layer.shadowOpacity = 0.4
-    //slideModel
-    var _slideModel : CNLiveDownSlideModel?
-    var slideModel : CNLiveDownSlideModel? {
-        get{
-            _slideModel
-        }
-        set{
-            _slideModel = newValue!
-            self.setupNewUI(model: _slideModel!)
-        }
     }
+    //MARK: - 懒加载
+    ///区块标题
+    lazy var blockTitleLabl: UILabel = {
+        let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap+5, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+        titleLbl.text = "在追短剧"
+        titleLbl.font = BoldFont_21
+        titleLbl.textColor = HexColor("#333333")
+        return titleLbl
+    }()
+    lazy var totalView : UIView = {
+        let totalView = UIView(frame: CGRect(x: 15, y: 15, width: KSreenWidth-30, height: 100))
+        return totalView
+    }()
+
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: self.blockTitleLabl.bottom+5, width: KSreenWidth-30, height: 50), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.backgroundColor = .clear
+        tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
+        return tableView
+    }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
+
+        self.contentView.addSubview(self.totalView)
+        
+        self.totalView.addSubview(self.blockTitleLabl)
+        self.totalView.addSubview(self.tableView)
+        self.tableView.backgroundColor = .white
+        self.totalView.layer.cornerRadius = 12
+        self.totalView.clipsToBounds = true
+        self.totalView.backgroundColor = .white
+        
+        //定义view的阴影颜色
+        self.totalView.layer.shadowColor = UIColor.black.cgColor
+        //阴影偏移量
+        self.totalView.layer.shadowOffset=CGSize(width:1, height:1)
+        //定义view的阴影宽度，模糊计算的半径
+        self.totalView.layer.shadowRadius = 12
+        //定义view的阴影透明度，注意:如果view没有设置背景色阴影也是不会显示的
+        self.totalView.layer.shadowOpacity = 0.4
+        
         setupUI()
     }
@@ -72,123 +91,33 @@ class CNLiveHomePageDuanJuCell:UITableViewCell{
     }
     private func setupUI() {
-        contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+        contentView.backgroundColor =  HexColor(kCNDownSlideBackgroundColorHex)
     }
-    func setupNewUI(model:CNLiveDownSlideModel){
-        if model.type == SlideModelTypeAllCourse12 {
-            //全部课程列表
-            contentView.addSubview(bgBackView)
-
-            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:model.cellH-DownSlideRecommendLeftGap)
-            bgBackView.layer.shadowColor = HexColor("#000000")?.cgColor
-            bgBackView.layer.shadowRadius = 12
-            bgBackView.layer.shadowOpacity = 1
-            bgBackView.layer.shadowOffset = CGSize(width: 0, height: 0)
-            bgBackView.layer.cornerRadius = 12
-            bgBackView.clipsToBounds = true
-            bgBackView.backgroundColor = HexColor("#FFFFFF")
-            
-            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, 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) ? row : contentsNum
-            if row == 0{//row为0 , contents全部显示
-                totalNum = contentsNum
-            }
-            for i in 0..<totalNum{//i是第几行
-                let contentMdl = model.contents[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!))
-                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 ?? "适应3-6岁"
-                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)
-            }
-        }else if model.type == SlideModelTypeOneCourse75 {
-            //单图课程
-            contentView.addSubview(bgBackView)
-            bgBackView.addSubview(bgImageView)
-            
-            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:DownSlideSingleCourseMoreH+DownSlideSingleCourseImgH)
-            bgBackView.layer.shadowColor = UIColor.black.cgColor
-            bgBackView.layer.shadowOpacity = 0.4
-            bgBackView.layer.shadowOffset = CGSize(width: 0, height: 1)
-            
-            bgImageView.frame = CGRect(x: 0, y: 0,width:DownSlideSingleCourseW , height:DownSlideSingleCourseImgH)
-            bgImageView.contentMode = .scaleAspectFill
-            bgImageView.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
-            bgImageView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-            bgImageView.layer.masksToBounds = true
-            bgImageView.kf.setImage(with: URL(string: model.contents[0].poster ?? ""))
-            
-            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
-            titleLbl.text = model.contents[0].title ?? "婴儿课程"
-            titleLbl.font = BoldFont_21
-            titleLbl.textColor = HexColor("#FFFFFF")
-            bgImageView.addSubview(titleLbl)
-            
-            let subTitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y:titleLbl.bottom , width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
-            subTitleLbl.text = model.contents[0].subTitle ?? "适应3-6岁"
-            subTitleLbl.font = Font_12
-            subTitleLbl.textColor = HexColor("#FFFFFF")
-            bgImageView.addSubview(subTitleLbl)
-            
-            //单节底部视图
-            let singleCourseBottomView = UIView(frame: CGRect(x: 0, y: DownSlideSingleCourseImgH, width: DownSlideSingleCourseW, height: DownSlideSingleCourseMoreH))
-            singleCourseBottomView.layer.cornerRadius = 12
-            singleCourseBottomView.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
-            singleCourseBottomView.backgroundColor = .white
-            singleCourseBottomView.isUserInteractionEnabled = true
-            bgBackView.addSubview(singleCourseBottomView)
-            
-            let moreLabel = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: 15, width: DownSlideSingleCourseW - 50 - DownSlideRecommendLeftGap   , height: 30))
-            moreLabel.text = model.blockName ?? "更多"
-            moreLabel.font = Font_15
-            moreLabel.textColor = HexColor("#333333")
-            singleCourseBottomView.addSubview(moreLabel)
-            
-            let moreImgView = UIImageView(image: UIImage(named: "homepage_down_more"))
-            moreImgView.left = moreLabel.right
-            moreImgView.centerY = moreLabel.centerY
-            singleCourseBottomView.addSubview(moreImgView)
-        }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        self.modelArr.count
     }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let model = self.modelArr[indexPath.row] as! CNLiveAlbumMsgModel
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
+        else {
+            let cell = CNLiveAlbumCell()
+            return cell
+        }
+        cell.albumMsgModel = model
+
+        return cell
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        self.DuanJUCellSelectedCallBack!(self)
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 45+15*2
+    }
     //MARK: - 事件
-    @objc func enterBtnAction(_ sender: UIButton){
-        let tag = sender.tag
-        let contentMdl = self.slideModel?.contents[tag]
-        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl!)
+    @objc func playBtnAction(){
+        showLoading(message: "")
+//        self.getAlbumList()
     }
 }
@@ -10,6 +10,19 @@ import QMUIKit
 class CNLiveAlbumCell:UITableViewCell{
     var albumModelArr:Array<CNLiveAlbumListModel>?
+    
+    var _albumMsgModel : CNLiveAlbumMsgModel?
+    var albumMsgModel : CNLiveAlbumMsgModel? {
+        get{
+            _albumMsgModel
+        }
+        set{
+            _albumMsgModel = newValue!
+            
+            self.setupNewUIMsgModel(model: _albumMsgModel!)
+        }
+    }
+
     //AlbumModel
     var _albumModel : CNLiveAlbumModel?
     var albumModel : CNLiveAlbumModel? {
@@ -35,7 +48,7 @@ class CNLiveAlbumCell:UITableViewCell{
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
         titleLabel.font = Font_15
-        titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
+        titleLabel.text = "标题"
         return titleLabel
     }()
     ///副标题
@@ -76,39 +89,76 @@ class CNLiveAlbumCell:UITableViewCell{
         self.titleLabl.text = model.title
         self.subTitleLabel.text = model.subTitle
         self.iconImgView.kf.setImage(with: URL(string: model.poster))
+        self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80
+        self.playBtn.left = KSreenWidth-80
     }
-    @objc func playBtnAction(){
-        showLoading(message: "")
-        self.getAlbumList()
-    }
-    
-    //获取专辑详情(简介等)
-    func getAlbumMsg(){
-        CNLiveHomePageViewModel.getAlbumMsg(aid: self.albumModel!.contentId) { result, status in
-            hiddenLoading()
-            if status == .success{
-                let model = result as! CNLiveAlbumMsgModel
-                for listModel in self.albumModelArr! {
-                    listModel.albumMsgModel = model
-                }
-                print("")
-            }else{
-                
-            }
-        }
+    func setupNewUIMsgModel(model:CNLiveAlbumMsgModel){
+        self.titleLabl.text = model.albumName
+        self.subTitleLabel.text = model.subTitle
+        self.iconImgView.kf.setImage(with: URL(string: model.albumImg))
+        self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80-30
+        self.playBtn.left = KSreenWidth-80-30
     }
-    //获取专辑视频列表详情(播放地址 ,点赞数等信息)
-    func getAlbumList(){
+    @objc func playBtnAction(){
         showLoading(message: "")
-        CNLiveHomePageViewModel.getAlbumList(aid: self.albumModel!.contentId){ result, status in
-            hiddenLoading()
-            if status == .success{
-                let arr = result as! Array<CNLiveAlbumListModel>
-                self.albumModelArr = Array(arr)
-                self.getAlbumMsg()
-            }else{
-                
-            }
+        var aid = ""
+        if self.albumModel != nil{
+            aid = self.albumModel!.contentId
+        }else if self.albumMsgModel != nil{
+            aid = self.albumMsgModel!.albumId
+        }else{
+            aid = ""
         }
+
+        navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+
+//        self.getAlbumList()
     }
+    
+//    //获取专辑详情(简介等)
+//    func getAlbumMsg(){
+//        var aid = ""
+//        if self.albumModel != nil{
+//            aid = self.albumModel!.contentId
+//        }else if self.albumMsgModel != nil{
+//            aid = self.albumMsgModel!.albumId
+//        }else{
+//            aid = ""
+//        }
+//        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
+//            hiddenLoading()
+//            if status == .success{
+//                let model = result as! CNLiveAlbumMsgModel
+//                for listModel in self.albumModelArr! {
+//                    listModel.albumMsgModel = model
+//                }
+//                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+//            }else{
+//                
+//            }
+//        }
+//    }
+//    //获取专辑视频列表详情(播放地址 ,点赞数等信息)
+//    func getAlbumList(){
+//        showLoading(message: "")
+//        var aid = ""
+//        if self.albumModel != nil{
+//            aid = self.albumModel!.contentId
+//        }else if self.albumMsgModel != nil{
+//            aid = self.albumMsgModel!.albumId
+//        }else{
+//            aid = ""
+//        }
+//        
+//        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
+//            hiddenLoading()
+//            if status == .success{
+//                let arr = result as! Array<CNLiveAlbumListModel>
+//                self.albumModelArr = Array(arr)
+//                self.getAlbumMsg()
+//            }else{
+//                
+//            }
+//        }
+//    }
 }
+//
+//  CNLiveDuanjuTitleCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/10.
+//  在追短剧详情页-title cell
+
+import Foundation
+
+class CNLiveDuanjuTitleCell:UITableViewCell{
+    
+    //MARK: - 懒加载
+    ///区块标题
+    lazy var blockTitleLabl: UILabel = {
+        let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: 10, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+        titleLbl.text = "在追短剧"
+        titleLbl.font = BoldFont_21
+        titleLbl.textColor = HexColor("#333333")
+        return titleLbl
+    }()
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        
+        setupUI()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupUI() {
+        contentView.backgroundColor = .white
+        self.contentView.addSubview(self.blockTitleLabl)
+    }
+    
+    
+}
@@ -7,56 +7,109 @@
 import Foundation
 import QMUIKit
+import Kingfisher
 class CNLivePlayletHomePageCell:UITableViewCell{
+    
+    var _albumListModel : CNLiveAlbumListModel?
+    var albumListModel : CNLiveAlbumListModel? {
+        get{
+            _albumListModel
+        }
+        set{
+            _albumListModel = newValue!
+            
+            self.setupNewUI(model: _albumListModel!)
+        }
+    }
     //MARK: - 懒加载
     lazy var iconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: 20, y: 10, width: 60, height: 90))
+        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 12, width: 57, height: 75))
+        iconImgView.layer.cornerRadius = 5
+        iconImgView.clipsToBounds = true
         return iconImgView
     }()
+    lazy var payIconImgView :UIImageView = {
+        let payIconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: 30, height: 14))
+        payIconImgView.image = UIImage(named: "homePage_payed")
+        return payIconImgView
+    }()
+    
     ///标题
     lazy var titleLabl: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, 15, KSreenWidth-(self.iconImgView.right+15)-10, 21))
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.iconImgView.top, KSreenWidth-(self.iconImgView.right+15)-10, 21))
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
-        titleLabel.font = Font_15
+        titleLabel.font = Font_13
         titleLabel.numberOfLines = 2
-        titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
+        titleLabel.text = "视频标题"
         let height = titleLabel.qmui_lineHeight
         titleLabel.height = height*2
         return titleLabel
     }()
     ///时长
     lazy var timeLabel: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.titleLabl.bottom+10, 40, 21))
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.iconImgView.bottom-21, 150, 21))
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
-        titleLabel.font = Font_15
+        titleLabel.font = Font_12
         titleLabel.text = "04:31"
         let height = titleLabel.qmui_lineHeight
         titleLabel.height = height
         return titleLabel
     }()
-    lazy var likeBtn: UIButton = {
-        let likeBtn = UIButton.init(type: .custom)
-        likeBtn.frame = CGRect(x: self.timeLabel.right+20, y: self.timeLabel.top, width: 60, height: 20)
-        likeBtn.setTitle("24.0w", for: .normal)
-        likeBtn.setTitleColor(HexColor("#333333"), for: .normal)
-        likeBtn.setImage(UIImage(named: "DS_coupon_unSelect"), for: .normal)
-        likeBtn.titleLabel?.font = Font_14
-        likeBtn.setupButtonImageAndTitlePossitionWith(padding: 5, style: .left)
-        return likeBtn
-    }()
-    
+
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
         self.addSubview(self.iconImgView)
+        self.iconImgView.addSubview(self.payIconImgView)
         self.addSubview(self.titleLabl)
         self.addSubview(self.timeLabel)
-        self.addSubview(self.likeBtn)
     }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    func setupNewUI(model:CNLiveAlbumListModel){
+        self.titleLabl.text = model.title
+        self.timeLabel.text = model.duration
+        self.iconImgView.kf.setImage(with: URL(string: model.poster))
+        if model.product?.check == true{
+            //付过费 或 免费
+            self.payIconImgView.isHidden = true
+            //显示已购买 或者 不显示
+            if model.product?.productType == "0"{
+                //免费
+                self.payIconImgView.isHidden = true
+            }else if model.product?.productType == "1"{
+                //积分
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payed")
+            }else if model.product?.productType == "2"{
+                //付费
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payed")
+            }else{
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payed")
+            }
+        }else{
+            //需要付费
+            if model.product?.productType == "0"{
+                //免费
+                self.payIconImgView.isHidden = true
+            }else if model.product?.productType == "1"{
+                //积分
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payment")
+            }else if model.product?.productType == "2"{
+                //付费
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payment")
+            }else{
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payment")
+            }
+        }
+    }
 }
@@ -9,30 +9,66 @@ import Foundation
 import QMUIKit
 import SwiftUI
 import SnapKit
+import Kingfisher
+
+//cell高度变化
+typealias homePageHeaderCellChangedBlockActionBlock = (_ cell: CNLivePlayletHomePageHeaderCell ,_ jianjieHeight:CGFloat) -> Void
+//刷新短剧首页
+typealias homePageNeedReloadBlockActionBlock = () -> Void
+
+
 class CNLivePlayletHomePageHeaderCell:UITableViewCell{
+    var homePageHeaderCellChangedBlock:homePageHeaderCellChangedBlockActionBlock?
+    var homePageNeedReloadActionBlock:homePageNeedReloadBlockActionBlock?
+
+    
+    let followBtnSubLayer = "followBtnSubLayer"
+    let payBtnSubLayer = "payBtnSubLayer"
+    
+    var _albumListModel : CNLiveAlbumListModel?
+    var albumListModel : CNLiveAlbumListModel? {
+        get{
+            _albumListModel
+        }
+        set{
+            _albumListModel = newValue!
+            
+            self.setupNewUI(model: _albumListModel!)
+        }
+    }
+    
     //MARK: - 懒加载
     lazy var iconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: 20, y: 20, width: 100, height: 100))
+        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 20, width: 112, height: 147))
+        iconImgView.layer.cornerRadius = 5
+        iconImgView.clipsToBounds = true
         return iconImgView
     }()
+    
+    lazy var payIconImgView :UIImageView = {
+        let payIconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: 30, height: 14))
+        payIconImgView.image = UIImage(named: "homePage_payment")
+        return payIconImgView
+    }()
+    
     ///标题
     lazy var titleLabl: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+10, self.iconImgView.top+20, KSreenWidth-(self.iconImgView.right+15)-10, 21))
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.iconImgView.top, KSreenWidth-(self.iconImgView.right+15)-10, 21))
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
-        titleLabel.font = Font_20
-        titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
+        titleLabel.font = BoldFont_15
+        titleLabel.text = "短剧标题"
         let height = titleLabel.qmui_lineHeight
         titleLabel.height = height
         return titleLabel
     }()
     ///集数
     lazy var jishuLabel: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(self.titleLabl.left, self.titleLabl.bottom+20, 40, 21))
-        titleLabel.textColor = HexColor("#333333")
+        let titleLabel = UILabel.init(frame: CGRectMake(self.titleLabl.left, self.titleLabl.bottom+20, KSreenWidth-(self.iconImgView.right+15)-10, 21))
+        titleLabel.textColor = HexColor("#999999")
         titleLabel.textAlignment = .left
-        titleLabel.font = Font_15
-        titleLabel.text = "45集"
+        titleLabel.font = Font_12
+        titleLabel.text = "1集"
         let height = titleLabel.qmui_lineHeight
         titleLabel.height = height
         return titleLabel
@@ -42,8 +78,9 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.left, self.iconImgView.bottom+10, KSreenWidth-2*self.iconImgView.left, 21))
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
-        titleLabel.font = Font_14
-        titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈啊哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈"
+        titleLabel.font = Font_12
+        titleLabel.backgroundColor = UIColor(red:0.98, green:0.98, blue:0.98, alpha:1.00)
+        titleLabel.text = "简介"
         titleLabel.numberOfLines = 0
         var lines = titleLabel.getRealLabelTextLines()
         let height = titleLabel.qmui_lineHeight
@@ -62,10 +99,10 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         expandBtn.setTitle("展开", for: .normal)
         expandBtn.setTitle("收起", for: .selected)
-        expandBtn.setTitleColor(HexColor("#333333"), for: .normal)
-        expandBtn.setImage(UIImage(named: "DS_coupon_unSelect"), for: .normal)
-        expandBtn.setImage(UIImage(named: "DS_coupon_unSelect"), for: .selected)
-        expandBtn.titleLabel?.font = Font_16
+        expandBtn.setTitleColor(HexColor("#666666"), for: .normal)
+        expandBtn.setImage(UIImage(named: "homepage_unfold"), for: .normal)
+        expandBtn.setImage(UIImage(named: "homepage_fold"), for: .selected)
+        expandBtn.titleLabel?.font = Font_12
         expandBtn.setupButtonImageAndTitlePossitionWith(padding: 5, style: .right)
         expandBtn.addTarget(self, action: #selector(expandBtnAction), for: .touchUpInside)
         return expandBtn
@@ -74,31 +111,51 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
     lazy var followBtn: UIButton = {
         let  followBtn = UIButton(type: .custom)
         followBtn.setTitle("追剧", for: .normal)
-        followBtn.setTitleColor(.black, for: .normal)
-        followBtn.setTitleColor(.black, for: .selected)
-        followBtn.setTitle("已追剧", for: .selected)
-        followBtn.layer.borderColor = UIColor.black.cgColor
-        followBtn.layer.borderWidth = 1
-        followBtn.layer.cornerRadius = 3
+        followBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        followBtn.titleLabel?.font = Font_15
+        followBtn.layer.cornerRadius = 20
         followBtn.clipsToBounds = true
         followBtn.addTarget(self, action: #selector(followBtnAction), for: .touchUpInside)
+        
+        let gradient = CAGradientLayer()
+        gradient.frame = self.bounds
+        gradient.colors = [HexColor("#FFD20B")!.cgColor, HexColor("#FFA81A")!.cgColor]
+        gradient.locations = [0, 1]
+        gradient.startPoint = CGPoint(x: 0.96, y: 0.42)
+        gradient.endPoint = CGPoint(x: 0.42, y: 0.42)
+        gradient.name = followBtnSubLayer
+        followBtn.layer.insertSublayer(gradient, at: 0)
         return followBtn
     }()
     //付费解锁全集|已购买
     lazy var paymentBtn: UIButton = {
         let  paymentBtn = UIButton(type: .custom)
         paymentBtn.setTitle("付费解锁全集", for: .normal)
-        paymentBtn.setTitleColor(.white, for: .normal)
-        paymentBtn.setTitle("已购买", for: .selected)
-        paymentBtn.setTitleColor(.black, for: .selected)
-        paymentBtn.backgroundColor = .blue
-        paymentBtn.layer.borderColor = UIColor.black.cgColor
-        paymentBtn.layer.borderWidth = 1
-        paymentBtn.layer.cornerRadius = 3
+        paymentBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        paymentBtn.titleLabel?.font = Font_15
+        paymentBtn.layer.cornerRadius = 20
         paymentBtn.clipsToBounds = true
         paymentBtn.addTarget(self, action: #selector(paymentBtnAction), for: .touchUpInside)
+        
+        let gradient = CAGradientLayer()
+        gradient.frame = self.bounds
+        gradient.colors = [HexColor("#67C5FF")!.cgColor, HexColor("#609AFF")!.cgColor]
+        gradient.locations = [0, 1]
+        gradient.startPoint = CGPoint(x: 0, y: 0.5)
+        gradient.endPoint = CGPoint(x: 0.5, y: 0.5)
+        gradient.name = payBtnSubLayer
+        paymentBtn.layer.insertSublayer(gradient, at: 0)
         return paymentBtn
     }()
+    ///全部剧集
+    lazy var allJuJiLabl: UILabel = {
+        let allJuJiLabl = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.followBtn.bottom+20, 100, 16))
+        allJuJiLabl.textColor = HexColor("#333333")
+        allJuJiLabl.textAlignment = .left
+        allJuJiLabl.font = BoldFont_16
+        allJuJiLabl.text = "全部剧集"
+        return allJuJiLabl
+    }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -108,12 +165,14 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
     func setUI(){
         self.contentView.addSubview(self.iconImgView)
+        self.iconImgView.addSubview(self.payIconImgView)
         self.contentView.addSubview(self.titleLabl)
         self.contentView.addSubview(self.jishuLabel)
         self.contentView.addSubview(self.jianjieLabel)
         self.contentView.addSubview(self.expandBtn)
         self.contentView.addSubview(self.followBtn)
         self.contentView.addSubview(self.paymentBtn)
+        self.contentView.addSubview(self.allJuJiLabl)
         let lines = jianjieLabel.getRealLabelTextLines()
         if lines <= 2{
@@ -123,25 +182,100 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         }
         self.followBtn.snp.makeConstraints { make in
-            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(40)
-            make.left.equalTo(self.jianjieLabel.snp.left).offset(30)
-            make.width.equalTo(120)
-            make.height.equalTo(30)
+            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(25)
+            make.left.equalTo(self.iconImgView.snp.left)
+            make.width.equalTo(140)
+            make.height.equalTo(40)
         }
         self.paymentBtn.snp.makeConstraints { make in
             make.top.equalTo(self.followBtn)
-            make.left.equalTo(self.followBtn.snp.left).offset(KSreenWidth/2)
-            make.width.equalTo(120)
-            make.height.equalTo(30)
+            make.left.equalTo(self.followBtn.snp.right).offset(15)
+            make.right.equalTo(self.contentView.snp.right).offset(-15)
+            make.height.equalTo(40)
+        }
+        self.allJuJiLabl.snp.makeConstraints { make in
+            make.top.equalTo(self.followBtn.snp.bottom).offset(20)
+            make.left.equalTo(self.iconImgView.snp.left)
+            make.width.equalTo(100)
+            make.height.equalTo(16)
         }
-        
-        self.iconImgView.backgroundColor = .red
     }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    func setupNewUI(model:CNLiveAlbumListModel){
+        
+        self.titleLabl.text = model.albumMsgModel?.albumName ?? "专辑名称"
+        self.jishuLabel.text = String(format: "共%@集",model.albumMsgModel?.episodeNow ?? "1")
+        self.iconImgView.kf.setImage(with: URL(string: model.albumMsgModel?.albumImg ?? ""))
+        if model.product?.check == true{
+            //付过费 或 免费
+            self.paymentBtn.isUserInteractionEnabled = false
+            self.paymentChangeStatus(isPayed: true)
+            self.payIconImgView.isHidden = true
+            //显示已购买 或者 不显示
+            if model.albumMsgModel?.product?.albumProductType == "0"{
+                //免费
+                self.payIconImgView.isHidden = true
+            }else if model.product?.albumProductType == "1"{
+                //积分
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payed")
+            }else if model.product?.albumProductType == "2"{
+                //付费
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payed")
+            }else{
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payed")
+            }
+        }else{
+            //需要付费
+            self.paymentBtn.isUserInteractionEnabled = true
+            self.paymentChangeStatus(isPayed: false)
+            if model.product?.albumProductType == "0"{
+                //免费
+                self.payIconImgView.isHidden = true
+            }else if model.product?.albumProductType == "1"{
+                //积分
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payment")
+            }else if model.product?.albumProductType == "2"{
+                //付费
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payment")
+            }else{
+                self.payIconImgView.isHidden = false
+                self.payIconImgView.image = UIImage(named: "homePage_payment")
+            }
+        }
+                
+        self.jianjieLabel.text = (model.albumMsgModel?.desc != "") ? model.albumMsgModel?.desc : "短剧简介"
+        let lines = jianjieLabel.getRealLabelTextLines()
+        let height = jianjieLabel.qmui_lineHeight
+        if lines <= 2{
+            self.expandBtn.isHidden = true
+        }else{
+            self.expandBtn.isHidden = false
+        }
+        
+        if self.expandBtn.isSelected{
+            //展开状态
+            self.jianjieLabel.height = height*CGFloat(lines)
+
+        }else{
+            //收起状态
+            self.jianjieLabel.height = 2*height
+        }
+        if model.albumMsgModel!.collection{
+            self.followChangeStatus(isFollowed: true)
+        }else{
+            self.followChangeStatus(isFollowed: false)
+        }
+    }
+    
     // MARK: - Action
     @objc func expandBtnAction(button:UIButton){
         button.isSelected = !button.isSelected
@@ -155,16 +289,127 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
             //文本展开状态,点击收起
             self.jianjieLabel.height = 2*height
         }
+        self.homePageHeaderCellChangedBlock!(self, self.jianjieLabel.height)
         self.expandBtn.top = self.jianjieLabel.bottom
     }
     @objc func followBtnAction(button:UIButton){
         button.isSelected = !button.isSelected
-
+        if button.isSelected{
+            //已追剧->取消追剧
+            if self.albumListModel?.albumMsgModel?.product?.check == true{
+                //已购买,不能取消追剧
+            }else{
+                self.postAlbumCollect(type: 2)
+            }
+        }else{
+            //未追剧->追剧
+            self.postAlbumCollect(type: 1)
+        }
     }
     @objc func paymentBtnAction(button:UIButton){
         button.isSelected = !button.isSelected
+        if self.albumListModel?.product?.check == false{
+            //未购买->购买
+            CNLiveIntegralAlertTool.shared.showIntegralAlert(title: "\(self.albumListModel?.albumMsgModel?.albumName ?? "")共\(self.albumListModel?.albumMsgModel?.episodeNow ?? "1")集", integralCount: self.albumListModel?.albumMsgModel?.product?.point ?? "0", productId: self.albumListModel?.product?.productId ?? "")
+            CNLiveIntegralAlertTool.shared.homePageNeedReloadActionBlock = {
+                self.homePageNeedReloadActionBlock!()
+                DispatchQueue.main.asyncAfter(deadline: .now()+1.5) { [self] in
+                    self.followChangeStatus(isFollowed: true)
+                }
+            }
+        }
+    }
+    func paymentChangeStatus(isPayed:Bool){
+        if isPayed{
+            //已购买
+            self.paymentBtn.setTitle("已购买", for: .normal)
+            self.paymentBtn.setTitleColor(HexColor("#619CFF"), for: .normal)
+            
+            let payLayer = self.subLayer(name: payBtnSubLayer, viewLayer: self.paymentBtn.layer)
+            payLayer?.removeFromSuperlayer()
+            self.paymentBtn.backgroundColor = HexColor("#ECF3FF")
+        }else{
+            //未购买
+            self.paymentBtn.setTitle("付费解锁全集", for: .normal)
+            self.paymentBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+            
+            let payLayer = self.subLayer(name: payBtnSubLayer, viewLayer: self.paymentBtn.layer)
+
+            if (payLayer != nil){
+                //已添加layer
+            }else{
+                //未添加layer
+                let gradient = CAGradientLayer()
+                gradient.frame = self.bounds
+                gradient.colors = [HexColor("#67C5FF")!.cgColor, HexColor("#609AFF")!.cgColor]
+                gradient.locations = [0, 1]
+                gradient.startPoint = CGPoint(x: 0, y: 0.5)
+                gradient.endPoint = CGPoint(x: 0.5, y: 0.5)
+                gradient.name = followBtnSubLayer
+                self.paymentBtn.layer.insertSublayer(gradient, at: 0)
+                self.paymentBtn.backgroundColor = .clear
+            }
+        }
+        
+    }
+    func followChangeStatus(isFollowed:Bool){
+        if isFollowed{
+            //已追剧
+            self.followBtn.setTitleColor(HexColor("#F5A623"), for: .normal)
+            self.followBtn.setTitle("已追剧", for: .normal)
+            let follLayer = self.subLayer(name: followBtnSubLayer, viewLayer: self.followBtn.layer)
+            follLayer?.removeFromSuperlayer()
+            self.followBtn.backgroundColor = HexColor("#FDF4E4")
+        }else{
+            //未追剧
+            self.followBtn.setTitle("追剧", for: .normal)
+            self.followBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+            let follLayer = self.subLayer(name: followBtnSubLayer, viewLayer: self.followBtn.layer)
+            if (follLayer != nil){
+                //已添加layer
+            }else{
+                //未添加layer
+                let gradient = CAGradientLayer()
+                gradient.frame = self.bounds
+                gradient.colors = [HexColor("#FFD20B")!.cgColor, HexColor("#FFA81A")!.cgColor]
+                gradient.locations = [0, 1]
+                gradient.startPoint = CGPoint(x: 0.96, y: 0.42)
+                gradient.endPoint = CGPoint(x: 0.42, y: 0.42)
+                gradient.name = followBtnSubLayer
+                followBtn.layer.insertSublayer(gradient, at: 0)
+                self.followBtn.backgroundColor = .clear
+            }
+
+        }
+    }
+    
+    func subLayer(name:String,viewLayer:CALayer) -> CALayer?{
+        if let subLayer = viewLayer.sublayers?.first(where: { $0.name == name }) {
+            // 这里可以对获取到的子图层进行操作或者访问其属性等
+            return subLayer
+        } else {
+            print("未找到指定名称的图层")
+            return nil
+        }
+    }
+
+    // MARK: - 网络请求 追剧1/取消追剧2
+    func postAlbumCollect(type:NSInteger){
+        CNLiveHomePageViewModel.postAlbumCollect(aid: self.albumListModel?.albumMsgModel?.albumId ?? "", type: type) { result, status in
+            if status == .success{
+                if type == 1{
+                    self.followChangeStatus(isFollowed: true)
+                }else if type == 0{
+                    self.followChangeStatus(isFollowed: false)
+                }else{
+                    self.followChangeStatus(isFollowed: false)
+                }
+            }else{
+                showMessage(message: "网络请求失败")
+            }
+        }
     }
 }
@@ -32,12 +32,35 @@ class CNLiveHomePageViewModel:NSObject{
             }
         }
     }
+    /// 短剧主页-专辑收藏(追剧)
+    static func postAlbumCollect(aid:String,type:NSInteger,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(aid, forKey: "aid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue("\(type)", forKey: "type")
+
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseCMSUrl+"/contentApi/albumCollect", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    
+                    resultBlock(NSNull(),.success)
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
     /// 获取首页我的专辑收藏数据
-    static func requestGetHomePage(resultBlock: @escaping downSlideResultBlock) {
+    static func requestGetHomePageMyAlbum(page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
-        param.setValue("1", forKey: "page")
-        param.setValue("50", forKey: "pageSize")
+        param.setValue("\(page)", forKey: "page")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
@@ -47,10 +70,19 @@ class CNLiveHomePageViewModel:NSObject{
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
-                    let dataDic = resp["data"] as! Dictionary<String, Any>
-                    let dataMdl = newDictionaryToModel(dataDic, CNLiveHomePageModel.self)
+                    let dataArr = resp["data"] as! Array<Any>
+                    var resArr = []
+                    if dataArr.count > 0{
+                        //有在追短剧
+                        for dataDic in dataArr {
+                            let dataMdl = newDictionaryToModel(dataDic as! [String : Any], CNLiveAlbumMsgModel.self)
+                            resArr.append(dataMdl)
+                        }
+                    }else{
+                        //没有在追短剧
+                    }
-                    resultBlock(dataMdl,.success)
+                    resultBlock(resArr,.success)
                 }
                 else{
                     resultBlock(NSNull(),.failed)
@@ -59,9 +91,11 @@ class CNLiveHomePageViewModel:NSObject{
         }
     }
     /// 获取首页-全部专辑列表
-    static func getBlockContents(blockId:String,resultBlock: @escaping downSlideResultBlock) {
+    static func getBlockContents(blockId:String,page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(blockId, forKey: "blockId")
+        param.setValue("\(page)", forKey: "page")
+//        param.setValue("10", forKey: "pageSize")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getBlockContents", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -140,4 +174,65 @@ class CNLiveHomePageViewModel:NSObject{
             }
         }
     }
+    
+    /// 积分支付
+    static func orderVideoByPoint(prdId:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue(APPId_wjj, forKey: "sp_id")
+        param.setValue(prdId, forKey: "prdId")
+        param.setValue("apple", forKey: "frmId")
+        param.setValue(CNLiveHomePageViewModel.getRandomOrderId(), forKey: "srvOrderId")
+        let customParam = NSMutableDictionary()
+        customParam.setValue(APPId, forKey: "appId")
+        customParam.setValue(APPKey, forKey: "appKey")
+
+        CNLiveNetworking.setupShowResult(true)
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupCustomParam(customParam as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/pom/orderVideoByPoint", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    //兑换成功
+                    resultBlock(NSNull(),.success)
+                }else if (errorCode == "4002") {
+                    //积分不足
+                    resultBlock("积分不足",.failed)
+                }else
+                {
+                    resultBlock("兑换失败,请稍候再试!",.failed)
+                }
+            }
+        }
+    }
+    static func getRandomOrderId() -> String {
+        // appId+渠道+年月日+毫秒数后10位+2位数的随机数
+        var randomOrderId = ""
+        //年月日
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyyMMdd"
+        let currentDate = Date()
+        let currentDateString = formatter.string(from: currentDate)
+        
+        //取毫秒时间戳
+        let timestamp13 = String(format: "%ld",self.getNow13Timestamp())//timeStamp)
+        //拼接
+        randomOrderId = String(format: "%@%@%@%d", APPId_wjj, currentDateString, timestamp13, Int.random(in: 0..<10))
+          
+        return randomOrderId
+    }
+    static func getNow13Timestamp() -> Int {
+        let formatter = DateFormatter()
+        formatter.dateStyle = .medium
+        formatter.timeStyle = .short
+        formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        formatter.timeZone = TimeZone(identifier: "Asia/Beijing")
+        let dateNow = Date()
+        let timeStamp = Int(dateNow.timeIntervalSince1970)
+        return timeStamp*1000
+    }
 }
@@ -49,6 +49,7 @@ class CNLiveShopOrderListViewController: CNLiveBaseViewController, UITableViewDe
     var pageNum: NSInteger
     var network_type: CNLiveMineResponseType!
+    
     var _show_type:CNLiveShopOrderListShowType!
     init(show_type:CNLiveShopOrderListShowType) {
         self.pageNum = 1
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homePage_payed@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "homePage_payed@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homePage_payment@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "homePage_payment@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_fold@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "homepage_fold@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_unfold@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "homepage_unfold@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "jifen_paySuccess@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "jifen_paySuccess@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "jifen_paying@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "jifen_paying@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "point_alert_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "point_alert_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "authentication@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "authentication@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "authentication_unSelect@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "authentication_unSelect@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}