新首页专辑

张旭
1 parent 48fb7a35
Showing 18 changed files with 1819 additions and 18 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Extensions/UILabel+FormattedText.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomePageAnimationTransition.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomePageBaseNavigationController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDetailViewController.swift
metaCode/Classes/Main/HomePages/Controller/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Controller/PlayletHomePage/CNLivePlayletHomePageController.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumListModel.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumModel.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumMsgModel.swift
metaCode/Classes/Main/HomePages/Model/CNLiveHomePageModel.swift
metaCode/Classes/Main/HomePages/View/HomePage/CNLiveHomePageDuanJuCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumImageCell.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageCell.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageHeaderCell.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
@@ -75,6 +75,21 @@
 		1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */; };
 		1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */; };
 		1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */; };
+		1938BD202B46799A00390A34 /* CNLivePlayletHomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */; };
+		1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */; };
+		1938BD242B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD232B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift */; };
+		1938BD262B479D3400390A34 /* UILabel+FormattedText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD252B479D3400390A34 /* UILabel+FormattedText.swift */; };
+		1938BD2A2B48014E00390A34 /* CNHomepageDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD292B48014E00390A34 /* CNHomepageDetailViewController.swift */; };
+		1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD2B2B4801A700390A34 /* CNHomePageAnimationTransition.swift */; };
+		1938BD2E2B48021E00390A34 /* CNHomePageBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD2D2B48021E00390A34 /* CNHomePageBaseNavigationController.swift */; };
+		1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD2F2B4B8A3500390A34 /* CNLiveHomePageViewModel.swift */; };
+		1938BD322B4B8F0400390A34 /* CNLiveHomePageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD312B4B8F0400390A34 /* CNLiveHomePageModel.swift */; };
+		1938BD342B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD332B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift */; };
+		1938BD362B4BCC7F00390A34 /* CNLiveAlbumModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD352B4BCC7F00390A34 /* CNLiveAlbumModel.swift */; };
+		1938BD382B4BDC2500390A34 /* CNLiveAlbumImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */; };
+		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 */; };
 		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 */; };
@@ -312,6 +327,21 @@
 		1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideViewModel.swift; sourceTree = "<group>"; };
 		1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideModel.swift; sourceTree = "<group>"; };
 		1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAuthViewController.swift; sourceTree = "<group>"; };
+		1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageController.swift; sourceTree = "<group>"; };
+		1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageCell.swift; sourceTree = "<group>"; };
+		1938BD232B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayletHomePageHeaderCell.swift; sourceTree = "<group>"; };
+		1938BD252B479D3400390A34 /* UILabel+FormattedText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+FormattedText.swift"; sourceTree = "<group>"; };
+		1938BD292B48014E00390A34 /* CNHomepageDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomepageDetailViewController.swift; sourceTree = "<group>"; };
+		1938BD2B2B4801A700390A34 /* CNHomePageAnimationTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageAnimationTransition.swift; sourceTree = "<group>"; };
+		1938BD2D2B48021E00390A34 /* CNHomePageBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageBaseNavigationController.swift; sourceTree = "<group>"; };
+		1938BD2F2B4B8A3500390A34 /* CNLiveHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomePageViewModel.swift; sourceTree = "<group>"; };
+		1938BD312B4B8F0400390A34 /* CNLiveHomePageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomePageModel.swift; sourceTree = "<group>"; };
+		1938BD332B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomePageDuanJuCell.swift; sourceTree = "<group>"; };
+		1938BD352B4BCC7F00390A34 /* CNLiveAlbumModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumModel.swift; sourceTree = "<group>"; };
+		1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumImageCell.swift; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
@@ -610,6 +640,7 @@
 		1938BD122B3D6C4700390A34 /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
+				1938BD2F2B4B8A3500390A34 /* CNLiveHomePageViewModel.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -617,6 +648,10 @@
 		1938BD132B3D6C5700390A34 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				1938BD312B4B8F0400390A34 /* CNLiveHomePageModel.swift */,
+				1938BD352B4BCC7F00390A34 /* CNLiveAlbumModel.swift */,
+				1938BD3E2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift */,
+				1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -624,6 +659,9 @@
 		1938BD142B3D6C5C00390A34 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				1938BD3B2B4BDC5700390A34 /* PlayletHomePage */,
+				1938BD3A2B4BDC4200390A34 /* HomePage */,
+				1938BD392B4BDC2900390A34 /* HomepageDetail */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -631,7 +669,8 @@
 		1938BD152B3D6C6000390A34 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */,
+				1938BD272B48009600390A34 /* AuthController */,
+				1938BD1D2B46791400390A34 /* PlayletHomePage */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -679,6 +718,59 @@
 			path = WebController;
 			sourceTree = "<group>";
 		};
+		1938BD1D2B46791400390A34 /* PlayletHomePage */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD1F2B46799A00390A34 /* CNLivePlayletHomePageController.swift */,
+			);
+			path = PlayletHomePage;
+			sourceTree = "<group>";
+		};
+		1938BD272B48009600390A34 /* AuthController */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD282B4800E500390A34 /* push相关 */,
+				1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */,
+			);
+			path = AuthController;
+			sourceTree = "<group>";
+		};
+		1938BD282B4800E500390A34 /* push相关 */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD292B48014E00390A34 /* CNHomepageDetailViewController.swift */,
+				1938BD2B2B4801A700390A34 /* CNHomePageAnimationTransition.swift */,
+				1938BD2D2B48021E00390A34 /* CNHomePageBaseNavigationController.swift */,
+			);
+			path = "push相关";
+			sourceTree = "<group>";
+		};
+		1938BD392B4BDC2900390A34 /* HomepageDetail */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD372B4BDC2500390A34 /* CNLiveAlbumImageCell.swift */,
+				1938BD3C2B4BDD4B00390A34 /* CNLiveAlbumCell.swift */,
+			);
+			path = HomepageDetail;
+			sourceTree = "<group>";
+		};
+		1938BD3A2B4BDC4200390A34 /* HomePage */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD332B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift */,
+			);
+			path = HomePage;
+			sourceTree = "<group>";
+		};
+		1938BD3B2B4BDC5700390A34 /* PlayletHomePage */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD212B467C1700390A34 /* CNLivePlayletHomePageCell.swift */,
+				1938BD232B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift */,
+			);
+			path = PlayletHomePage;
+			sourceTree = "<group>";
+		};
 		19565EC32AF8ACC2007D6727 /* GoodsManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -797,6 +889,7 @@
 				191732E62B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift */,
 				191733032B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift */,
 				191733092B10864F007BCC04 /* Array+CNLiveExtensions.swift */,
+				1938BD252B479D3400390A34 /* UILabel+FormattedText.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1502,12 +1595,14 @@
 				191732F32B084DBC007BCC04 /* CNLiveShopClassifySwitchTableViewCell.swift in Sources */,
 				191732E72B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift in Sources */,
 				1917328E2B032583007BCC04 /* CNLiveRoundedRectView.swift in Sources */,
+				1938BD2E2B48021E00390A34 /* CNHomePageBaseNavigationController.swift in Sources */,
 				1917332F2B16C7C9007BCC04 /* CNLiveTimer.swift in Sources */,
 				7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
 				1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */,
 				79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
 				79BB96A82AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift in Sources */,
 				19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
+				1938BD382B4BDC2500390A34 /* CNLiveAlbumImageCell.swift in Sources */,
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
 				1917330D2B1096AB007BCC04 /* CNLivePlayerViewController.swift in Sources */,
 				1917330F2B10989C007BCC04 /* CNLivePlayerView.swift in Sources */,
@@ -1536,12 +1631,15 @@
 				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
 				79E672032AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift in Sources */,
 				19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */,
+				1938BD322B4B8F0400390A34 /* CNLiveHomePageModel.swift in Sources */,
 				191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */,
+				1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */,
 				19565ED42AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
 				19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */,
+				1938BD362B4BCC7F00390A34 /* CNLiveAlbumModel.swift in Sources */,
 				7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
 				7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
 				1917332B2B15CDC6007BCC04 /* CNLivePlayerLandscapeViewController.swift in Sources */,
@@ -1557,11 +1655,13 @@
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */,
 				191733132B109F7B007BCC04 /* CNLivePlayerGestureView.swift in Sources */,
+				1938BD202B46799A00390A34 /* CNLivePlayletHomePageController.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				191732F82B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift in Sources */,
 				79BB1C162B05C62900C5720C /* CNLiveShopBodyCouponView.swift in Sources */,
 				798916E92B04532D00D08302 /* CNLiveSavePointDB.swift in Sources */,
+				1938BD242B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift in Sources */,
 				19FA20172AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift in Sources */,
 				19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */,
 				1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */,
@@ -1572,6 +1672,7 @@
 				799172362AF08D4500DC01A8 /* CNLiveShopBaseModel.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
+				1938BD3D2B4BDD4B00390A34 /* CNLiveAlbumCell.swift in Sources */,
 				19E9D1622B3BBB2E00D0FB30 /* CNLiveFileManager.swift in Sources */,
 				79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */,
 				19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */,
@@ -1597,6 +1698,7 @@
 				191733582B319552007BCC04 /* CNLiveCouponGoodsListView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
 				19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */,
+				1938BD2A2B48014E00390A34 /* CNHomepageDetailViewController.swift in Sources */,
 				1965FA422AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift in Sources */,
 				792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */,
 				791C1C862AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift in Sources */,
@@ -1627,9 +1729,12 @@
 				191733112B109EDC007BCC04 /* CNLivePlayerControlView.swift in Sources */,
 				1917331F2B10A1BE007BCC04 /* CNLivePlayerEnum.swift in Sources */,
 				191733382B27FD66007BCC04 /* CNLiveShopClassifySectionHeaderView.swift in Sources */,
+				1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */,
+				1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */,
+				1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */,
 				191733452B284DCD007BCC04 /* CNLiveShopCouponListModel.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
 				19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */,
@@ -1649,6 +1754,7 @@
 				1917335C2B3283FF007BCC04 /* CNLiveCouponGoodsListSearchView.swift in Sources */,
 				798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */,
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
+				1938BD262B479D3400390A34 /* UILabel+FormattedText.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
 				794FF1092B02131300385E85 /* CNLiveSaveSearchDB.swift in Sources */,
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
@@ -1676,6 +1782,7 @@
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
 				191733022B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift in Sources */,
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
+				1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				191733292B148BF7007BCC04 /* CNLivePlayerVolumeBrightnessView.swift in Sources */,
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
@@ -1704,6 +1811,7 @@
 				79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */,
 				7991723A2AF091E100DC01A8 /* CNLiveShopOrderListViewController.swift in Sources */,
 				798A44F02A305BC200815935 /* UIButton+CNLiveExtensions.swift in Sources */,
+				1938BD342B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift in Sources */,
 				191733522B2C4CEA007BCC04 /* CNLivePickerSelectDateTools.swift in Sources */,
 				1917333A2B27FDF3007BCC04 /* CNLiveShopClassilyManageTableViewCell.swift in Sources */,
 			);
+//
+//  UILabel+FormattedText.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/5.
+//
+
+import Foundation
+
+extension UILabel {
+    //计算label的行数
+    func getRealLabelTextLines() -> Int {
+        guard let labelText = text else {
+            return 0
+        }
+        //计算理论上显示所有文字需要的尺寸
+        let rect = CGSize(width: self.bounds.width, height: CGFloat.greatestFiniteMagnitude)
+        let labelTextSize = (labelText as NSString)
+            .boundingRect(with: rect, options:.usesLineFragmentOrigin,attributes: [NSAttributedString.Key.font: self.font!], context: nil)
+        
+        //计算理论上需要的行数
+        let labelTextLines = Int(ceil(CGFloat(labelTextSize.height) / self.font.lineHeight))
+        return labelTextLines
+    }
+}
+//
+//  CNLiveAuthViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/12/28.
+//
+
+import Foundation
+
+class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
+        
+    //下滑tableview背景颜色
+    let kCNDownSlideBackgroundColorHex: String = "#F7F8FA"
+    
+    ///CNliveDownSlideModel Type
+    let SlideModelTypeRecommend4: String = "4"//4一排两个 推荐课程&推荐活动
+    let SlideModelTypeTodayRecommend74: String = "74"//74今日推荐
+    let SlideModelTypeAllCourse12: String = "12"//12列表全部课程
+    let SlideModelTypeOneCourse75: String = "75"//75单课程大图
+            
+    let kCNLiveDownSlideAllCourseCellIdentifier = "kCNLiveDownSlideAllCourseCellIdentifier"
+    let kCNLiveDownSlideRecommendCellIdentifier = "kCNLiveDownSlideRecommendCellIdentifier"
+    let kCNLiveDownSlideTodayRecommendCellIdentifier = "kCNLiveDownSlideTodayRecommendCellIdentifier"
+    let kCNLiveDownSlideSingleCourseCellIdentifier = "kCNLiveDownSlideSingleCourseCellIdentifier"
+    let kCNLiveHomePageDuanJuCellIdentifier = "kCNLiveHomePageDuanJuCellIdentifier"
+    
+    var isHaveDuanJU = false//是否有在追短剧
+    var totolNum = 0//一共显示多少行cell
+    
+    var selectedCell: CNDownSlideSingleCourseCell?
+    
+    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.
+    override var prefersStatusBarHidden: Bool {
+        return statusBarShouldBeHidden
+    }
+    
+    override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
+        return .slide
+    }
+    
+    var _downPath:String?
+    var downPath:String? {
+        get{
+            return _downPath
+        }
+        set{
+            _downPath = newValue!
+        }
+    }
+    
+    // MARK: - 懒加载
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.updateStatusBarAndTabbarFrame(visible: true)
+    }
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .white
+//        self.view.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+        view.addSubview(tableView)
+        tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-DownSlideBottomViewHeight-KStatusBarHeight)
+        self.getHomePageConfigListApi()
+    }
+    
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        //        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideCellIdentifier)
+        tableView.register(CNLiveHomePageDuanJuCell.self, forCellReuseIdentifier: kCNLiveHomePageDuanJuCellIdentifier)
+        
+        tableView.register(CNLiveDownSlideRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideRecommendCellIdentifier)
+        tableView.register(CNLiveDownSlideTodayRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier)
+        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideAllCourseCellIdentifier)
+        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier:kCNLiveDownSlideSingleCourseCellIdentifier)
+        tableView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+        return tableView
+    }()
+    
+    private func updateStatusBarAndTabbarFrame(visible: Bool) {
+        statusBarShouldBeHidden = !visible
+        UIView.animate(withDuration: 0.25) {
+            self.setNeedsStatusBarAppearanceUpdate()
+        }
+    }
+    
+    // MARK: - UITableViewDelegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        if self.isHaveDuanJU{
+            2
+        }else{
+            1
+        }
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if self.isHaveDuanJU && section == 0{
+            1
+        }else{
+            self.dataArray.count
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if self.isHaveDuanJU && indexPath.section == 0{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomePageDuanJuCellIdentifier) as? CNLiveHomePageDuanJuCell
+            else {
+                return CNLiveHomePageDuanJuCell()
+            }
+            return cell
+        }else{
+            let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+            
+            //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
+            if slideModel.type == SlideModelTypeRecommend4{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell
+                else {
+                    //                let cell = CNLiveDownSlideRecommendCell()
+                    //                cell.slideModel = slideModel
+                    return CNLiveDownSlideRecommendCell()
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeTodayRecommend74{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier) as? CNLiveDownSlideTodayRecommendCell
+                else {
+                    let cell = CNLiveDownSlideTodayRecommendCell()
+                    cell.slideModel = slideModel
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeAllCourse12{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideAllCourseCellIdentifier) as? CNDownSlideSingleCourseCell
+                else {
+                    let cell = CNDownSlideSingleCourseCell()
+                    cell.slideModel = slideModel
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeOneCourse75{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideSingleCourseCellIdentifier) as? CNDownSlideSingleCourseCell
+                else {
+                    let cell = CNDownSlideSingleCourseCell()
+                    cell.slideModel = slideModel
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else{
+                return UITableViewCell()
+            }
+        }
+    }
+    
+    
+    func tableView(_ tableView: UITableView, didHighlightRowAt indexPath: IndexPath) {
+        if self.isHaveDuanJU && indexPath.section == 0{
+
+        }else{
+            
+            guard let row = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+            UIView.animate(withDuration: 0.1) {
+                row.bgBackView.transform = CGAffineTransform(scaleX: 0.95, y: 0.95)
+            }
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didUnhighlightRowAt indexPath: IndexPath) {
+        if self.isHaveDuanJU && indexPath.section == 0{
+
+        }else{
+            
+            guard let row = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+            UIView.animate(withDuration: 0.3) {
+                row.bgBackView.transform = CGAffineTransform(scaleX: 1.0, y: 1.0)
+            }
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if self.isHaveDuanJU && indexPath.section == 0{
+
+        }else{
+            
+            let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+            //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
+            if slideModel.type == SlideModelTypeRecommend4{
+                
+            }else if slideModel.type == SlideModelTypeTodayRecommend74{
+                
+            }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))
+                detailVC.dismissClosure = { [weak self] in
+                    guard let StrongSelf = self else { return }
+                    StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+                }
+                updateStatusBarAndTabbarFrame(visible: false)
+                
+                present(detailVC, animated: true, completion: nil)
+            }else if slideModel.type == SlideModelTypeOneCourse75{
+                guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideSingleCourseCell else { return }
+                selectedCell = cell
+                
+                let detailVC = CNHomePageBaseNavigationController(rootViewController:CNHomepageDetailViewController(cell: cell,slideModel: slideModel))
+                
+                detailVC.dismissClosure = { [weak self] in
+                    guard let StrongSelf = self else { return }
+                    StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+                }
+                updateStatusBarAndTabbarFrame(visible: false)
+                present(detailVC, animated: true, completion: nil)
+            }
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if self.isHaveDuanJU && indexPath.section == 0{
+            return 300
+        }else{
+            let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+            return CGFloat(slideModel.cellH)
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0
+    }
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0
+    }
+    
+    //MARK: - 获取首页配置
+    func getHomePageConfigListApi(){
+        CNLiveHomePageViewModel.requestGetHomePageConfigList{ result, status in
+            if status == .success{
+                let dataModel = result as! CNLiveHomePageModel
+                let homePageListMdls = dataModel.list
+                for listModel in homePageListMdls {
+                    if listModel.type == 3{
+                        //在追短剧
+                        self.isHaveDuanJU = true
+                    }else if listModel.type == 1{
+                        //页面
+                        self.getPageApi(pageID: listModel.content)
+                    }
+                }
+            }else{
+                
+            }
+        }
+    }
+    
+    //我的专辑收藏--在追短剧
+    func getMyAlbumCollection(){
+        CNLiveHomePageViewModel.requestGetHomePage { result, status in
+            if status == .success{
+                
+            }else{
+                
+            }
+        }
+    }
+    
+    //MARK: - 网络请求获取区块详情页
+    func getPageApi(pageID:String)
+    {
+        //        showLoading(message: "")
+        CNLiveDownSlideViewModel.requestGetPage(pageId: pageID as NSString) { result, status in
+            hiddenLoading()
+            
+            if status == .success{
+                self.dataArray.removeAllObjects()
+                let array = result as! [Any]
+                let newDataArray = NSMutableArray()
+                for slideModel in array {
+                    if let model = slideModel as? CNLiveDownSlideModel{
+                        
+                        let layout = CNLiveDownSlideModelLayout.init(model: model)
+                        newDataArray.addObjects(from: [layout.getCellHModel()])
+                    }
+                }
+                self.dataArray.addObjects(from: newDataArray as! [Any])
+                
+                self.tableView.reloadData()
+            }else if (status == .failed){
+                //                self.NetApiStatus = .apiError
+            }else if (status == .noNetwork){
+                
+                //                self.NetApiStatus = .notNetwork
+            }
+        }
+        //
+    }
+}
+//
+//  CNHomePageAnimationTransition.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/5.
+//
+
+import Foundation
+import UIKit
+
+fileprivate let transitonDuration: TimeInterval = 1.0
+
+class CNHomePageAnimationTransition: NSObject {
+    let animationType: AnimationType!
+    
+    init(animationType: AnimationType) {
+        self.animationType = animationType
+        super.init()
+    }
+}
+
+extension CNHomePageAnimationTransition: UIViewControllerAnimatedTransitioning {
+    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
+        return transitonDuration
+    }
+    
+    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
+        if animationType == .present {
+            animationForPresent(using: transitionContext)
+        } else {
+            animationForDismiss(using: transitionContext)
+        }
+    }
+    
+    func animationForPresent(using transitionContext: UIViewControllerContextTransitioning) {
+        let containerView = transitionContext.containerView
+        //1.Get fromVC and toVC
+        guard let fromVCtemp = transitionContext.viewController(forKey: .from) as? CNLiveBaseTabBarViewController else { return }
+        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
+            
+        }) { (completed) in
+            transitionContext.completeTransition(completed)
+        }
+    }
+    
+    func animationForDismiss(using transitionContext: UIViewControllerContextTransitioning) {
+        guard let fromNaviVC = transitionContext.viewController(forKey: .from) as? CNHomePageBaseNavigationController else { return }
+        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
+            
+        }) { (completed) in
+            transitionContext.completeTransition(completed)
+        }
+    }
+    
+}
+//
+//  CNHomePageBaseNavigationController.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/5.
+//
+
+import Foundation
+class CNHomePageBaseNavigationController: UINavigationController
+    ,UIViewControllerTransitioningDelegate {
+    var dismissClosure: (()->())?
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        modalPresentationStyle = .custom
+        transitioningDelegate = self
+    }
+
+    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)
+    }
+}
+//
+//  CNHomepageDetailViewController.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/5.
+//  首页短剧--大图点击详情页
+
+import Foundation
+
+class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewDataSource, UITableViewDelegate{
+    
+    let kCNLiveAlbumImageCellIdentifier = "kCNLiveAlbumImageCellIdentifier"
+    let kCNLiveAlbumCellIdentifier = "kCNLiveAlbumCellIdentifier"
+
+    // 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.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLiveAlbumCell.self, forCellReuseIdentifier: kCNLiveAlbumCellIdentifier)
+        tableView.register(CNLiveAlbumImageCell.self, forCellReuseIdentifier: kCNLiveAlbumImageCellIdentifier)
+        return tableView
+    }()
+    
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+        }
+    }
+    
+    var dismissClosure: (()->())?
+    //the point when start to interactive
+    var interactiveStartingPoint: CGPoint? = nil
+
+    var draggingDownToDismiss = false
+    
+    let cell: CNDownSlideSingleCourseCell!
+    
+    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 scrollView: CNUpSlideDetailScrollView = {
+        let frame = self.view.bounds
+        let view = CNUpSlideDetailScrollView(frame: frame)
+        view.callBack = {(contentMdl:CNLiveDownSlideContentsModel)->Void in
+            CNLiveDownSlideTool.detailPushWebVCWithContentsMdl(contentMdl: contentMdl, viewController: self)
+        }
+        view.delegate = self
+        return view
+    }()
+    
+    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: CNDownSlideSingleCourseCell,slideModel:CNLiveDownSlideModel) {
+        self.cell = cell
+        super.init(nibName: nil, bundle: nil)
+        self.slideModel = slideModel
+        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()
+        getImageFromCell()
+        self.getBlockContents()
+    }
+    
+    private func setupUI() {
+        self.view.layer.masksToBounds = true
+//        view.addSubview(scrollView)
+//        scrollView.slideModel = _slideModel
+        self.view.addSubview(self.tableView)
+        self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
+        view.addSubview(closeBtn)
+        view.addGestureRecognizer(dismissPanGesture)
+        
+        if #available(iOS 11.0, *) {
+            scrollView.contentInsetAdjustmentBehavior = .never
+        } else {
+            automaticallyAdjustsScrollViewInsets = false
+        }
+    }
+    
+    private func getImageFromCell() {
+        scrollView.imageView.image = cell.bgImageView.image
+    }
+    
+    @objc private func closeAction() {
+        dismiss(animated: true, completion: nil)
+        let nav = self.navigationController as! 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 {
+        
+//        let goodsModel = self.dataArray[indexPath.row] as! CNLiveShopGoodsListModel
+        if indexPath.section == 0{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
+            else {
+                let cell = CNLiveAlbumImageCell()
+                return cell
+            }
+            cell.iconImgView.image = self.cell.bgImageView.image
+            return cell
+        }else{
+            let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
+
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumCellIdentifier) as? CNLiveAlbumCell
+            else {
+                let cell = CNLiveAlbumCell()
+                return cell
+            }
+            cell.albumModel = albumModel
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0{
+            return KSreenWidth
+        }else{
+            return 75
+        }
+    }
+    
+    // MARK: - 获取全部专辑列表
+    func getBlockContents(){
+        CNLiveHomePageViewModel.getBlockContents(blockId: self.slideModel!.blockId ?? "") { result, status in
+            if status == .success{
+                let albumArr = result as! Array<CNLiveAlbumModel>
+                self.dataArray = NSMutableArray(array: albumArr)
+                self.tableView.reloadData()
+            }else{
+                
+            }
+        }
+    }
+    
+    @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:
+            scrollView.isScrollEnabled = false
+            gesture.view?.transform = CGAffineTransform(scaleX: currentScale, y: currentScale)
+            gesture.view?.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius * (progress)
+            scrollView.showsVerticalScrollIndicator = false
+        case .cancelled,.ended:
+            scrollView.isScrollEnabled = true
+            stopDismissPanGesture(gesture)
+        default:
+            break
+        }
+    }
+    
+    //当下拉Offset超过100或取消下拉手势时，执行此方法
+    private func stopDismissPanGesture(_ gesture: UIPanGestureRecognizer) {
+        draggingDownToDismiss = false
+        interactiveStartingPoint = nil
+        scrollView.showsVerticalScrollIndicator = true
+        
+        UIView.animate(withDuration: 0.2) {
+            gesture.view?.transform = CGAffineTransform.identity
+        }
+    }
+
+}
+
+extension CNHomepageDetailViewController: 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 CNHomepageDetailViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        
+        if scrollView.contentOffset.y < 0 {
+            scrollView.contentOffset = .zero
+            draggingDownToDismiss = true
+        }
+    }
+}
+
+extension CNHomepageDetailViewController: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+}
-//
-//  CNLiveAuthViewController.swift
-//  metaCode
-//
-//  Created by zx on 2023/12/28.
-//
-
-import Foundation
-
-class CNLiveAuthViewController:CNLiveBaseViewController{
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.view.backgroundColor = .white
-    }
-    
-    
-}
+//
+//  CNLivePlayletHomePageController.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/4.
+//  短剧主页
+
+import Foundation
+
+class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+    
+    let kCNLivePlayletCellIdentifier = "kCNLivePlayletCellIdentifier"
+    let kCNLivePlayletHeaderCellIdentifier = "kCNLivePlayletHeaderCellIdentifier"
+
+    // 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.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.register(CNLivePlayletHomePageCell.self, forCellReuseIdentifier: kCNLivePlayletCellIdentifier)
+        tableView.register(CNLivePlayletHomePageHeaderCell.self, forCellReuseIdentifier: kCNLivePlayletHeaderCellIdentifier)
+        return tableView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.setUI()
+    }
+    func setUI(){
+        navigationBarHidden = false
+        self.view.addSubview(self.tableView)
+        self.tableView.frame = CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight)
+    }
+    func numberOfSections(in tableView: UITableView) -> Int {
+        2
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0{
+            return 1
+        }
+        return 30 //self.dataArray.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
+            }
+
+            return cell
+        }else{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLivePlayletCellIdentifier) as? CNLivePlayletHomePageCell
+            else {
+                let cell = CNLivePlayletHomePageCell()
+                return cell
+            }
+            cell.iconImgView.backgroundColor = .red
+            return cell
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0{
+            return 300
+        }else{
+            return 100
+        }
+    }
+}
+//
+//  CNLiveAlbumListModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/8.
+//  专辑视频列表详情(播放地址 ,点赞数等信息)
+
+import Foundation
+
+class CNLiveAlbumListModel:BaseModel{
+    var title = ""
+    var shortTitle = ""
+    var subTitle = ""
+    var product:CNLiveAlbumProductModel?
+    var poster = ""
+    var model = ""
+    var thirdUrl = ""
+    var colours = ""
+    var address = ""
+    var contentId = ""
+    var source = ""
+    var sourceName = ""
+    var pid = ""
+    var witnessId = ""
+    var videoUrl = ""
+    var duration = ""
+    var number = ""
+    var goods = ""
+    var icon : CNLiveAlbumListIconModel?
+    var time = ""
+    var tagId = ""
+    var tagName = ""
+    var tool :CNLiveAlbumListToolModel?
+    var activityEndTime = ""
+    var h5Url = ""
+    var shareUrl = ""
+    var album:CNLiveAlbumListAlbumModel?
+    var block = ""
+    var isHorizontalScreen = ""
+    var videoShowType = ""
+    //非接口数据
+    var albumMsgModel:CNLiveAlbumMsgModel?
+}
+class CNLiveAlbumListIconModel:BaseModel{
+    var face = ""
+    var id = ""
+    var name = ""
+    var type = ""
+    var desc = ""
+    var focused = false
+    var fansNum = ""
+    var authInfos = ""
+}
+class CNLiveAlbumListToolModel:BaseModel{
+    var commentsNum = ""
+    var commentList = ""
+    var collectioned = false
+    var likeList = ""
+    var liked = false
+    var likesNum = ""
+    var voteNum = ""
+    var shareNum = ""
+    var playNum = ""
+    var collectionNum = ""
+    var sort = ""
+    var voted = false
+}
+class CNLiveAlbumListAlbumModel:BaseModel{
+    var albumId = ""
+    var icon = ""
+    var name = ""
+    var model = ""
+    var product:CNLiveAlbumProductModel?
+}
+
+//
+//  CNLiveAlbumModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/8.
+//  全部专辑列表数据
+
+import Foundation
+
+class CNLiveAlbumModel:BaseModel{
+    var title = ""
+    var subTitle = ""
+    var poster = ""
+    var contentId = ""
+    var pid = ""
+    var tag = ""
+    var model = ""
+    var thirdUrl = ""
+    var publishTime = ""
+    var shareUrl = ""
+    var spIcon = ""
+    var product:CNLiveAlbumProductModel?
+    //还有部分属性没写
+}
+class CNLiveAlbumProductModel:BaseModel{
+    var productId = ""
+    var productTitle = ""
+    var productImg = ""
+    var albumProductType = ""
+    var productType = ""
+    var androidRmb = ""
+    var androidOriginalRmb = ""
+    var iosOriginalRmb = ""
+    var iosRmb = ""
+    var point = ""
+    var promCode = ""
+    var orderingGuide = ""
+    var activityDesc = ""
+    var siteId = ""
+    var validPeriod = ""
+    var expiryDate = ""
+    var effectiveDate = ""
+    var check = false
+}
+
+
+//
+//  CNLiveAlbumMsgModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/8.
+//  专辑简介详情
+
+import Foundation
+
+class CNLiveAlbumMsgModel:BaseModel{
+    var albumId = ""
+    var albumImg = ""
+    var albumName = ""
+    var product:CNLiveAlbumProductModel?
+    var desc = ""
+    var descImg = ""
+    var subTitle = ""
+    var actor = ""
+    var actorName = ""
+    var time = ""
+    var spIcon = ""
+    var siteId = ""
+    var episodeNow = ""
+    var episodeAll = ""
+    var subscriptions = ""
+    var subscribe = false
+    var episodeLast = ""
+    var contentIdLast = ""
+    var collection = false //是否追剧
+}
+//
+//  CNLiveHomePageModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/8.
+//  首页model
+
+import Foundation
+
+class CNLiveHomePageModel:BaseModel{
+    var endRow = 0
+    var firstPage = 0
+    var hasNextPage = false
+    var hasPreviousPage = false
+    var isFirstPage = true
+    var isLastPage = true
+    var lastPage = 0
+    var list = [CNLiveHomePageListModel]()
+    var navigateFirstPage = 0
+    var navigateLastPage = 0
+    var navigatePages = 0
+    var navigatepageNums:Array<Any> = []
+    var nextPage = 0
+    var pageNum = 0
+    var pageSize = 0
+    var pages = 0
+    var prePage = 0
+    var size = 0
+    var startRow = 0
+    var total = 0
+}
+
+class CNLiveHomePageListModel:BaseModel{
+    var enable = true
+    var content = ""//页面id    h5地址   type=3时 content为空
+    var sort = 0
+    var createTime = ""
+    var id = ""
+    var updateTime = ""
+    var type = 0//1页面 2h5 3在追短剧
+}
+//
+//  CNLiveHomePageDuanJuCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/8.
+//  首页-在追短剧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
+
+class CNLiveHomePageDuanJuCell:UITableViewCell{
+        
+    let bgBackView = UIView()
+    let bgImageView = UIImageView()
+
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+            self.setupNewUI(model: _slideModel!)
+        }
+    }
+    
+    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 = 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)
+        }
+    }
+    
+    //MARK: - 事件
+    @objc func enterBtnAction(_ sender: UIButton){
+        let tag = sender.tag
+        let contentMdl = self.slideModel?.contents[tag]
+        CNLiveDownSlideTool.pushWebVCWithContentsMdl(contentMdl: contentMdl!)
+    }
+}
+//
+//  CNLiveAlbumCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/8.
+//
+
+import Foundation
+import QMUIKit
+class CNLiveAlbumCell:UITableViewCell{
+    
+    var albumModelArr:Array<CNLiveAlbumListModel>?
+    //AlbumModel
+    var _albumModel : CNLiveAlbumModel?
+    var albumModel : CNLiveAlbumModel? {
+        get{
+            _albumModel
+        }
+        set{
+            _albumModel = newValue!
+            
+            self.setupNewUI(model: _albumModel!)
+        }
+    }
+    //MARK: - 懒加载
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 15, width: 45, height: 45))
+        iconImgView.layer.cornerRadius = 5
+        iconImgView.clipsToBounds = true
+        return iconImgView
+    }()
+    ///标题
+    lazy var titleLabl: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, 15, KSreenWidth-(self.iconImgView.right+15)-80, 21))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_15
+        titleLabel.text = "啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊"
+        return titleLabel
+    }()
+    ///副标题
+    lazy var subTitleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.titleLabl.bottom+5, 60, 17))
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_12
+        titleLabel.text = "共68集"
+        return titleLabel
+    }()
+    lazy var playBtn: QMUIButton = {
+        let playBtn = QMUIButton.init(type: .custom)
+        playBtn.frame = CGRect(x: KSreenWidth-80, y: 0, width: 65, height: 26)
+        playBtn.centerY = self.iconImgView.centerY
+        playBtn.layer.cornerRadius = 13
+        playBtn.clipsToBounds = true
+        playBtn.setTitle("播放", for: .normal)
+        playBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        playBtn.backgroundColor = HexColor("#609AFF")
+        playBtn.titleLabel?.font = Font_13
+        playBtn.addTarget(self, action: #selector(playBtnAction), for: .touchUpInside)
+        return playBtn
+    }()
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.contentView.addSubview(self.iconImgView)
+        self.contentView.addSubview(self.titleLabl)
+        self.contentView.addSubview(self.subTitleLabel)
+        self.contentView.addSubview(self.playBtn)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    func setupNewUI(model:CNLiveAlbumModel){
+        self.titleLabl.text = model.title
+        self.subTitleLabel.text = model.subTitle
+        self.iconImgView.kf.setImage(with: URL(string: model.poster))
+    }
+    @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 getAlbumList(){
+        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{
+                
+            }
+        }
+    }
+}
+//
+//  CNLiveAlbumImageCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/8.
+//
+
+import Foundation
+
+class CNLiveAlbumImageCell:UITableViewCell{
+    
+    //MARK: - 懒加载
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenWidth))
+        return iconImgView
+    }()
+    
+    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 = HexColor(kCNDownSlideBackgroundColorHex)
+        self.contentView.addSubview(self.iconImgView)
+    }
+    
+    
+}
+//
+//  CNLivePlayletHomePageCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/4.
+//
+
+import Foundation
+import QMUIKit
+class CNLivePlayletHomePageCell:UITableViewCell{
+    //MARK: - 懒加载
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 20, y: 10, width: 60, height: 90))
+        return iconImgView
+    }()
+    ///标题
+    lazy var titleLabl: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, 15, KSreenWidth-(self.iconImgView.right+15)-10, 21))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_15
+        titleLabel.numberOfLines = 2
+        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))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_15
+        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.addSubview(self.titleLabl)
+        self.addSubview(self.timeLabel)
+        self.addSubview(self.likeBtn)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+//
+//  CNLivePlayletHomePageHeaderCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/4.
+//  短剧主页-头视图Cell
+
+import Foundation
+import QMUIKit
+import SwiftUI
+import SnapKit
+class CNLivePlayletHomePageHeaderCell:UITableViewCell{
+    //MARK: - 懒加载
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 20, y: 20, width: 100, height: 100))
+        return iconImgView
+    }()
+    ///标题
+    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))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_20
+        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")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_15
+        titleLabel.text = "45集"
+        let height = titleLabel.qmui_lineHeight
+        titleLabel.height = height
+        return titleLabel
+    }()
+    ///简介
+    lazy var jianjieLabel: UILabel = {
+        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.numberOfLines = 0
+        var lines = titleLabel.getRealLabelTextLines()
+        let height = titleLabel.qmui_lineHeight
+        if lines > 2 {
+            lines = 2
+        }
+        titleLabel.height = height*CGFloat(lines)
+        return titleLabel
+    }()
+    //展开,收起
+    lazy var expandBtn: UIButton = {
+        let expandBtn = UIButton.init(type: .custom)
+        expandBtn.backgroundColor = .white
+        
+        expandBtn.frame = CGRect(x: self.jianjieLabel.right-60, y: self.jianjieLabel.bottom, width: 60, height: 30)
+        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.setupButtonImageAndTitlePossitionWith(padding: 5, style: .right)
+        expandBtn.addTarget(self, action: #selector(expandBtnAction), for: .touchUpInside)
+        return expandBtn
+    }()
+    //追剧|已追剧
+    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.clipsToBounds = true
+        followBtn.addTarget(self, action: #selector(followBtnAction), for: .touchUpInside)
+        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.clipsToBounds = true
+        paymentBtn.addTarget(self, action: #selector(paymentBtnAction), for: .touchUpInside)
+        return paymentBtn
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.setUI()
+    }
+    
+    func setUI(){
+        self.contentView.addSubview(self.iconImgView)
+        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)
+        
+        let lines = jianjieLabel.getRealLabelTextLines()
+        if lines <= 2{
+            self.expandBtn.isHidden = true
+        }else{
+            self.expandBtn.isHidden = false
+        }
+        
+        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)
+        }
+        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)
+        }
+        
+        self.iconImgView.backgroundColor = .red
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - Action
+    @objc func expandBtnAction(button:UIButton){
+        button.isSelected = !button.isSelected
+        let lines = jianjieLabel.getRealLabelTextLines()
+        let height = jianjieLabel.qmui_lineHeight
+
+        if button.isSelected{
+            //文本收起状态,点击展开
+            self.jianjieLabel.height = CGFloat(lines)*height
+        }else{
+            //文本展开状态,点击收起
+            self.jianjieLabel.height = 2*height
+        }
+        self.expandBtn.top = self.jianjieLabel.bottom
+
+    }
+    @objc func followBtnAction(button:UIButton){
+        button.isSelected = !button.isSelected
+
+    }
+    @objc func paymentBtnAction(button:UIButton){
+        button.isSelected = !button.isSelected
+
+    }
+    
+}
+
+//
+//  CNLiveHomePageViewModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/8.
+//
+
+import Foundation
+import CNLiveRequestBastKit
+
+class CNLiveHomePageViewModel:NSObject{
+    
+    /// 获取首页原生页面数据
+    static func requestGetHomePageConfigList( resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/commonApi/homePageConfigList", 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") {
+                    let dataDic = resp["data"] as! Dictionary<String, Any>
+                    let dataMdl = newDictionaryToModel(dataDic, CNLiveHomePageModel.self)
+                    
+                    resultBlock(dataMdl,.success)
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+    /// 获取首页我的专辑收藏数据
+    static func requestGetHomePage(resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue("1", forKey: "page")
+        param.setValue("50", forKey: "pageSize")
+
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/myAlbum", 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") {
+                    let dataDic = resp["data"] as! Dictionary<String, Any>
+                    let dataMdl = newDictionaryToModel(dataDic, CNLiveHomePageModel.self)
+                    
+                    resultBlock(dataMdl,.success)
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+    /// 获取首页-全部专辑列表
+    static func getBlockContents(blockId:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(blockId, forKey: "blockId")
+        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
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let dataDic = resp["data"] as! Dictionary<String, Any>
+                    let dataList = dataDic["list"] as! Array<Any>
+                    var listArr = Array<Any>()
+                    for listDic in dataList{
+                        let dataMdl = newDictionaryToModel(listDic as! [String : Any], CNLiveAlbumModel.self)
+                        listArr.append(dataMdl)
+                    }
+                    
+                    resultBlock(listArr,.success)
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+    
+    /// 获取首页-专辑详情简介
+    static func getAlbumMsg(aid:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(aid, forKey: "aid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getAlbumMsg", 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") {
+                    let dataDic = resp["data"] as! Dictionary<String, Any>
+                    let dataMdl = newDictionaryToModel(dataDic, CNLiveAlbumMsgModel.self)
+                    
+                    resultBlock(dataMdl,.success)
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+    
+    /// 获取首页-专辑视频列表详情
+    static func getAlbumList(aid:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(aid, forKey: "aid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/ugcApi/albumList", 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") {
+                    let dataDic = resp["data"] as! Dictionary<String, Any>
+                    let dataList = dataDic["list"] as! Array<Any>
+                    var listArr = Array<Any>()
+                    for listDic in dataList{
+                        let dataMdl = newDictionaryToModel(listDic as! [String : Any], CNLiveAlbumListModel.self)
+                        listArr.append(dataMdl)
+                    }
+                    
+                    resultBlock(listArr,.success)
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+}