no message

“张旭”
1 parent 4dee6c1d
Showing 27 changed files with 4108 additions and 39 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Config/CNLiveConfigstant.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNHomeWebViewController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideBannerCell.swift
metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumListModel.swift
metaCode/Classes/Main/HomePages/Model/CNLiveHomePageModel.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveHomeLanmuController.swift
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveHomeMoreController.swift
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveHomeSearchController.swift
@@ -36,7 +36,9 @@ target &#39;metaCode&#39; do
   #七牛
   pod 'Qiniu'
   #支付组件
-  pod 'CNLivePayCostModule'
+#  pod 'CNLivePayCostModule'
+  pod 'CNLivePayCostModule','0.1.8'
+#  pod 'AlipaySDK-iOS', '~> 15.8.30'
   #加载GIF
   pod 'SwiftGifOrigin', '~> 1.7.0'
   #数据库存储
@@ -7,6 +7,10 @@
 	objects = {
  
 /* Begin PBXBuildFile section */
+		19023DB52D801EF700872398 /* CNLiveHomeLanmuController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19023DB42D801EF700872398 /* CNLiveHomeLanmuController.swift */; };
+		19023DB72D80339800872398 /* CNLiveHomeLanmuThreeImgCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19023DB62D80339800872398 /* CNLiveHomeLanmuThreeImgCell.swift */; };
+		19023DBB2D8270DA00872398 /* CNLiveHomeShopCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19023DBA2D8270DA00872398 /* CNLiveHomeShopCategoryCell.swift */; };
+		19023DBD2D8282DE00872398 /* CNLiveHomeShopCategoryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19023DBC2D8282DE00872398 /* CNLiveHomeShopCategoryModel.swift */; };
 		1909DC962C6309EC001E7986 /* CNLiveDigitalResumePreViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1909DC952C6309EC001E7986 /* CNLiveDigitalResumePreViewController.swift */; };
 		1909DC982C6342C4001E7986 /* CNLiveDigitalThreeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1909DC972C6342C3001E7986 /* CNLiveDigitalThreeCell.swift */; };
 		1909DC9B2C634D6F001E7986 /* CNLiveDigitalThreeCerCollectCell .swift in Sources */ = {isa = PBXBuildFile; fileRef = 1909DC9A2C634D6F001E7986 /* CNLiveDigitalThreeCerCollectCell .swift */; };
@@ -101,6 +105,10 @@
 		192ED4872C575EC90057244C /* CNLiveVitaeAddWorkFirCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4862C575EC90057244C /* CNLiveVitaeAddWorkFirCell.swift */; };
 		192ED48A2C5771930057244C /* CNLiveVitaeAddWorkSecCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED4892C5771930057244C /* CNLiveVitaeAddWorkSecCell.swift */; };
 		192ED48C2C57719F0057244C /* CNLiveVitaeAddWorkThreeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192ED48B2C57719F0057244C /* CNLiveVitaeAddWorkThreeCell.swift */; };
+		192FDB002D8BEEB300F8723D /* CNLiveVodCellBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192FDAFF2D8BEEB300F8723D /* CNLiveVodCellBottomView.swift */; };
+		192FDB022D8BF38500F8723D /* CNLiveVodTrailerExpandCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192FDB012D8BF38500F8723D /* CNLiveVodTrailerExpandCell.swift */; };
+		192FDB042D8D0B6000F8723D /* CNLiveVodShopExpandCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192FDB032D8D0B6000F8723D /* CNLiveVodShopExpandCell.swift */; };
+		192FDB062D8D0B7E00F8723D /* CNLiveVodShopBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192FDB052D8D0B7E00F8723D /* CNLiveVodShopBottomView.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 */; };
@@ -137,8 +145,31 @@
 		194134962C2412C7004FC047 /* CNLiveRealManageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194134952C2412C7004FC047 /* CNLiveRealManageCell.swift */; };
 		194134982C292199004FC047 /* CNLiveIdentityRepositoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194134972C292199004FC047 /* CNLiveIdentityRepositoryController.swift */; };
 		1941349A2C294A78004FC047 /* CNLiveIdentityResTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194134992C294A78004FC047 /* CNLiveIdentityResTableCell.swift */; };
+		19416F822D3F9B3000ACD0A7 /* CNLiveTVPlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19416F812D3F9B3000ACD0A7 /* CNLiveTVPlayerViewController.swift */; };
 		194455A12B6B3310006C5A2A /* CNWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194455A02B6B3310006C5A2A /* CNWebView.swift */; };
+		1947297B2D6D8EF500E55857 /* CNLivePlayerTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1947297A2D6D8EF500E55857 /* CNLivePlayerTool.swift */; };
 		195226792C294C8E00CB0707 /* CNLiveIdentityResThreeCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195226782C294C8E00CB0707 /* CNLiveIdentityResThreeCollectCell.swift */; };
+		195650B52D7047C500818FC8 /* CNLiveZFPlayerControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650B42D7047C500818FC8 /* CNLiveZFPlayerControlView.swift */; };
+		195650BB2D71B12B00818FC8 /* CNLiveVodPlayModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650BA2D71B12B00818FC8 /* CNLiveVodPlayModel.swift */; };
+		195650BD2D7298E800818FC8 /* CNLiveVodAlbumMsgModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650BC2D7298E800818FC8 /* CNLiveVodAlbumMsgModel.swift */; };
+		195650BF2D73000900818FC8 /* CNLiveVodAlbumListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650BE2D73000900818FC8 /* CNLiveVodAlbumListModel.swift */; };
+		195650C32D7543A500818FC8 /* CNLiveVodIntroductionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650C22D7543A500818FC8 /* CNLiveVodIntroductionCell.swift */; };
+		195650C72D769B2A00818FC8 /* CNLiveVodAlbumListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650C62D769B2A00818FC8 /* CNLiveVodAlbumListCell.swift */; };
+		195650C92D769CEA00818FC8 /* CNLiveVodTrailersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650C82D769CEA00818FC8 /* CNLiveVodTrailersCell.swift */; };
+		195650CB2D76A36300818FC8 /* CNLiveVodPlayShopCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650CA2D76A36300818FC8 /* CNLiveVodPlayShopCell.swift */; };
+		195650CD2D76C45400818FC8 /* CNLiveVodAlbumListCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650CC2D76C45400818FC8 /* CNLiveVodAlbumListCollectionCell.swift */; };
+		195650CF2D77023A00818FC8 /* CNLiveVodTrailersCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650CE2D77023A00818FC8 /* CNLiveVodTrailersCollectionCell.swift */; };
+		195650D12D77E33E00818FC8 /* CNLiveVodPlayShopCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650D02D77E33E00818FC8 /* CNLiveVodPlayShopCollectionCell.swift */; };
+		195650D32D79804400818FC8 /* CNLiveHomeTwoShopCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650D22D79804400818FC8 /* CNLiveHomeTwoShopCell.swift */; };
+		195650D62D7A9B5700818FC8 /* CNLiveHomeSearchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650D52D7A9B5700818FC8 /* CNLiveHomeSearchController.swift */; };
+		195650D82D7BD6E500818FC8 /* CNLiveHomeSearchHistoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650D72D7BD6E500818FC8 /* CNLiveHomeSearchHistoryCell.swift */; };
+		195650DA2D7BD72E00818FC8 /* CNLiveHomeSearchHotCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650D92D7BD72E00818FC8 /* CNLiveHomeSearchHotCell.swift */; };
+		195650DD2D7BDA9F00818FC8 /* CNLiveHomeSearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650DC2D7BDA9F00818FC8 /* CNLiveHomeSearchViewModel.swift */; };
+		195650DF2D7BE18200818FC8 /* CNLiveHomeSearchHotModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650DE2D7BE18200818FC8 /* CNLiveHomeSearchHotModel.swift */; };
+		195650E12D7C098900818FC8 /* CNLiveHomeSearchHistoryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650E02D7C098900818FC8 /* CNLiveHomeSearchHistoryModel.swift */; };
+		195650E32D7C201600818FC8 /* CNLiveSearchHistoryFloatLayoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650E22D7C201600818FC8 /* CNLiveSearchHistoryFloatLayoutView.swift */; };
+		195650E52D7E8C9400818FC8 /* CNLiveHomeSearchResultJuJiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650E42D7E8C9400818FC8 /* CNLiveHomeSearchResultJuJiCell.swift */; };
+		195650E72D7E8CF300818FC8 /* CNLiveHomeSearchResultDuanJuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195650E62D7E8CF300818FC8 /* CNLiveHomeSearchResultDuanJuCell.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 */; };
@@ -148,6 +179,18 @@
 		19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565ECC2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift */; };
 		19565ECF2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565ECE2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift */; };
 		19565ED42AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565ED32AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift */; };
+		1958B4142D83D2BA00F37E35 /* CNLiveHomeMoreController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1958B4132D83D2BA00F37E35 /* CNLiveHomeMoreController.swift */; };
+		1958B4162D83F45200F37E35 /* CNLiveHomeTwoHengTuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1958B4152D83F45200F37E35 /* CNLiveHomeTwoHengTuCell.swift */; };
+		1958B4182D8572A200F37E35 /* CNLiveMinePlayHistoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1958B4172D8572A200F37E35 /* CNLiveMinePlayHistoryCell.swift */; };
+		1958B41A2D8572C100F37E35 /* CNLiveMineMineOrderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1958B4192D8572C100F37E35 /* CNLiveMineMineOrderCell.swift */; };
+		1958B41C2D87BD3E00F37E35 /* CNLiveMinePlayHistoryCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1958B41B2D87BD3E00F37E35 /* CNLiveMinePlayHistoryCollectionCell.swift */; };
+		1958B41E2D8A98CB00F37E35 /* CNLiveVodPlayViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1958B41D2D8A98CA00F37E35 /* CNLiveVodPlayViewModel.swift */; };
+		196211DF2D64869A001925EC /* CNLiveHomeYingshiBannerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196211DE2D648699001925EC /* CNLiveHomeYingshiBannerCell.swift */; };
+		196211E12D66BCDE001925EC /* CNLiveHomeLanmuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196211E02D66BCDE001925EC /* CNLiveHomeLanmuCell.swift */; };
+		196211E32D66D36A001925EC /* CNLiveHomeOneBigTwoSmallCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196211E22D66D36A001925EC /* CNLiveHomeOneBigTwoSmallCell.swift */; };
+		196211E52D66F5E6001925EC /* CNLiveHomeADCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196211E42D66F5E6001925EC /* CNLiveHomeADCell.swift */; };
+		196211E72D66F828001925EC /* CNLiveHomeTwoDuanjuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196211E62D66F828001925EC /* CNLiveHomeTwoDuanjuCell.swift */; };
+		196211E92D686C03001925EC /* CNLiveHomeFollowCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 196211E82D686C03001925EC /* CNLiveHomeFollowCell.swift */; };
 		1965FA3E2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA3D2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift */; };
 		1965FA402AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */; };
 		1965FA422AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */; };
@@ -160,6 +203,7 @@
 		197563772C5C80D9004E0F42 /* HeroNetworkImageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197563762C5C80D9004E0F42 /* HeroNetworkImageProvider.swift */; };
 		19864E3F2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */; };
 		19864E412BF6090400586E72 /* CNLiveDuanJuDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19864E402BF6090400586E72 /* CNLiveDuanJuDetailCell.swift */; };
+		19A8CD142D62DC3700509BCD /* CNLiveTVHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A8CD132D62DC3700509BCD /* CNLiveTVHomeViewController.swift */; };
 		19AB90642BB412C700B6A79B /* CNLiveDownslideOperationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AB90632BB412C700B6A79B /* CNLiveDownslideOperationManager.swift */; };
 		19AD65AA2BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */; };
 		19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */; };
@@ -169,6 +213,7 @@
 		19B153CF2BC540FF0018906C /* CNLivePayOrderInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */; };
 		19B153D22BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */; };
 		19B153D42BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */; };
+		19B711872D55FE130000872A /* CNLiveDownSlideBannerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B711862D55FE130000872A /* CNLiveDownSlideBannerCell.swift */; };
 		19BAF0342C7831DB00BD7CC0 /* CNLiveDigitalResumePreviewFourWorkAwardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BAF0332C7831DB00BD7CC0 /* CNLiveDigitalResumePreviewFourWorkAwardCell.swift */; };
 		19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */; };
 		19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */; };
@@ -361,6 +406,10 @@
  
 /* Begin PBXFileReference section */
 		170BC5D0622EA2969D110A3B /* Pods-metaCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode.release.xcconfig"; path = "Target Support Files/Pods-metaCode/Pods-metaCode.release.xcconfig"; sourceTree = "<group>"; };
+		19023DB42D801EF700872398 /* CNLiveHomeLanmuController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeLanmuController.swift; sourceTree = "<group>"; };
+		19023DB62D80339800872398 /* CNLiveHomeLanmuThreeImgCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeLanmuThreeImgCell.swift; sourceTree = "<group>"; };
+		19023DBA2D8270DA00872398 /* CNLiveHomeShopCategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeShopCategoryCell.swift; sourceTree = "<group>"; };
+		19023DBC2D8282DE00872398 /* CNLiveHomeShopCategoryModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeShopCategoryModel.swift; sourceTree = "<group>"; };
 		1909DC952C6309EC001E7986 /* CNLiveDigitalResumePreViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalResumePreViewController.swift; sourceTree = "<group>"; };
 		1909DC972C6342C3001E7986 /* CNLiveDigitalThreeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalThreeCell.swift; sourceTree = "<group>"; };
 		1909DC9A2C634D6F001E7986 /* CNLiveDigitalThreeCerCollectCell .swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CNLiveDigitalThreeCerCollectCell .swift"; sourceTree = "<group>"; };
@@ -455,6 +504,10 @@
 		192ED4862C575EC90057244C /* CNLiveVitaeAddWorkFirCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVitaeAddWorkFirCell.swift; sourceTree = "<group>"; };
 		192ED4892C5771930057244C /* CNLiveVitaeAddWorkSecCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVitaeAddWorkSecCell.swift; sourceTree = "<group>"; };
 		192ED48B2C57719F0057244C /* CNLiveVitaeAddWorkThreeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVitaeAddWorkThreeCell.swift; sourceTree = "<group>"; };
+		192FDAFF2D8BEEB300F8723D /* CNLiveVodCellBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodCellBottomView.swift; sourceTree = "<group>"; };
+		192FDB012D8BF38500F8723D /* CNLiveVodTrailerExpandCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodTrailerExpandCell.swift; sourceTree = "<group>"; };
+		192FDB032D8D0B6000F8723D /* CNLiveVodShopExpandCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodShopExpandCell.swift; sourceTree = "<group>"; };
+		192FDB052D8D0B7E00F8723D /* CNLiveVodShopBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodShopBottomView.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>"; };
@@ -491,8 +544,31 @@
 		194134952C2412C7004FC047 /* CNLiveRealManageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRealManageCell.swift; sourceTree = "<group>"; };
 		194134972C292199004FC047 /* CNLiveIdentityRepositoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveIdentityRepositoryController.swift; sourceTree = "<group>"; };
 		194134992C294A78004FC047 /* CNLiveIdentityResTableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveIdentityResTableCell.swift; sourceTree = "<group>"; };
+		19416F812D3F9B3000ACD0A7 /* CNLiveTVPlayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTVPlayerViewController.swift; sourceTree = "<group>"; };
 		194455A02B6B3310006C5A2A /* CNWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNWebView.swift; sourceTree = "<group>"; };
+		1947297A2D6D8EF500E55857 /* CNLivePlayerTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePlayerTool.swift; sourceTree = "<group>"; };
 		195226782C294C8E00CB0707 /* CNLiveIdentityResThreeCollectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveIdentityResThreeCollectCell.swift; sourceTree = "<group>"; };
+		195650B42D7047C500818FC8 /* CNLiveZFPlayerControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveZFPlayerControlView.swift; sourceTree = "<group>"; };
+		195650BA2D71B12B00818FC8 /* CNLiveVodPlayModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodPlayModel.swift; sourceTree = "<group>"; };
+		195650BC2D7298E800818FC8 /* CNLiveVodAlbumMsgModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodAlbumMsgModel.swift; sourceTree = "<group>"; };
+		195650BE2D73000900818FC8 /* CNLiveVodAlbumListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodAlbumListModel.swift; sourceTree = "<group>"; };
+		195650C22D7543A500818FC8 /* CNLiveVodIntroductionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodIntroductionCell.swift; sourceTree = "<group>"; };
+		195650C62D769B2A00818FC8 /* CNLiveVodAlbumListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodAlbumListCell.swift; sourceTree = "<group>"; };
+		195650C82D769CEA00818FC8 /* CNLiveVodTrailersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodTrailersCell.swift; sourceTree = "<group>"; };
+		195650CA2D76A36300818FC8 /* CNLiveVodPlayShopCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodPlayShopCell.swift; sourceTree = "<group>"; };
+		195650CC2D76C45400818FC8 /* CNLiveVodAlbumListCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodAlbumListCollectionCell.swift; sourceTree = "<group>"; };
+		195650CE2D77023A00818FC8 /* CNLiveVodTrailersCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodTrailersCollectionCell.swift; sourceTree = "<group>"; };
+		195650D02D77E33E00818FC8 /* CNLiveVodPlayShopCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodPlayShopCollectionCell.swift; sourceTree = "<group>"; };
+		195650D22D79804400818FC8 /* CNLiveHomeTwoShopCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeTwoShopCell.swift; sourceTree = "<group>"; };
+		195650D52D7A9B5700818FC8 /* CNLiveHomeSearchController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeSearchController.swift; sourceTree = "<group>"; };
+		195650D72D7BD6E500818FC8 /* CNLiveHomeSearchHistoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeSearchHistoryCell.swift; sourceTree = "<group>"; };
+		195650D92D7BD72E00818FC8 /* CNLiveHomeSearchHotCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeSearchHotCell.swift; sourceTree = "<group>"; };
+		195650DC2D7BDA9F00818FC8 /* CNLiveHomeSearchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeSearchViewModel.swift; sourceTree = "<group>"; };
+		195650DE2D7BE18200818FC8 /* CNLiveHomeSearchHotModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeSearchHotModel.swift; sourceTree = "<group>"; };
+		195650E02D7C098900818FC8 /* CNLiveHomeSearchHistoryModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeSearchHistoryModel.swift; sourceTree = "<group>"; };
+		195650E22D7C201600818FC8 /* CNLiveSearchHistoryFloatLayoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSearchHistoryFloatLayoutView.swift; sourceTree = "<group>"; };
+		195650E42D7E8C9400818FC8 /* CNLiveHomeSearchResultJuJiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeSearchResultJuJiCell.swift; sourceTree = "<group>"; };
+		195650E62D7E8CF300818FC8 /* CNLiveHomeSearchResultDuanJuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeSearchResultDuanJuCell.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>"; };
@@ -502,6 +578,18 @@
 		19565ECC2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsListClassifyView.swift; sourceTree = "<group>"; };
 		19565ECE2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsListCell.swift; sourceTree = "<group>"; };
 		19565ED32AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopAddEditGoodsModel.swift; sourceTree = "<group>"; };
+		1958B4132D83D2BA00F37E35 /* CNLiveHomeMoreController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeMoreController.swift; sourceTree = "<group>"; };
+		1958B4152D83F45200F37E35 /* CNLiveHomeTwoHengTuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeTwoHengTuCell.swift; sourceTree = "<group>"; };
+		1958B4172D8572A200F37E35 /* CNLiveMinePlayHistoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMinePlayHistoryCell.swift; sourceTree = "<group>"; };
+		1958B4192D8572C100F37E35 /* CNLiveMineMineOrderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineMineOrderCell.swift; sourceTree = "<group>"; };
+		1958B41B2D87BD3E00F37E35 /* CNLiveMinePlayHistoryCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMinePlayHistoryCollectionCell.swift; sourceTree = "<group>"; };
+		1958B41D2D8A98CA00F37E35 /* CNLiveVodPlayViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveVodPlayViewModel.swift; sourceTree = "<group>"; };
+		196211DE2D648699001925EC /* CNLiveHomeYingshiBannerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeYingshiBannerCell.swift; sourceTree = "<group>"; };
+		196211E02D66BCDE001925EC /* CNLiveHomeLanmuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeLanmuCell.swift; sourceTree = "<group>"; };
+		196211E22D66D36A001925EC /* CNLiveHomeOneBigTwoSmallCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeOneBigTwoSmallCell.swift; sourceTree = "<group>"; };
+		196211E42D66F5E6001925EC /* CNLiveHomeADCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeADCell.swift; sourceTree = "<group>"; };
+		196211E62D66F828001925EC /* CNLiveHomeTwoDuanjuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeTwoDuanjuCell.swift; sourceTree = "<group>"; };
+		196211E82D686C03001925EC /* CNLiveHomeFollowCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHomeFollowCell.swift; sourceTree = "<group>"; };
 		1965FA3D2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopAddGoodsSingleView.swift; sourceTree = "<group>"; };
 		1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAddGoodsSelectUploadImageView.swift; sourceTree = "<group>"; };
 		1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsCategoryController.swift; sourceTree = "<group>"; };
@@ -514,6 +602,7 @@
 		197563762C5C80D9004E0F42 /* HeroNetworkImageProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeroNetworkImageProvider.swift; sourceTree = "<group>"; };
 		19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideRealHotListCell.swift; sourceTree = "<group>"; };
 		19864E402BF6090400586E72 /* CNLiveDuanJuDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDuanJuDetailCell.swift; sourceTree = "<group>"; };
+		19A8CD132D62DC3700509BCD /* CNLiveTVHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTVHomeViewController.swift; sourceTree = "<group>"; };
 		19AB90632BB412C700B6A79B /* CNLiveDownslideOperationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownslideOperationManager.swift; sourceTree = "<group>"; };
 		19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsDetailsTableViewCell.swift; sourceTree = "<group>"; };
 		19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCommentRequestShareModel.swift; sourceTree = "<group>"; };
@@ -523,6 +612,7 @@
 		19B153CE2BC540FF0018906C /* CNLivePayOrderInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLivePayOrderInfoModel.swift; sourceTree = "<group>"; };
 		19B153D12BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayNeedPaymentCell.swift; sourceTree = "<group>"; };
 		19B153D32BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayWeChatAlipayCell.swift; sourceTree = "<group>"; };
+		19B711862D55FE130000872A /* CNLiveDownSlideBannerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideBannerCell.swift; sourceTree = "<group>"; };
 		19BAF0332C7831DB00BD7CC0 /* CNLiveDigitalResumePreviewFourWorkAwardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalResumePreviewFourWorkAwardCell.swift; sourceTree = "<group>"; };
 		19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNSlideBaseNavigationController.swift; sourceTree = "<group>"; };
 		19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleController.swift; sourceTree = "<group>"; };
@@ -737,6 +827,30 @@
 /* End PBXFrameworksBuildPhase section */
  
 /* Begin PBXGroup section */
+		19023DB82D8123F700872398 /* Lanmu */ = {
+			isa = PBXGroup;
+			children = (
+				19023DB62D80339800872398 /* CNLiveHomeLanmuThreeImgCell.swift */,
+			);
+			path = Lanmu;
+			sourceTree = "<group>";
+		};
+		19023DB92D81240C00872398 /* Home */ = {
+			isa = PBXGroup;
+			children = (
+				196211DE2D648699001925EC /* CNLiveHomeYingshiBannerCell.swift */,
+				196211E02D66BCDE001925EC /* CNLiveHomeLanmuCell.swift */,
+				196211E82D686C03001925EC /* CNLiveHomeFollowCell.swift */,
+				196211E22D66D36A001925EC /* CNLiveHomeOneBigTwoSmallCell.swift */,
+				196211E42D66F5E6001925EC /* CNLiveHomeADCell.swift */,
+				196211E62D66F828001925EC /* CNLiveHomeTwoDuanjuCell.swift */,
+				195650D22D79804400818FC8 /* CNLiveHomeTwoShopCell.swift */,
+				19023DBA2D8270DA00872398 /* CNLiveHomeShopCategoryCell.swift */,
+				1958B4152D83F45200F37E35 /* CNLiveHomeTwoHengTuCell.swift */,
+			);
+			path = Home;
+			sourceTree = "<group>";
+		};
 		1909DC922C6308FA001E7986 /* 数字简历相关页面 */ = {
 			isa = PBXGroup;
 			children = (
@@ -990,8 +1104,8 @@
 		1938BD152B3D6C6000390A34 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				19C735BF2BFDCECD00CACF4E /* CNLiveTotalHotListController */,
 				1938BD272B48009600390A34 /* HomeController */,
+				19C735BF2BFDCECD00CACF4E /* CNLiveTotalHotListController */,
 				1938BD1D2B46791400390A34 /* PlayletHomePage */,
 			);
 			path = Controller;
@@ -1107,6 +1221,7 @@
 				19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */,
 				19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */,
 				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
+				19B711862D55FE130000872A /* CNLiveDownSlideBannerCell.swift */,
 				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
 				19864E3E2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift */,
 				19C735C22BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift */,
@@ -1198,6 +1313,111 @@
 			path = DigitalAuth;
 			sourceTree = "<group>";
 		};
+		194729792D6D8EB300E55857 /* Util */ = {
+			isa = PBXGroup;
+			children = (
+				19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */,
+				1947297A2D6D8EF500E55857 /* CNLivePlayerTool.swift */,
+			);
+			path = Util;
+			sourceTree = "<group>";
+		};
+		195650B62D71B00200818FC8 /* HuBiLieHomePage */ = {
+			isa = PBXGroup;
+			children = (
+				195650DB2D7BDA4C00818FC8 /* ViewModel */,
+				194729792D6D8EB300E55857 /* Util */,
+				195650B92D71B03600818FC8 /* Model */,
+				195650B82D71B02F00818FC8 /* View */,
+				195650B72D71B02200818FC8 /* Controller */,
+			);
+			path = HuBiLieHomePage;
+			sourceTree = "<group>";
+		};
+		195650B72D71B02200818FC8 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				19A8CD132D62DC3700509BCD /* CNLiveTVHomeViewController.swift */,
+				195650D52D7A9B5700818FC8 /* CNLiveHomeSearchController.swift */,
+				19023DB42D801EF700872398 /* CNLiveHomeLanmuController.swift */,
+				1958B4132D83D2BA00F37E35 /* CNLiveHomeMoreController.swift */,
+				19416F812D3F9B3000ACD0A7 /* CNLiveTVPlayerViewController.swift */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		195650B82D71B02F00818FC8 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				195650C12D75435700818FC8 /* VodDetail */,
+				195650C02D75433B00818FC8 /* Home */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		195650B92D71B03600818FC8 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				195650BA2D71B12B00818FC8 /* CNLiveVodPlayModel.swift */,
+				195650BC2D7298E800818FC8 /* CNLiveVodAlbumMsgModel.swift */,
+				195650BE2D73000900818FC8 /* CNLiveVodAlbumListModel.swift */,
+				195650DE2D7BE18200818FC8 /* CNLiveHomeSearchHotModel.swift */,
+				195650E02D7C098900818FC8 /* CNLiveHomeSearchHistoryModel.swift */,
+				19023DBC2D8282DE00872398 /* CNLiveHomeShopCategoryModel.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		195650C02D75433B00818FC8 /* Home */ = {
+			isa = PBXGroup;
+			children = (
+				19023DB92D81240C00872398 /* Home */,
+				19023DB82D8123F700872398 /* Lanmu */,
+				195650D42D7A9A4F00818FC8 /* Search */,
+			);
+			path = Home;
+			sourceTree = "<group>";
+		};
+		195650C12D75435700818FC8 /* VodDetail */ = {
+			isa = PBXGroup;
+			children = (
+				195650B42D7047C500818FC8 /* CNLiveZFPlayerControlView.swift */,
+				195650C22D7543A500818FC8 /* CNLiveVodIntroductionCell.swift */,
+				195650C62D769B2A00818FC8 /* CNLiveVodAlbumListCell.swift */,
+				195650CC2D76C45400818FC8 /* CNLiveVodAlbumListCollectionCell.swift */,
+				195650C82D769CEA00818FC8 /* CNLiveVodTrailersCell.swift */,
+				195650CE2D77023A00818FC8 /* CNLiveVodTrailersCollectionCell.swift */,
+				195650CA2D76A36300818FC8 /* CNLiveVodPlayShopCell.swift */,
+				195650D02D77E33E00818FC8 /* CNLiveVodPlayShopCollectionCell.swift */,
+				192FDAFF2D8BEEB300F8723D /* CNLiveVodCellBottomView.swift */,
+				192FDB012D8BF38500F8723D /* CNLiveVodTrailerExpandCell.swift */,
+				192FDB052D8D0B7E00F8723D /* CNLiveVodShopBottomView.swift */,
+				192FDB032D8D0B6000F8723D /* CNLiveVodShopExpandCell.swift */,
+			);
+			path = VodDetail;
+			sourceTree = "<group>";
+		};
+		195650D42D7A9A4F00818FC8 /* Search */ = {
+			isa = PBXGroup;
+			children = (
+				195650D72D7BD6E500818FC8 /* CNLiveHomeSearchHistoryCell.swift */,
+				195650E22D7C201600818FC8 /* CNLiveSearchHistoryFloatLayoutView.swift */,
+				195650D92D7BD72E00818FC8 /* CNLiveHomeSearchHotCell.swift */,
+				195650E42D7E8C9400818FC8 /* CNLiveHomeSearchResultJuJiCell.swift */,
+				195650E62D7E8CF300818FC8 /* CNLiveHomeSearchResultDuanJuCell.swift */,
+			);
+			path = Search;
+			sourceTree = "<group>";
+		};
+		195650DB2D7BDA4C00818FC8 /* ViewModel */ = {
+			isa = PBXGroup;
+			children = (
+				195650DC2D7BDA9F00818FC8 /* CNLiveHomeSearchViewModel.swift */,
+				1958B41D2D8A98CA00F37E35 /* CNLiveVodPlayViewModel.swift */,
+			);
+			path = ViewModel;
+			sourceTree = "<group>";
+		};
 		19565EC32AF8ACC2007D6727 /* GoodsManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -1368,7 +1588,6 @@
 				194134812C181A7E004FC047 /* DigitalAuth */,
 				1917330B2B109691007BCC04 /* CNLivePlayer */,
 				19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */,
-				19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */,
 				19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */,
 				191733302B170537007BCC04 /* CNLiveCommonManager.swift */,
 				19E9D1612B3BBB2E00D0FB30 /* CNLiveFileManager.swift */,
@@ -1638,6 +1857,7 @@
 		796398902A260C0100D045EB /* Main */ = {
 			isa = PBXGroup;
 			children = (
+				195650B62D71B00200818FC8 /* HuBiLieHomePage */,
 				7939B06D2B47EB46005AE981 /* VideoPage */,
 				1938BD112B3D6C0C00390A34 /* HomePages */,
 				7991722C2AF08CF100DC01A8 /* ShopPage */,
@@ -1703,6 +1923,9 @@
 				79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */,
 				79803E282AD6991200F05F68 /* CNLiveMineInputMessageView.swift */,
 				19C0F76C2BDB48750097CC8F /* CNBindingManageCell.swift */,
+				1958B4172D8572A200F37E35 /* CNLiveMinePlayHistoryCell.swift */,
+				1958B41B2D87BD3E00F37E35 /* CNLiveMinePlayHistoryCollectionCell.swift */,
+				1958B4192D8572C100F37E35 /* CNLiveMineMineOrderCell.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -2138,6 +2361,7 @@
 				1917334C2B2BE9CA007BCC04 /* CNLiveCreateCouponTypeMoneyView.swift in Sources */,
 				191733002B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift in Sources */,
 				1909DCA72C637378001E7986 /* CNLiveDigitalResumePreviewFiveCell.swift in Sources */,
+				19B711872D55FE130000872A /* CNLiveDownSlideBannerCell.swift in Sources */,
 				19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */,
 				19C0F7692BD9F9F70097CC8F /* CNThreeLoginViewController.swift in Sources */,
 				191732F32B084DBC007BCC04 /* CNLiveShopClassifySwitchTableViewCell.swift in Sources */,
@@ -2146,6 +2370,7 @@
 				1938BD2E2B48021E00390A34 /* CNHomePageBaseNavigationController.swift in Sources */,
 				1917332F2B16C7C9007BCC04 /* CNLiveTimer.swift in Sources */,
 				194134942C240583004FC047 /* CNLiveDigitalRealManageController.swift in Sources */,
+				195650DA2D7BD72E00818FC8 /* CNLiveHomeSearchHotCell.swift in Sources */,
 				7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
 				192ED4782C5339D50057244C /* CNLiveCertificateCollectionCell.swift in Sources */,
 				194134862C196F59004FC047 /* CNLiveAuthTool.swift in Sources */,
@@ -2153,7 +2378,9 @@
 				19864E412BF6090400586E72 /* CNLiveDuanJuDetailCell.swift in Sources */,
 				79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
 				192ED47C2C538C970057244C /* CNLiveVitaeCertificateAddPhotoCell.swift in Sources */,
+				196211E92D686C03001925EC /* CNLiveHomeFollowCell.swift in Sources */,
 				79BB96A82AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift in Sources */,
+				1958B41A2D8572C100F37E35 /* CNLiveMineMineOrderCell.swift in Sources */,
 				19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
 				1938BD382B4BDC2500390A34 /* CNLiveAlbumImageCell.swift in Sources */,
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
@@ -2167,6 +2394,7 @@
 				19C0F76B2BDB432A0097CC8F /* CNLiveMineBindingManagerController.swift in Sources */,
 				792B53282AFCD7640009AB49 /* CNLiveShopOrderExpressDetailViewController.swift in Sources */,
 				79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */,
+				196211E32D66D36A001925EC /* CNLiveHomeOneBigTwoSmallCell.swift in Sources */,
 				191733422B284D5E007BCC04 /* CNLiveShopCouponCreateBottomView.swift in Sources */,
 				192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */,
 				19565ECB2AF8C59C007D6727 /* CNLiveShopGoodsListModel.swift in Sources */,
@@ -2194,6 +2422,7 @@
 				19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */,
 				19E302672BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift in Sources */,
 				1938BD322B4B8F0400390A34 /* CNLiveHomePageModel.swift in Sources */,
+				195650E52D7E8C9400818FC8 /* CNLiveHomeSearchResultJuJiCell.swift in Sources */,
 				191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */,
 				1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */,
 				19C735CC2C11A1F400CACF4E /* CNLiveDigitalThreeCollectCell.swift in Sources */,
@@ -2219,9 +2448,11 @@
 				1941348C2C20261C004FC047 /* CNLiveDigitalSecCell.swift in Sources */,
 				19CC4D4F2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift in Sources */,
 				191733642B392011007BCC04 /* CNLiveShopGoodsSearchViewController.swift in Sources */,
+				195650B52D7047C500818FC8 /* CNLiveZFPlayerControlView.swift in Sources */,
 				79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				192ED4692C4F77370057244C /* CNLiveHangYeFirCell.swift in Sources */,
+				196211E12D66BCDE001925EC /* CNLiveHomeLanmuCell.swift in Sources */,
 				19C735C12BFDCEE900CACF4E /* CNLiveTotalHotListController.swift in Sources */,
 				7939B0732B47F12F005AE981 /* CNLiveShortVideoViewController.swift in Sources */,
 				19BB1FEA2AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift in Sources */,
@@ -2229,9 +2460,11 @@
 				1938BD202B46799A00390A34 /* CNLivePlayletHomePageController.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				196211E52D66F5E6001925EC /* CNLiveHomeADCell.swift in Sources */,
 				192ED4742C521F4D0057244C /* CNLiveVocationalCertifiteCollectionViewLayout.swift in Sources */,
 				191732F82B08AB9D007BCC04 /* CNLiveShopClassilyViewModel.swift in Sources */,
 				79BB1C162B05C62900C5720C /* CNLiveShopBodyCouponView.swift in Sources */,
+				195650D62D7A9B5700818FC8 /* CNLiveHomeSearchController.swift in Sources */,
 				798916E92B04532D00D08302 /* CNLiveSavePointDB.swift in Sources */,
 				1938BD242B468AC900390A34 /* CNLivePlayletHomePageHeaderCell.swift in Sources */,
 				19B153D42BC623BE0018906C /* CNLiveShopPayWeChatAlipayCell.swift in Sources */,
@@ -2268,6 +2501,8 @@
 				19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
+				192FDB002D8BEEB300F8723D /* CNLiveVodCellBottomView.swift in Sources */,
+				195650CB2D76A36300818FC8 /* CNLiveVodPlayShopCell.swift in Sources */,
 				19B153CB2BC3E1870018906C /* CNLiveShopPayController.swift in Sources */,
 				191733662B39237D007BCC04 /* CNLiveShopGoodsManageListTableViewCell.swift in Sources */,
 				1909DC982C6342C4001E7986 /* CNLiveDigitalThreeCell.swift in Sources */,
@@ -2290,12 +2525,17 @@
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
 				19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */,
 				1938BD2A2B48014E00390A34 /* CNHomepageDetailViewController.swift in Sources */,
+				19023DB52D801EF700872398 /* CNLiveHomeLanmuController.swift in Sources */,
 				1965FA422AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift in Sources */,
+				195650D12D77E33E00818FC8 /* CNLiveVodPlayShopCollectionCell.swift in Sources */,
 				792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */,
 				1941349A2C294A78004FC047 /* CNLiveIdentityResTableCell.swift in Sources */,
+				195650E32D7C201600818FC8 /* CNLiveSearchHistoryFloatLayoutView.swift in Sources */,
 				791C1C862AFB2EB4003E6362 /* CNLiveShopOrderExpressViewController.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
+				19023DB72D80339800872398 /* CNLiveHomeLanmuThreeImgCell.swift in Sources */,
 				191733312B170537007BCC04 /* CNLiveCommonManager.swift in Sources */,
+				196211E72D66F828001925EC /* CNLiveHomeTwoDuanjuCell.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
 				191732F52B085BAE007BCC04 /* CNLiveShopClassilyIconTableViewCell.swift in Sources */,
 				192ED4842C5742510057244C /* CNLiveVitaeAddWorkController.swift in Sources */,
@@ -2319,25 +2559,33 @@
 				191733212B143F3A007BCC04 /* CNLiveGradientView.swift in Sources */,
 				19AD65AE2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift in Sources */,
 				192ED46B2C4F77450057244C /* CNLiveHangYeSecCell.swift in Sources */,
+				1958B41C2D87BD3E00F37E35 /* CNLiveMinePlayHistoryCollectionCell.swift in Sources */,
 				19BB1FE62AEB93B80094D962 /* CNLiveShopUserInfoModel.swift in Sources */,
+				19023DBB2D8270DA00872398 /* CNLiveHomeShopCategoryCell.swift in Sources */,
 				1909DCAB2C649C10001E7986 /* CNLiveDigitalResumePreViewSecCollectionCell.swift in Sources */,
+				195650C32D7543A500818FC8 /* CNLiveVodIntroductionCell.swift in Sources */,
+				195650BD2D7298E800818FC8 /* CNLiveVodAlbumMsgModel.swift in Sources */,
 				19DFE64D2C4792C500E428AE /* CNLiveDigitalResumeInfoController.swift in Sources */,
 				7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */,
 				191732ED2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift in Sources */,
 				191733482B2855E8007BCC04 /* CNLiveShopCouponViewModel.swift in Sources */,
 				79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */,
 				191733542B2C4D58007BCC04 /* CNLivePickerToolsView.swift in Sources */,
+				192FDB042D8D0B6000F8723D /* CNLiveVodShopExpandCell.swift in Sources */,
 				191733112B109EDC007BCC04 /* CNLivePlayerControlView.swift in Sources */,
 				1917331F2B10A1BE007BCC04 /* CNLivePlayerEnum.swift in Sources */,
+				195650E12D7C098900818FC8 /* CNLiveHomeSearchHistoryModel.swift in Sources */,
 				191733382B27FD66007BCC04 /* CNLiveShopClassifySectionHeaderView.swift in Sources */,
 				19CB631F2C69ADF500D889F8 /* CNLiveDigitalResumePreViewSelectRenzhengCerController.swift in Sources */,
 				194134782C17F83B004FC047 /* CNLiveFaceAuthController.swift in Sources */,
+				19023DBD2D8282DE00872398 /* CNLiveHomeShopCategoryModel.swift in Sources */,
 				1938BD222B467C1700390A34 /* CNLivePlayletHomePageCell.swift in Sources */,
 				1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				19B153D22BC623980018906C /* CNLiveShopPayNeedPaymentCell.swift in Sources */,
 				19DFE6492C44BEAE00E428AE /* CNLiveDigitalResumeCell.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
+				1958B4142D83D2BA00F37E35 /* CNLiveHomeMoreController.swift in Sources */,
 				19B153CD2BC3EB690018906C /* CNLiveShoph5ViewModel.swift in Sources */,
 				79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */,
 				194455A12B6B3310006C5A2A /* CNWebView.swift in Sources */,
@@ -2348,11 +2596,13 @@
 				19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
 				194134962C2412C7004FC047 /* CNLiveRealManageCell.swift in Sources */,
+				196211DF2D64869A001925EC /* CNLiveHomeYingshiBannerCell.swift in Sources */,
 				1941347A2C18001A004FC047 /* CGImage+FaceCrop.swift in Sources */,
 				7939B0752B47F1B9005AE981 /* CNLiveShortVideoListTableViewCell.swift in Sources */,
 				794294A72B4D18EC008AAFA0 /* CNLiveShortVideoContentListView.swift in Sources */,
 				19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */,
 				19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */,
+				195650D82D7BD6E500818FC8 /* CNLiveHomeSearchHistoryCell.swift in Sources */,
 				796308732B4B8EB80090D22A /* CNLiveShortVideoViewModel.swift in Sources */,
 				19E9D1602B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift in Sources */,
 				191732CE2B04AACD007BCC04 /* CNLiveShopTextView.swift in Sources */,
@@ -2361,6 +2611,7 @@
 				7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
 				1917335A2B3283A1007BCC04 /* CNLiveCouponGoodsSearchView.swift in Sources */,
+				195650C92D769CEA00818FC8 /* CNLiveVodTrailersCell.swift in Sources */,
 				191733362B27EFD4007BCC04 /* CNLiveShopClassilyManageViewController.swift in Sources */,
 				799172322AF08D1B00DC01A8 /* CNLiveShopOrderViewController.swift in Sources */,
 				1917332D2B15DB20007BCC04 /* CNLivePlayerKVOModel.swift in Sources */,
@@ -2371,12 +2622,15 @@
 				1909DC962C6309EC001E7986 /* CNLiveDigitalResumePreViewController.swift in Sources */,
 				79DC67642B5FB60900261A94 /* CNLiveMineAuthFormViewController.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
+				1958B4162D83F45200F37E35 /* CNLiveHomeTwoHengTuCell.swift in Sources */,
 				19C0F7672BD8DC4D0097CC8F /* CNThreeLoginModel.swift in Sources */,
+				19416F822D3F9B3000ACD0A7 /* CNLiveTVPlayerViewController.swift in Sources */,
 				794FF1092B02131300385E85 /* CNLiveSaveSearchDB.swift in Sources */,
 				19864E3F2BEF6A3300586E72 /* CNLiveDownSlideRealHotListCell.swift in Sources */,
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
 				1917331B2B10A0EF007BCC04 /* CNLivePlayerLoadingView.swift in Sources */,
 				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
+				192FDB022D8BF38500F8723D /* CNLiveVodTrailerExpandCell.swift in Sources */,
 				1909DCA22C637353001E7986 /* CNLiveDigitalResumePreviewThreeCell.swift in Sources */,
 				192ED47E2C538CA30057244C /* CNLiveVitaeCertificateAddInfoCell.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
@@ -2386,6 +2640,7 @@
 				19DFE6432C41039600E428AE /* CNLiveVitaeViewModel.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				19C735D02C12F5F600CACF4E /* CNLiveRealNameCell.swift in Sources */,
+				195650BF2D73000900818FC8 /* CNLiveVodAlbumListModel.swift in Sources */,
 				7999415C2B4E8E8E0014C721 /* CNLiveRefresh.swift in Sources */,
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
@@ -2396,9 +2651,12 @@
 				191733152B109FD7007BCC04 /* CNLivePlayerTopNaviView.swift in Sources */,
 				794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
+				195650E72D7E8CF300818FC8 /* CNLiveHomeSearchResultDuanJuCell.swift in Sources */,
 				791C1C882AFB6FD7003E6362 /* CNLiveShopOrderExpressFirmViewController.swift in Sources */,
+				195650DF2D7BE18200818FC8 /* CNLiveHomeSearchHotModel.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				794BC1652AF9E70D00A68C74 /* CNLiveShopOrderSendViewController.swift in Sources */,
+				195650CF2D77023A00818FC8 /* CNLiveVodTrailersCollectionCell.swift in Sources */,
 				79BB96AA2AF2330900AEA4AC /* CNLiveShopBodyDetailView.swift in Sources */,
 				790D01912A2DAC5E00C5978D /* CNLiveConfigFontMacro.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNLiveExtensions.swift in Sources */,
@@ -2409,6 +2667,8 @@
 				197563772C5C80D9004E0F42 /* HeroNetworkImageProvider.swift in Sources */,
 				794294AA2B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift in Sources */,
 				1909DC9E2C637339001E7986 /* CNLiveDigitalResumePreViewFirCell.swift in Sources */,
+				195650C72D769B2A00818FC8 /* CNLiveVodAlbumListCell.swift in Sources */,
+				195650BB2D71B12B00818FC8 /* CNLiveVodPlayModel.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
 				19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */,
 				19CB63222C69B3B600D889F8 /* CNLiveDigitalResumeGuanfangRenzhengCell.swift in Sources */,
@@ -2419,6 +2679,8 @@
 				1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */,
 				1941347E2C1815E7004FC047 /* AVExtensions.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
+				1958B4182D8572A200F37E35 /* CNLiveMinePlayHistoryCell.swift in Sources */,
+				195650DD2D7BDA9F00818FC8 /* CNLiveHomeSearchViewModel.swift in Sources */,
 				191733292B148BF7007BCC04 /* CNLivePlayerVolumeBrightnessView.swift in Sources */,
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
 				79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */,
@@ -2426,10 +2688,12 @@
 				194134882C1FE4E7004FC047 /* CNLiveDigitalAssetsController.swift in Sources */,
 				7CD6753F2A2740B0008354C1 /* CNDownSlideViewRemindView.swift in Sources */,
 				19565ECF2AF8D8F6007D6727 /* CNLiveShopGoodsListCell.swift in Sources */,
+				1947297B2D6D8EF500E55857 /* CNLivePlayerTool.swift in Sources */,
 				192ED4632C4A642F0057244C /* CNLiveAddrAreaModel.swift in Sources */,
 				1965FA3E2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */,
 				7939B0772B47F88A005AE981 /* CNLiveShortVideoControlView.swift in Sources */,
+				1958B41E2D8A98CB00F37E35 /* CNLiveVodPlayViewModel.swift in Sources */,
 				191733602B352488007BCC04 /* CNLiveCouponGoodsListTableViewCell.swift in Sources */,
 				79BB1C142B05C51900C5720C /* CNLiveShopCouponViewController.swift in Sources */,
 				1941348A2C200E4E004FC047 /* CNLiveDigitalFirstCell.swift in Sources */,
@@ -2447,6 +2711,7 @@
 				79A267832AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift in Sources */,
 				1917335E2B328495007BCC04 /* CNLiveCouponListTableViewCell.swift in Sources */,
 				791C1C8C2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift in Sources */,
+				195650CD2D76C45400818FC8 /* CNLiveVodAlbumListCollectionCell.swift in Sources */,
 				79868B192B874294008E0F5C /* CNLiveSaveAuthStateDB.swift in Sources */,
 				790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */,
 				191733192B10A05D007BCC04 /* CNLivePlayerProgressView.swift in Sources */,
@@ -2458,8 +2723,11 @@
 				19AB90642BB412C700B6A79B /* CNLiveDownslideOperationManager.swift in Sources */,
 				7991723A2AF091E100DC01A8 /* CNLiveShopOrderListViewController.swift in Sources */,
 				798A44F02A305BC200815935 /* UIButton+CNLiveExtensions.swift in Sources */,
+				195650D32D79804400818FC8 /* CNLiveHomeTwoShopCell.swift in Sources */,
+				19A8CD142D62DC3700509BCD /* CNLiveTVHomeViewController.swift in Sources */,
 				1969E1AD2C92E98700E4185E /* CNHomeWebViewController.swift in Sources */,
 				1938BD342B4B968300390A34 /* CNLiveHomePageDuanJuCell.swift in Sources */,
+				192FDB062D8D0B7E00F8723D /* CNLiveVodShopBottomView.swift in Sources */,
 				192ED4872C575EC90057244C /* CNLiveVitaeAddWorkFirCell.swift in Sources */,
 				191733522B2C4CEA007BCC04 /* CNLivePickerSelectDateTools.swift in Sources */,
 				1917333A2B27FDF3007BCC04 /* CNLiveShopClassilyManageTableViewCell.swift in Sources */,
@@ -2640,7 +2908,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.4.24.09.14.12;
+				CURRENT_PROJECT_VERSION = 1.1.4.25.02.09.11;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -2708,7 +2976,7 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UIStatusBarStyle = "";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2896,7 +3164,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.4.24.09.14.12;
+				CURRENT_PROJECT_VERSION = 1.1.4.25.02.09.11;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2963,7 +3231,7 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UIStatusBarStyle = "";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -52,21 +52,25 @@ class CNLiveBaseTabBarViewController: UITabBarController
     // MARK: - 控制器的信息
     func setUpTabBar() {
  
+        
+////        let homeVC  = CNLiveNewAuthViewController.init()
+        ///忽必烈
+        let homeVC  = CNLiveTVHomeViewController.init()
 //        let homeVC  = CNLiveAuthViewController.init()
-        let homeVC  = CNHomeWebViewController()
-        homeVC.url = URL(string: "https://wjjh5.cnlive.com/chatgpt/#/")
-        let authVC  = CNMetaCodeHomePageController.init()
+//        let homeVC  = CNHomeWebViewController()
+//        homeVC.url = URL(string: "https://wjjh5.cnlive.com/chatgpt/#/")
+//        let authVC  = CNMetaCodeHomePageController.init()
         let mineVC  = CNLiveMineViewController.init()
-
+        
         creatTabbarView(viewController: homeVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "首页")
-        creatTabbarView(viewController: authVC, image: "tabbar_authentication_unSelect", selectImage: "tabbar_authentication", 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: "我的")
  
         self.tabBar.tintColor = UIColor("#0066FE")
         self.tabBar.isTranslucent = false
         self.viewControllers = [
             CNLiveBaseNavigationController(rootViewController: homeVC),
-            CNLiveBaseNavigationController(rootViewController: authVC),
+            //CNLiveBaseNavigationController(rootViewController: authVC),
             CNLiveBaseNavigationController(rootViewController: mineVC)
         ]
 //        self.selectedIndex = 1
@@ -252,5 +252,58 @@ class CNLiveBaseViewController: UIViewController  {
     @objc func topNavViewTap() {
         UIApplication.shared.keyWindow?.endEditing(true)
     }
+    
+    
+    
+    override var shouldAutorotate: Bool {
+        return false
+    }
+
+    override var preferredStatusBarStyle: UIStatusBarStyle {
+        return .lightContent
+    }
+
+    override var prefersStatusBarHidden: Bool {
+        return false
+    }
+
+    override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+        return .portrait
+    }
+    
 }
  
+
+//extension UIDeviceOrientation {
+//    /// 获取当前屏幕方向
+//    var interfaceOrientation: UIInterfaceOrientation {
+//        switch self {
+//        case .portrait:
+//            return .portrait
+//        case .portraitUpsideDown:
+//            return .portraitUpsideDown
+//        case .landscapeLeft:
+//            return .landscapeRight // 注意：设备的左旋是界面的右旋
+//        case .landscapeRight:
+//            return .landscapeLeft // 注意：设备的右旋是界面的左旋
+//        case .faceUp, .faceDown, .unknown:
+//            return .unknown
+//        @unknown default:
+//            return .unknown
+//        }
+//    }
+//    
+//    /// 判断当前屏幕是否是竖屏
+//    func isCurrentScreenPortrait() -> Bool {
+//        let window = UIApplication.shared.windows.filter {$0.isKeyWindow}.first ?? UIWindow()
+//        let orientation = window.windowScene?.interfaceOrientation
+//        switch orientation {
+//        case .portrait, .portraitUpsideDown:
+//            return true
+//        case .landscapeLeft, .landscapeRight:
+//            return false
+//        default:
+//            return true
+//        }
+//    }
+//}
@@ -66,7 +66,9 @@ class UserInfoModel: BaseModel {
 }
  
 class UserInfoManager: NSObject {
-    
+    static let mataCodeUserInfo = "mateCode_userInfo"
+    static let CNLiveUserInfo = "CNUserInfo"
+
     static let shared = UserInfoManager()
  
     fileprivate var _userInfo : UserInfoModel?
@@ -92,7 +94,9 @@ class UserInfoManager: NSObject {
         UserInfoManager.clearUserInfo()
         UserInfoManager.shared._userInfo = userInfo
         //JsonUtil.modelToJson(userInfo)
-        UserDefaults.standard.set(userInfo.toJSONString(), forKey: "mateCode_userInfo")
+        UserDefaults.standard.set(userInfo.toJSONString(), forKey: mataCodeUserInfo)
+        UserDefaults.standard.set(userInfo.toJSONString(), forKey: CNLiveUserInfo)
+
         if UserDefaults.standard.synchronize() {
             print("用户信息存储成功")
         }
@@ -101,7 +105,8 @@ class UserInfoManager: NSObject {
     /// 读取用户数据
     /// - Returns: 用户数据
     static public func readUserInfo() -> UserInfoModel {
-        let user_info = UserDefaults.standard.object(forKey: "mateCode_userInfo")
+        let user_info = UserDefaults.standard.object(forKey: mataCodeUserInfo)
+
         if user_info == nil {
             print("获取用户信息失败")
             return UserInfoModel()
@@ -116,7 +121,9 @@ class UserInfoManager: NSObject {
     }
  
     static public func clearUserInfo() {
-        UserDefaults.standard.removeObject(forKey: "mateCode_userInfo")
+        UserDefaults.standard.removeObject(forKey: mataCodeUserInfo)
+        UserDefaults.standard.removeObject(forKey: CNLiveUserInfo)
+        
         UserInfoManager.shared._userInfo = nil
         StandSortManager.removeStandSort()
         if UserDefaults.standard.synchronize() {
@@ -17,7 +17,10 @@ let KStatusBarHeight:CGFloat = UIApplication.shared.statusBarFrame.height;
 ///导航栏高度
 let KNavigationHeight:CGFloat = (KStatusBarHeight + 44)
 ///tabbar高度
-let KTabBarHeight:CGFloat = (KStatusBarHeight == 44 ? 83 : 49)
+let KTabBarHeight:CGFloat = (isiPhoneXSeries ? 83 : 49)
+///tabbarSafe高度
+let KTabBarSafeHeight:CGFloat = (isiPhoneXSeries ? 34 : 0)
+
 /**
  获取系统tabbarUI高度
  */
@@ -12,12 +12,31 @@ import UIKit
 let kCNDownSlideBackgroundColorHex: String = "#F7F8FA"
  
 ///CNliveDownSlideModel Type
+let SlideModelTypeRecommend1: String = "1"//1大图banner
 let SlideModelTypeRecommend4: String = "4"//4一排两个 推荐课程&推荐活动
 let SlideModelTypeTodayRecommend74: String = "74"//74今日推荐
 let SlideModelTypeAllCourse12: String = "12"//12列表全部课程
 let SlideModelTypeOneCourse75: String = "75"//75单课程大图
-let SlideModelTypeTwoDuanJu5: String = "5"//5竖版短剧 一排两个
 let SlideModelTypeRealHotList7: String = "7"//7实时热榜
+let SlideModelTypeBanner1: String = "1"//1Banner
+
+//忽必烈
+let SlideModelTypeLanmu22: String = "22"//22首页栏目 电影 电视剧 纪录片
+let SlideModelTypeFollow77: String = "77"//正在追 接口type77
+let SlideModelTypeTVOneBigTwoSmall2: String = "2"//2 一大图两小图
+let SlideModelTypeAD31: String = "31"//31横幅广告
+let SlideModelTypeTwoDuanJu5: String = "5"//5竖版短剧 一排两个
+let SlideModelTypeOngHangThree3: String = "3"//3竖版 一排三个
+
+let SlideModelTypeShop29: String = "29"//29 官方周边
+let SlideModelTypeShopCategory78: String = "78"//78电商分类
+
+//let SlideModelTypeThreeDuanJu5: String = "5"//忽必烈版5一排三个 旧版5竖版短剧 一排两个
+
+
+
+
+
  
 class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
  
@@ -109,10 +109,11 @@ class CNHomeWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
             make.top.equalTo(get_system_nav_height())
             make.left.right.bottom.equalToSuperview()
         }
+
  
-        let webVC =  CNWebViewController()
-        webVC.url = URL(string: "https://wjjh5.cnlive.com/chatgpt/#/pages/index/index?id=1836691195091464194")
-        navigationViewController().pushViewController(webVC, animated: true)
+//        let webVC =  CNWebViewController()
+//        webVC.url = URL(string: "https://wjjh5.cnlive.com/chatgpt/#/pages/index/index?id=1836691195091464194")
+//        navigationViewController().pushViewController(webVC, animated: true)
     }
  
     func h5StopVideoPlayer(){
@@ -27,12 +27,13 @@ typealias cnWebControllerUpdateNavEditBlock = (_ isShowEdit:Bool)-&gt;Void
 //更新Web控制器 currentUrl
 typealias cnWebControllerUpdateCurrentUrlBlock = (_ currentUrl:String)->Void
  
-class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
+class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler,WKUIDelegate{
  
     var configuration:WKWebViewConfiguration?
  
     lazy var cnWebView :WKWebView = {
         let cnWebView = WKWebView(frame: self.bounds, configuration: self.configuration!)
+        cnWebView.uiDelegate = self
         return cnWebView
     }()
  
@@ -379,9 +380,33 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
         self.bridge?.registerHandler("ymAiGetAutoPlayAudioState", handler: { data, responseCallback in
             print("js call oc\(data)")
  
-            
-            
         })
+        //h5拉起原生 跳转ugc播放页面
+        self.bridge?.registerHandler("wjjJumpUGCAlbum", handler: { data, responseCallback in
+            print("js call oc\(data)")
+            let dic = data as! Dictionary<String, Any>
+            if let albumIdStr = dic["albumId"] as? String{
+                //短剧-跳转短剧播放页
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumIdStr), animated: pushAnimated)
+
+            }
+        })
+        
+        //h5拉起原生跳视频专辑
+        self.bridge?.registerHandler("video://album", handler: { data, responseCallback in
+            print("js call oc\(data)")
+            let dataDic = data as! Dictionary<String, Any>
+            print("拉起视频专辑")
+                        
+        })
+        //h5拉起原生跳视频单集
+        self.bridge?.registerHandler("video://vod", handler: { data, responseCallback in
+            print("js call oc\(data)")
+            let dataDic = data as! Dictionary<String, Any>
+            print("拉起视频单集")
+                        
+        })
+
     }
  
     // MARK: - 检查url
@@ -478,7 +503,31 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
         }
         return str
     }
-    
+    // MARK: - WKUIDelegate
+    func webView(_ webView: WKWebView, runJavaScriptTextInputPanelWithPrompt prompt: String, defaultText: String?, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (String?) -> Void) {
+        if prompt.contains("video://vod"){
+            //视频单集
+            let tempDic = NSString.getURLParameters(prompt)
+            if let dic = tempDic{
+                if let contentId = dic.object(forKey: "contentId") as? String{
+                    CNLiveDownSlideTool.pushVodController(contentId: contentId, navigationVC: navigationViewController(), isAblumVideo: false)
+                }
+            }
+        }else if prompt.contains("video://album"){
+            //视频专辑
+            let tempDic = NSString.getURLParameters(prompt)
+            if let dic = tempDic{
+                if let aidStr = dic.object(forKey: "aid") as? String{
+                    //跳转点播专辑
+                    CNLiveDownSlideTool.pushVodController(contentId: aidStr, navigationVC: navigationViewController(), isAblumVideo: true)
+                }
+            }
+            
+
+        }
+        completionHandler("http")
+    }
+
     // MARK: - WKWebViewDelegate
     // 页面开始加载时调用
     func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
@@ -20,6 +20,7 @@ let ManagemallshopH5 = &quot;managemall.cnlive.com&quot;
  
 class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
  
+    var isHiddenNavigationBar = false
     var bridge:WKWebViewJavascriptBridge?
     var currentUrl:String = ""//当前网页的url
  
@@ -32,7 +33,8 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         configuration.preferences.minimumFontSize = 0.0
         configuration.preferences = preferences
         configuration.userContentController = WKUserContentController()
-        let webView = CNWebView(frame: CGRectMake(0, KNavigationHeight, Width, Height-KNavigationHeight), configuration: configuration, url: _url)
+        let navH = self.isHiddenNavigationBar ? 0 : KNavigationHeight
+        let webView = CNWebView(frame: CGRectMake(0, navH, Width, Height-navH), configuration: configuration, url: _url)
         webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
         webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
         webView.isCNWebController = true
@@ -89,7 +91,7 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
  
     override func viewDidLoad() {
         super.viewDidLoad()
-        navigationBarHidden = false
+        navigationBarHidden = self.isHiddenNavigationBar
         self.view.addSubview(self.webView)
  
         self.webView.webControllerUpdateNavSoundBlock = {  isSound in
@@ -124,8 +126,9 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         self.webView.webControllerUpdateCurrentUrlBlock = { [weak self] currentUrlStr in
             self!.currentUrl = currentUrlStr
         }
+        let navH = self.isHiddenNavigationBar ? 0 : KNavigationHeight
         self.webView.snp.makeConstraints { make in
-            make.top.equalTo(get_system_nav_height())
+            make.top.equalTo(navH)
             make.left.right.bottom.equalToSuperview()
         }
     }
@@ -516,6 +516,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell, UICollectionViewDelegate, UI
     }
     //MARK: - 事件
     @objc func enterBtnAction(_ sender: UIButton){
+        
         let tag = sender.tag
         if self.myCurriculum?.list.count ?? 0 > 0{
             let albumMdl = self.myCurriculum?.list[tag]
+//
+//  CNLiveDownSlideBannerCell.swift
+//  metaCode
+//
+//  Created by zx on 2025/2/7.
+//
+
+import Foundation
+
+///banner高度
+let DownSlideBannerH: CGFloat = DownSlideBannerW*195/345
+///banner宽度
+let DownSlideBannerW: CGFloat = KSreenWidth-DownSlideRecommendLeftGap*2
+
+class CNLiveDownSlideBannerCell: UITableViewCell {
+    //slideModel
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+            
+            for obj in contentView.subviews{
+                obj.removeFromSuperview()
+            }
+            self.setupNewUI(model: _slideModel!)
+        }
+    }
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+        contentView.clipsToBounds = true
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setupNewUI(model:CNLiveDownSlideModel){
+        //总块数
+        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]
+            let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, CGFloat(i)*(DownSlideBannerH+DownSlideRecommendLeftGap), CGFloat(DownSlideBannerW), CGFloat(DownSlideBannerH)))
+            imageView.kf.setImage(with: URL(string:contentMdl.poster ))
+            imageView.tag = i
+            imageView.layer.cornerRadius = 12
+            imageView.clipsToBounds = true
+            imageView.isUserInteractionEnabled = true
+            imageView.contentMode = .scaleAspectFill
+            imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
+            contentView.addSubview(imageView)
+        }
+    }
+    
+    @objc func pushWebAction(ges: UITapGestureRecognizer){
+        let imageView = ges.view as! UIImageView
+        let i = imageView.tag
+        let contentMdl = self.slideModel?.contents[i]
+        CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl?.model ?? "", contentId: contentMdl?.contentId ?? "", pid: contentMdl?.pid ?? "", shareUrl: contentMdl?.shareUrl ?? "", thirdUrl: contentMdl?.thirdUrl ?? "", title: contentMdl?.title ?? "", s_to: contentMdl?.s_to ?? "",trailerId: contentMdl?.trailerId ?? "", controller: nil, slideModel: nil)
+    }
+}
@@ -13,6 +13,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     let kCNLiveDownSlideRecommendCellIdentifier = "kCNLiveDownSlideRecommendCellIdentifier"
     let kCNLiveDownSlideTodayRecommendCellIdentifier = "kCNLiveDownSlideTodayRecommendCellIdentifier"
     let kCNLiveDownSlideSingleCourseCellIdentifier = "kCNLiveDownSlideSingleCourseCellIdentifier"
+    let kCNLiveDownSlideBannerCellIdentifier = "kCNLiveDownSlideBannerCellIdentifier"
     let kCNLiveHomePageDuanJuCellIdentifier = "kCNLiveHomePageDuanJuCellIdentifier"
     let kCNLiveDownSlideTwoDuanJuCellIdentifier = "kCNLiveDownSlideTwoDuanJuCellIdentifier"
     let kCNLiveDownSlideRealHotListCellIdentifier = "kCNLiveDownSlideRealHotListCellIdentifier"
@@ -72,7 +73,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
         tableView.delegate = self
         tableView.separatorStyle = .none
         tableView.register(CNLiveHomePageDuanJuCell.self, forCellReuseIdentifier: kCNLiveHomePageDuanJuCellIdentifier)
-        
+        tableView.register(CNLiveDownSlideBannerCell.self, forCellReuseIdentifier: kCNLiveDownSlideBannerCellIdentifier)
         tableView.register(CNLiveDownSlideRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideRecommendCellIdentifier)
         tableView.register(CNLiveDownSlideTodayRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier)
         tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideAllCourseCellIdentifier)
@@ -116,7 +117,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             //除了短剧的model
             let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
  
-            //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图
+            //type=4一排两个 推荐课程&推荐活动; 74今日推荐; 12列表全部课程; 75单课程大图 1大图banner
             if slideModel.type == SlideModelTypeRecommend4{
                 guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell
                 else {
@@ -164,6 +165,14 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
                 }
                 cell.slideModel = slideModel
                 return cell
+            }else if slideModel.type == SlideModelTypeRecommend1{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideBannerCellIdentifier) as? CNLiveDownSlideBannerCell
+                else {
+                    let cell = CNLiveDownSlideBannerCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
             }else{
                 return UITableViewCell()
             }
@@ -31,31 +31,54 @@ class CNLiveAlbumListBaseModel:BaseModel{
 }
 class CNLiveAlbumListModel:BaseModel{
     var title = ""
+    var albumId = ""
+    var albumName = ""
+    var actor = ""
+    var spId = ""
+    var spName = ""
+    var modelId = ""
+    var time = ""
+    var img = ""
+    var poster = ""
+    var counts = ""
+    var description = ""
+    var viewCounts = ""
+    var schedule = ""
+    var liveType = ""
+    var downloadType = ""
+    var activityId = ""
+    var comments = ""
+    var chapterId = ""
+    var contentId = ""
+    var duration = ""
+    var shareUrl = ""
+    var fileSize = ""
+    var cmccActiveId = ""
+    var productId = ""
+    var productType = ""
+    var isStudy = ""
+    var playTime = ""
+    var tool :CNLiveAlbumListToolModel?
+    var product:CNLiveAlbumProductModel?
+
     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 = ""
@@ -7,6 +7,168 @@
  
 import Foundation
  
+////// 忽必烈首页频道model
+class CNLiveHomePageHuBiLieModel:BaseModel{
+    var id = ""
+    var name = ""
+    var showName = ""
+    var type = ""
+    var typeName = ""
+    var thirdUrl = ""
+    var textColor = ""
+    var textColorSelected = ""
+    var pageType = ""
+    var navigation = ""
+    var siteId = ""
+    var pageId = ""
+    var backgroundColor = ""
+    var backgroundImg = ""
+    var backgroundImgH5 = ""
+    var statusBarColor = ""
+    var module = ""
+    var defaultPage = ""
+    var img = ""
+    var icon = ""
+    var width = ""
+    var height = ""
+    var version = ""
+    var endVersion = ""
+    var parentId = ""
+    var channelId = ""
+    var sort = ""
+    var enable = ""
+    var channelVer = ""
+    var pageStyleList = [CNLiveHomePageStyleListModel]()
+
+}
+
+//播放记录
+class CNLiveHomeFollowListBaseModel:BaseModel{
+    var endRow = 0
+    var firstPage = 0
+    var hasNextPage = false
+    var nextPage = 0
+    var hasPreviousPage = false
+    var isFirstPage = true
+    var isLastPage = true
+    var lastPage = 0
+    var list = [CNLiveHomeFollowModel]()
+    var navigateFirstPage = 0
+    var navigateLastPage = 0
+    var navigatePages = 0
+    var navigatepageNums:Array<Any> = []
+    var pageNum = 0
+    var pageSize = 0
+    var pages = 0
+    var prePage = 0
+    var size = 0
+    var startRow = 0
+    var total = 0
+    
+}
+
+//正在追剧集
+class CNLiveHomeFollowModel:BaseModel{
+    var id = ""
+    var contentId = ""
+    var activeId = ""
+    var title = ""
+    var time = ""
+    var counts = ""
+    var actor = ""
+    var sid = ""
+    var albumId = ""
+    var albumImg = ""
+    var albumName = ""//专辑名称
+    var channelName = ""
+    var schedule = ""
+    var recent = ""
+    var siteId = ""
+    var modelId = ""
+    var poster = ""
+    var description = ""
+    var shareUrl = ""
+    var cmccActiveId = ""
+
+    var product:CNLiveAlbumProductModel?
+    var aproduct:CNLiveAlbumProductModel?
+
+}
+
+//收藏记录
+class CNLiveCollectionListBaseModel:BaseModel{
+    var endRow = 0
+    var firstPage = 0
+    var hasNextPage = false
+    var nextPage = 0
+    var hasPreviousPage = false
+    var isFirstPage = true
+    var isLastPage = true
+    var lastPage = 0
+    var list = [CNLiveCollectionListModel]()
+    var navigateFirstPage = 0
+    var navigateLastPage = 0
+    var navigatePages = 0
+    var navigatepageNums:Array<Any> = []
+    var pageNum = 0
+    var pageSize = 0
+    var pages = 0
+    var prePage = 0
+    var size = 0
+    var startRow = 0
+    var total = 0
+    
+}
+class CNLiveCollectionListModel:BaseModel{
+    var title = ""
+    var subTitle = ""
+    var poster = ""
+    var contentId = ""
+    var albumId = ""
+    var pid = ""
+    var model = ""
+    var collectionTime = ""
+}
+
+
+
+//影视剧 音乐 电商
+class CNLiveHomePageStyleListModel:BaseModel{
+    var id = ""
+    var name = ""
+    var showName = ""
+    var type = ""
+    var typeName = ""
+    var thirdUrl = ""
+    var textColor = ""
+    var textColorSelected = ""
+    var pageType = ""
+    var navigation = ""
+    var siteId = ""
+    var pageId = ""
+    var backgroundColor = ""
+    var backgroundImg = ""
+    var backgroundImgH5 = ""
+    var statusBarColor = ""
+    var module = ""
+    var defaultPage = ""
+    var img = ""
+    var icon = ""
+    var width = ""
+    var height = ""
+    var version = ""
+    var endVersion = ""
+    var parentId = ""
+    var channelId = ""
+    var sort = ""
+    var enable = ""
+    var channelVer = ""
+    var pageStyleList = ""
+}
+
+
+
+///////// 短剧首页
 class CNLiveHomePageModel:BaseModel{
     var endRow = 0
     var firstPage = 0
@@ -143,6 +143,7 @@ class CNLiveAlbumCell:UITableViewCell{
     }
  
     @objc func playBtnAction(){
+        
         var aid = ""
         if self.albumModel != nil{
             aid = self.albumModel!.contentId
@@ -7,8 +7,408 @@
  
 import Foundation
 import CNLiveRequestBastKit
+import CNLiveBusinessTools
+class CNLiveHomePageViewModel:NSObject,URLSessionTaskDelegate{
+    static let shared = CNLiveHomePageViewModel()
+
+    ///id获取播放地址url
+    func getVodVideoURL(contentId:String,resultBlock: @escaping downSlideResultBlock){
+        
+        // 获取当前时间戳（自1970年以来的秒数）
+        let timeInterval = Date().timeIntervalSince1970
+        // 将时间戳转换为字符串
+        //        let timeString = String(format: "%ld", Int64(timeInterval))
+        // 或者更简洁地使用String的初始化方法
+        let timeString = "\(Int64(timeInterval))"
+        
+        let bundleIdentifier = Bundle.main.bundleIdentifier
+        
+        let uuid = CNLiveBusinessTools.getUidForStat(Date())
+        
+        let shortVersion = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
+        
+        
+        let param = NSMutableDictionary()
+        param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        param.setValue(contentId, forKey: "vId")
+        param.setValue(timeString, forKey: "timestamp")
+        param.setValue("0", forKey: "isHLS")
+        param.setValue("i", forKey: "plat")
+        param.setValue("v", forKey: "playType")
+        param.setValue(bundleIdentifier, forKey: "platform_id")
+        param.setValue("", forKey: "channelName")
+        param.setValue("", forKey: "tag")
+        param.setValue("", forKey: "from")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        //        param.setValue(uuid, forKey: "uid")
+        param.setValue(shortVersion, forKey: "ver")
+        
+        param.setValue("1", forKey: "appType")
+        param.setValue("i", forKey: "clientPlat")
+        param.setValue(shortVersion, forKey: "version")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "loginSid")
+        param.setValue("release", forKey: "app_channel_id")
+        param.setValue("2", forKey: "rate")
+        param.setValue("release", forKey: "app_channel_id")
+        param.setValue("0", forKey: "retry")
+        
+        
+        let signStr = CNLiveBusinessTools.signvalue(param as! [AnyHashable : Any])
+        let string1 = "\(signStr)&key=\(CNLiveMCEnvironmentManager.shared.appKey)"
+        let signString1 = CNLiveBusinessTools.sha1(string1).uppercased()
+        let liveUrl = APPLoginHost+"/open/api2/vod_ips/vodplayByAPP"
+        
+        let videourl = "\(liveUrl)?\(signStr)&sign=\(signString1)"
+        print("111111URL:\(videourl)")
+            
+        // 创建一个可变URL请求
+        let urlRequest = NSMutableURLRequest(url: URL(string: videourl)!)
+        urlRequest.httpMethod = "GET"
+        urlRequest.timeoutInterval = 30
+        
+        let config = URLSessionConfiguration.default
+        config.requestCachePolicy = .reloadIgnoringLocalCacheData
+        let urlSession = URLSession(configuration: config, delegate: self, delegateQueue: OperationQueue.current)
+        let task = urlSession.dataTask(with: urlRequest as URLRequest) { data, response, error in
+            if let urlResponse = response as? HTTPURLResponse, urlResponse.statusCode == 301 || urlResponse.statusCode == 302  {
+                // do something ...
+                print("重定向地址 == \(urlResponse.allHeaderFields["Location"] as? String ?? "无重定向地址")")
+                resultBlock(urlResponse.allHeaderFields["Location"] as? String ?? "",.success)
+
+            }
+        }
+        
+        task.resume()
+    }
+    func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) {
+        print("\(response.statusCode)") // 302
+        print("\(response.allHeaderFields["Location"] as? String ?? "无重定向地址")") // 重定向地址URL
+        
+        // 根据业务需求决定是否使用新的请求继续任务
+        // completionHandler(request) // 使用新的请求继续任务
+        // completionHandler(nil) // 不使用新的请求，取消重定向
+        
+        // 在这个例子中，我们简单地取消重定向（即不使用新的请求）
+        completionHandler(nil)
+    }
+    
+    //点播详情
+    static func requestGetVodPlayApi( contentId:String,sid:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(contentId, forKey: "contentId")
+        param.setValue(sid, forKey: "sid")
+        param.setValue("", forKey: "channelName")
+        param.setValue("1", forKey: "model")
+        param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        param.setValue("1", forKey: "type")
+        param.setValue("", forKey: "app_channel_id")
+        
+
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+//https://cmsapi.cnlive.com/playApi/play?contentId=1350760&sid=&channelName=&model=1&appId=769_li40lrkt53&type=1&app_channel_id=
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: "https://cmsapi.cnlive.com/playApi/play", 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") {
+                    
+                    if let dataDic = resp["data"] as? Dictionary<String, Any>{
+                        let dataMdl = newDictionaryToModel(dataDic , CNLiveVodPlayModel.self)
+                        resultBlock(dataMdl,.success)
+                    }else
+                    {
+                        resultBlock(NSNull(),.failed)
+                    }
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+    ///  获取专辑信息接口
+    /// - Parameters:
+    ///   - aid: 专辑名称
+    ///   - resultBlock: 返回
+    static func requstWithVodAlbumMsgVideo(aid: String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(aid, forKey: "aid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue("mc_app", forKey: "app_channel_id")
+        
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getAlbumMsg", param: param as! [String : Any], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(), .failed)
+                    } else {
+                        let listModel = dictionaryToModel(resp["data"] as! [String : Any], CNLiveVodAlbumMsgModel.self,"") as! CNLiveVodAlbumMsgModel
+                        resultBlock(listModel, .success)
+                    }
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    //专辑列表
+    static func requstWithVodAlbumVideoList(aid: String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(aid, forKey: "aid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue("mc_app", forKey: "app_channel_id")
+        param.setValue("1", forKey: "page")
+        param.setValue("200", forKey: "pageSize")
+        
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/albumVideoList", param: param as! [String : Any], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(), .failed)
+                    } else {
+                        let listModel = dictionaryToModel(resp["data"] as! [String : Any], CNLiveVodAlbumListBaseModel.self,"") as! CNLiveVodAlbumListBaseModel
+                        resultBlock(listModel, .success)
+                    }
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+
+
+    
+    /// 忽必烈 获取首页原生页面顶部频道数据
+    static func requestGetHomePageTopConfigList( resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue("3310", forKey: "siteStyleId")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+//    http://cms.cnlive.com/api/contentApi/otherChannelList?siteStyleId=3310
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/otherChannelList", 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 dataArr = resp["data"] as! Array<Any>
+                    var resArr = []
+                    if dataArr.count > 0{
+                        //有在追短剧
+                        for dataDic in dataArr {
+                            let dataMdl = newDictionaryToModel(dataDic as! [String : Any], CNLiveHomePageHuBiLieModel.self)
+                            resArr.append(dataMdl)
+                        }
+                    }else{
+                        //没有在追短剧
+                    }
+                    
+                    resultBlock(resArr,.success)
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+    //电商分类
+    static func requestGetHomePageShopCategoryApi(shop_id:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(shop_id, forKey: "shop_id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj_b, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj_b, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/sellerCategory", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                if let errCode = resp["code"] as? String{
+                    if errCode == "200" || errCode == "0"{
+                        let dataDic = resp["data"] as! NSDictionary
+                        let shopCategoryModel =  newDictionaryToModel(dataDic as! [String : Any], CNLiveHomeShopCategoryModel.self)
+                        resultBlock(shopCategoryModel,.success)
+                    }else{
+                        resultBlock(NSNull(),.failed)
+                    }
+                }
+            }
+            resultBlock(NSNull(),.failed)
+        }
+    }
+
+    static func requestGetHomePageFollow( sid:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue("yszg", forKey: "channelName")
+        
+//        param.setValue("1342671", forKey: "sid")
+
+        param.setValue(sid, forKey: "sid")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+//    http://cms.cnlive.com/api/recordApi/getRecords?sid=10506285&channelName=yszg
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/recordApi/getRecords", 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>
+                    var resArr = dataDic["list"] as! Array<Any>
+                    if resArr.count > 0{
+                        //有在追
+                        let followDic = resArr.first as! Dictionary<String, Any>
+                        let dataMdl = newDictionaryToModel(followDic as! [String : Any], CNLiveHomeFollowModel.self)
+                        resultBlock(dataMdl,.success)
+                    }else{
+                        //没有在追短剧
+                        resultBlock(NSNull(),.failed)
+                    }
+                    
+                }
+                else{
+                    resultBlock(NSNull(),.failed)
+                }
+            }
+        }
+    }
+    
+    static func requestGetMinePlayHistory( sid:String,page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue("yszg", forKey: "channelName")
+        param.setValue("\(page)", forKey: "page")
+
+//        param.setValue("1342671", forKey: "sid")
+
+        param.setValue(sid, forKey: "sid")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+//    http://cms.cnlive.com/api/recordApi/getRecords?sid=10506285&channelName=yszg
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/recordApi/getRecords", 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") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(), .failed)
+                    } else {
+                        let listModel = dictionaryToModel(resp["data"] as! [String : Any], CNLiveHomeFollowListBaseModel.self,"") as! CNLiveHomeFollowListBaseModel
+                        resultBlock(listModel, .success)
+                    }
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+
+        }
+    }
+    //收藏列表：contentApi/getCollectionList  参数：sid、source=yszg、page、pageSize
+    static func getCollectionListApi(sid:String,page:String,pageSize:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(sid, forKey: "sid")
+        param.setValue("yszg", forKey: "source")
+        param.setValue(page, forKey: "page")
+        param.setValue(pageSize, forKey: "pageSize")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/getCollectionList", 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") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(), .failed)
+                    } else {
+                        let listModel = dictionaryToModel(resp["data"] as! [String : Any], CNLiveCollectionListBaseModel.self,"") as! CNLiveCollectionListBaseModel
+                        resultBlock(listModel, .success)
+                    }
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
  
-class CNLiveHomePageViewModel:NSObject{
  
     /// 获取首页原生页面数据
     static func requestGetHomePageConfigList( resultBlock: @escaping downSlideResultBlock) {
@@ -165,6 +565,8 @@ class CNLiveHomePageViewModel:NSObject{
     static func getAlbumList(aid:String, page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(aid, forKey: "aid")
+        param.setValue("mc_app", forKey: "app_channel_id")
+
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue("\(page)", forKey: "page")
  
+//
+//  CNLiveHomeLanmuController.swift
+//  metaCode
+//
+//  Created by zx on 2025/3/11.
+//
+
+import Foundation
+import MJRefresh
+class CNLiveHomeLanmuController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+        
+    var _slideContentModel : CNLiveDownSlideContentsModel?
+    var slideContentModel : CNLiveDownSlideContentsModel? {
+        get{
+            _slideContentModel
+        }
+        set{
+            _slideContentModel = newValue!
+            
+        }
+    }
+
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    lazy var headerDataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+
+    let kCNLiveHomeLanmuThreeImgCellIdentifier = "kCNLiveHomeLanmuThreeImgCellIdentifier"
+    
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNLiveHomeLanmuThreeImgCell.self, forCellReuseIdentifier: kCNLiveHomeLanmuThreeImgCellIdentifier)
+        tableView.backgroundColor = .white
+        return tableView
+    }()
+
+    var pageId = ""
+    var currentHeaderBtnIndex = 0
+    var resultHeaderView:UIView?
+    var footerRefreshView: MJRefreshAutoNormalFooter!
+    var page = 1//当前页数
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.navigationBarHidden = false
+        titleName = self.slideContentModel?.title ?? ""
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.top.equalTo(KNavigationHeight)
+            make.bottom.equalToSuperview()
+            make.right.equalToSuperview()
+        }
+        self.addRefreshView()
+        self.setUpResultHeaderView()
+
+        self.getPageApi(pageID: self.pageId)
+    }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            guard let self = self else { return }
+            self.page = 1
+            self.getBlockContents(page: 1)
+        })
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            guard let self = self else { return }
+            self.page = self.page + 1
+            self.getBlockContents(page: self.page)
+        })
+    }
+
+    func setUpResultHeaderView(){
+        resultHeaderView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 52))
+        resultHeaderView?.backgroundColor = .white
+        
+        tableView.tableHeaderView = resultHeaderView
+    }
+
+    // MARK: - BtnAction
+    @objc func headerBtnAction(btn:UIButton){
+        let index = btn.tag - 1000
+        self.currentHeaderBtnIndex = index
+        for objBtn in self.resultHeaderView!.subviews{
+            if let obj = objBtn as? UIButton{
+                if obj.tag == btn.tag{
+                    //选中
+                    obj.backgroundColor = HexColor("#D3E4FF")
+                    obj.setTitleColor(HexColor("#2076FF"), for: .normal)
+                }else{
+                    //未选中
+                    obj.backgroundColor = .clear
+                    obj.setTitleColor(HexColor("#919191"), for: .normal)
+                }
+
+            }
+        }
+        //刷新接口
+        self.getBlockContents(page: 1)
+    }
+        
+    // MARK: - UITableViewDelegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.dataArray.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if let slideModel = self.dataArray[indexPath.row] as? [CNLiveAlbumModel]{
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeLanmuThreeImgCellIdentifier) as? CNLiveHomeLanmuThreeImgCell
+            else {
+                let cell = CNLiveHomeLanmuThreeImgCell()
+                return cell
+            }
+            cell.slideModel = slideModel
+            return cell
+        }
+        return UITableViewCell()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        let imgW:CGFloat = (KSreenWidth-60.0)/3.0
+        let imgH:CGFloat = imgW*140.0/105.0
+        return imgH+55.0
+    }
+    
+    deinit {
+    }
+    //MARK: - 网络请求获取区块详情页
+    func getPageApi(pageID:String)
+    {
+        showLoading(message: "")
+        CNLiveDownSlideViewModel.requestGetPage(pageId: pageID as NSString) {[weak self] result, status in
+            hiddenLoading()
+            guard let self = self else { return }
+            if status == .success{
+                self.headerDataArray.removeAllObjects()
+                let array = result as! [Any]
+                let newDataArray = NSMutableArray()
+                for (idx,slideModel) in array.enumerated() {
+                    if let model = slideModel as? CNLiveDownSlideModel{
+                                                
+                        newDataArray.addObjects(from: [model])
+                        //创建区块btn                        
+                        let width = 60.0
+                        let height = 32.0
+                        let x = 15.0+CGFloat(idx)*width
+                        let y = 10.0
+
+                        let expandBtn = UIButton.init(type: .custom)
+//                        expandBtn.backgroundColor = HexColor("#D3E4FF")
+//                        expandBtn.setTitleColor(HexColor("#2076FF"), for: .normal)
+                        if idx == self.currentHeaderBtnIndex{
+                            //选中
+                            expandBtn.backgroundColor = HexColor("#D3E4FF")
+                            expandBtn.setTitleColor(HexColor("#2076FF"), for: .normal)
+                        }else{
+                            //未选中
+                            expandBtn.backgroundColor = .clear
+                            expandBtn.setTitleColor(HexColor("#919191"), for: .normal)
+                        }
+
+                        expandBtn.setTitle(model.blockName, for: .normal)
+                        expandBtn.layer.cornerRadius = 16
+                        expandBtn.clipsToBounds = true
+                        expandBtn.titleLabel?.font = BoldFont_13
+                        expandBtn.frame = CGRect(x: x, y: y, width: width, height: height)
+                        expandBtn.tag = 1000+idx
+                        expandBtn.addTarget(self, action: #selector(headerBtnAction), for: .touchUpInside)
+                        resultHeaderView?.addSubview(expandBtn)
+                    }
+                }
+                self.headerDataArray.addObjects(from: newDataArray as! [Any])
+                self.getBlockContents(page: 1)
+                
+            }else if (status == .failed){
+                //                self.NetApiStatus = .apiError
+            }else if (status == .noNetwork){
+                
+                //                self.NetApiStatus = .notNetwork
+            }
+        }
+        //
+    }
+
+    func chunkArray<T>(array: [T], chunkSize: Int) -> [[T]] {
+        var result = [[T]]()
+        var currentIndex = 0
+        
+        while currentIndex < array.count {
+            let endIndex = min(currentIndex + chunkSize, array.count)
+            let chunk = Array(array[currentIndex..<endIndex])
+            result.append(chunk)
+            currentIndex += chunkSize
+        }
+        
+        return result
+    }
+
+
+    // MARK: - 获取内容
+    func getBlockContents(page:NSInteger){
+        showLoading(message: "")
+        if let slideModel = self.headerDataArray[self.currentHeaderBtnIndex] as? CNLiveDownSlideModel{
+            let blockId = slideModel.blockId
+            print("blockId:\(blockId)")
+            CNLiveHomePageViewModel.getBlockContents(blockId: blockId, page: page) {[weak self] result, status in
+                hiddenLoading()
+                guard let self = self else { return }
+                if status == .success{
+                    let albumBaseModel = result as! CNLiveAlbumBaseModel
+                    if self.page > 1 && albumBaseModel.list.count > 0 {
+                        var tempArr = Array<Any>()
+                        for obj in self.dataArray {
+                            if let objArr = obj as? Array<Any>{
+                                for tempObj in objArr{
+                                    if let tempMdl = tempObj as? CNLiveAlbumModel{
+                                        tempArr.append(tempMdl)
+                                    }
+                                }
+                            }else{
+                                if let tempMdl = obj as? CNLiveAlbumModel{
+                                    tempArr.append(tempMdl)
+                                }
+                            }
+                        }
+
+                        self.dataArray = NSMutableArray(array: tempArr)
+                        self.dataArray.addObjects(from: albumBaseModel.list)
+                    }
+                    if self.page == 1 {
+                        self.dataArray.removeAllObjects()
+                        self.dataArray.addObjects(from: albumBaseModel.list)
+                        if self.dataArray.count > 0 && self.tableView.mj_header == nil && self.tableView.mj_footer == nil {
+                            self.addRefreshView()
+                        }
+                    }
+                    
+                    self.tableView.mj_header?.endRefreshing()
+                    
+                    //分成3个一组
+                    let chunkedArray = self.chunkArray(array: self.dataArray as! Array<Any>, chunkSize: 3)
+                    self.dataArray = NSMutableArray(array: chunkedArray)
+                    self.tableView.reloadData()
+                    if albumBaseModel.hasNextPage{
+                        self.tableView.mj_footer?.endRefreshing()
+                    }else{
+                        self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    }
+
+                }else if (status == .noNetwork) {
+//                    self.network_type = .noNetwork
+//                    self.tableView.reloadEmptyDataSet()
+                } else {
+//                    self.network_type = .failed
+//                    self.tableView.reloadEmptyDataSet()
+                }
+            }
+
+        }else{
+            
+        }
+    }
+
+}
+//
+//  CNLiveHomeMoreController.swift
+//  metaCode
+//
+//  Created by zx on 2025/3/14.
+//
+
+import Foundation
+import MJRefresh
+class CNLiveHomeMoreController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+        
+    //我的播放记录
+    var _followModels : [CNLiveHomeFollowModel]?
+    var followModels : [CNLiveHomeFollowModel]? {
+        get{
+            _followModels
+        }
+        set{
+            _followModels = newValue!
+        }
+    }
+
+    //1行2横图   1行3竖图
+    var _slideModel : CNLiveDownSlideModel?
+    var slideModel : CNLiveDownSlideModel? {
+        get{
+            _slideModel
+        }
+        set{
+            _slideModel = newValue!
+        }
+    }
+
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+
+    let kCNLiveHomeLanmuThreeImgCellIdentifier = "kCNLiveHomeLanmuThreeImgCellIdentifier"
+    let kCNLiveHomeTwoHengTuCellIdentifier = "kCNLiveHomeTwoHengTuCellIdentifier"
+    
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNLiveHomeLanmuThreeImgCell.self, forCellReuseIdentifier: kCNLiveHomeLanmuThreeImgCellIdentifier)
+        tableView.register(CNLiveHomeTwoHengTuCell.self, forCellReuseIdentifier: kCNLiveHomeTwoHengTuCellIdentifier)
+        tableView.backgroundColor = .white
+        return tableView
+    }()
+
+    var footerRefreshView: MJRefreshAutoNormalFooter!
+    var page = 1//当前页数
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.navigationBarHidden = false
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.top.equalTo(KNavigationHeight)
+            make.bottom.equalToSuperview()
+            make.right.equalToSuperview()
+        }
+        self.addRefreshView()
+        self.page = 1
+        if self.slideModel != nil{
+            titleName = self.slideModel?.blockName ?? ""
+            self.getBlockContents(page: self.page)
+        }else if self.followModels != nil{
+            self.getHomePageFollowApi(sid: UserInfoManager.shared.userInfo.uid)
+            titleName = "播放记录"
+        }else{
+            //我的收藏
+            titleName = "我的收藏"
+            self.getCollectionListApi()
+        }
+    }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            guard let self = self else { return }
+            self.page = 1
+            if self.slideModel != nil{
+                self.getBlockContents(page: 1)
+            }else if self.followModels != nil{
+                self.getHomePageFollowApi(sid: UserInfoManager.shared.userInfo.uid)
+            }else{
+                self.getCollectionListApi()
+            }
+        })
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            guard let self = self else { return }
+            self.page = self.page + 1
+            if self.slideModel != nil{
+                self.getBlockContents(page: self.page)
+            }else if self.followModels != nil{
+                self.getHomePageFollowApi(sid: UserInfoManager.shared.userInfo.uid)
+            }else{
+                self.getCollectionListApi()
+            }
+        })
+    }
+        
+    // MARK: - UITableViewDelegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.dataArray.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if let slideModel = self.dataArray[indexPath.row] as? [CNLiveAlbumModel]{
+            if self.slideModel?.type == SlideModelTypeTVOneBigTwoSmall2{
+                //一行2个横图
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeTwoHengTuCellIdentifier) as? CNLiveHomeTwoHengTuCell
+                else {
+                    let cell = CNLiveHomeTwoHengTuCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+
+            }else if self.slideModel?.type == SlideModelTypeTwoDuanJu5{
+                //一行3个竖图
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeLanmuThreeImgCellIdentifier) as? CNLiveHomeLanmuThreeImgCell
+                else {
+                    let cell = CNLiveHomeLanmuThreeImgCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else{
+                //
+            }
+             
+        }else if let followModel = self.dataArray[indexPath.row] as? [CNLiveHomeFollowModel]{
+            //一行2个横图
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeTwoHengTuCellIdentifier) as? CNLiveHomeTwoHengTuCell
+            else {
+                let cell = CNLiveHomeTwoHengTuCell()
+                return cell
+            }
+            cell.followModel = followModel
+            return cell
+        }else if let collectionModel = self.dataArray[indexPath.row] as? [CNLiveCollectionListModel]{
+            //一行2个横图
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeTwoHengTuCellIdentifier) as? CNLiveHomeTwoHengTuCell
+            else {
+                let cell = CNLiveHomeTwoHengTuCell()
+                return cell
+            }
+            cell.collectionModel = collectionModel
+            return cell
+        }
+        return UITableViewCell()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if let slideModel = self.dataArray[indexPath.row] as? [CNLiveAlbumModel]{
+            if self.slideModel?.type == SlideModelTypeTVOneBigTwoSmall2{
+                //一行2个横图
+                let imgW:CGFloat = (KSreenWidth-45.0)/2.0
+                let imgH:CGFloat = imgW*93.0/165.0
+                return imgH+76.0
+            }else if self.slideModel?.type == SlideModelTypeTwoDuanJu5{
+                //一行3个竖图
+                let imgW:CGFloat = (KSreenWidth-60.0)/3.0
+                let imgH:CGFloat = imgW*140.0/105.0
+                return imgH+55.0
+            }else{
+            }
+        }else if let followModel = self.dataArray[indexPath.row] as? [CNLiveHomeFollowModel]{
+            //一行2个横图
+            let imgW:CGFloat = (KSreenWidth-45.0)/2.0
+            let imgH:CGFloat = imgW*93.0/165.0
+            return imgH+76.0
+        }else if let followModel = self.dataArray[indexPath.row] as? [CNLiveCollectionListModel]{
+            //一行2个横图
+            let imgW:CGFloat = (KSreenWidth-45.0)/2.0
+            let imgH:CGFloat = imgW*93.0/165.0
+            return imgH+76.0
+        }
+        return 60
+    }
+    
+    deinit {
+    }
+
+    func chunkArray<T>(array: [T], chunkSize: Int) -> [[T]] {
+        var result = [[T]]()
+        var currentIndex = 0
+        
+        while currentIndex < array.count {
+            let endIndex = min(currentIndex + chunkSize, array.count)
+            let chunk = Array(array[currentIndex..<endIndex])
+            result.append(chunk)
+            currentIndex += chunkSize
+        }
+        
+        return result
+    }
+
+    // MARK: - 获取内容
+    //我的-播放记录
+    func getHomePageFollowApi(sid:String){
+        CNLiveHomePageViewModel.requestGetMinePlayHistory(sid: sid, page: self.page){[weak self] result, status in
+            guard let self = self else { return }
+            hiddenLoading()
+            if status == .success{
+                let albumBaseModel = result as! CNLiveHomeFollowListBaseModel
+                
+                if self.page > 1 && albumBaseModel.list.count > 0 {
+                    var tempArr = Array<Any>()
+                    for obj in self.dataArray {
+                        if let objArr = obj as? Array<Any>{
+                            for tempObj in objArr{
+                                if let tempMdl = tempObj as? CNLiveHomeFollowModel{
+                                    tempArr.append(tempMdl)
+                                }
+                            }
+                        }else{
+                            if let tempMdl = obj as? CNLiveHomeFollowModel{
+                                tempArr.append(tempMdl)
+                            }
+                        }
+                    }
+
+                    self.dataArray = NSMutableArray(array: tempArr)
+                    self.dataArray.addObjects(from: albumBaseModel.list)
+                }
+                if self.page == 1 {
+                    self.dataArray.removeAllObjects()
+                    self.dataArray.addObjects(from: albumBaseModel.list)
+                    if self.dataArray.count > 0 && self.tableView.mj_header == nil && self.tableView.mj_footer == nil {
+                        self.addRefreshView()
+                    }
+                }
+                
+                self.tableView.mj_header?.endRefreshing()
+                
+                //分成2个一组
+                let chunkedArray = self.chunkArray(array: self.dataArray as! Array<Any>, chunkSize: 2)
+                self.dataArray = NSMutableArray(array: chunkedArray)
+                self.tableView.reloadData()
+                if albumBaseModel.hasNextPage{
+                    self.tableView.mj_footer?.endRefreshing()
+                }else{
+                    self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                }
+
+            }else{
+                //没有
+            }
+        }
+    }
+    
+    //我的-收藏记录
+    func getCollectionListApi(){
+        CNLiveHomePageViewModel.getCollectionListApi(sid: UserInfoManager.shared.userInfo.uid, page: "\(self.page)", pageSize: "10") {[weak self] result, status in
+            guard let self = self else { return }
+            hiddenLoading()//UserInfoManager.shared.userInfo.uid //"10506286"
+            if status == .success{
+                let albumBaseModel = result as! CNLiveCollectionListBaseModel
+                
+                if self.page > 1 && albumBaseModel.list.count > 0 {
+                    var tempArr = Array<Any>()
+                    for obj in self.dataArray {
+                        if let objArr = obj as? Array<Any>{
+                            for tempObj in objArr{
+                                if let tempMdl = tempObj as? CNLiveCollectionListModel{
+                                    tempArr.append(tempMdl)
+                                }
+                            }
+                        }else{
+                            if let tempMdl = obj as? CNLiveCollectionListModel{
+                                tempArr.append(tempMdl)
+                            }
+                        }
+                    }
+
+                    self.dataArray = NSMutableArray(array: tempArr)
+                    self.dataArray.addObjects(from: albumBaseModel.list)
+                }
+                if self.page == 1 {
+                    self.dataArray.removeAllObjects()
+                    self.dataArray.addObjects(from: albumBaseModel.list)
+                    if self.dataArray.count > 0 && self.tableView.mj_header == nil && self.tableView.mj_footer == nil {
+                        self.addRefreshView()
+                    }
+                }
+                
+                self.tableView.mj_header?.endRefreshing()
+                
+                //分成2个一组
+                let chunkedArray = self.chunkArray(array: self.dataArray as! Array<Any>, chunkSize: 2)
+                self.dataArray = NSMutableArray(array: chunkedArray)
+                self.tableView.reloadData()
+                if albumBaseModel.hasNextPage{
+                    self.tableView.mj_footer?.endRefreshing()
+                }else{
+                    self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                }
+
+            }else{
+                //没有
+            }
+        }
+    }
+
+    func getBlockContents(page:NSInteger){
+        showLoading(message: "")
+        if let blockId = self.slideModel?.blockId{
+            print("blockId:\(blockId)")
+            CNLiveHomePageViewModel.getBlockContents(blockId: blockId, page: page) {[weak self] result, status in
+                hiddenLoading()
+                guard let self = self else { return }
+                if status == .success{
+                    let albumBaseModel = result as! CNLiveAlbumBaseModel
+                    if self.page > 1 && albumBaseModel.list.count > 0 {
+                        var tempArr = Array<Any>()
+                        for obj in self.dataArray {
+                            if let objArr = obj as? Array<Any>{
+                                for tempObj in objArr{
+                                    if let tempMdl = tempObj as? CNLiveAlbumModel{
+                                        tempArr.append(tempMdl)
+                                    }
+                                }
+                            }else{
+                                if let tempMdl = obj as? CNLiveAlbumModel{
+                                    tempArr.append(tempMdl)
+                                }
+                            }
+                        }
+
+                        self.dataArray = NSMutableArray(array: tempArr)
+                        self.dataArray.addObjects(from: albumBaseModel.list)
+                    }
+                    if self.page == 1 {
+                        self.dataArray.removeAllObjects()
+                        self.dataArray.addObjects(from: albumBaseModel.list)
+                        if self.dataArray.count > 0 && self.tableView.mj_header == nil && self.tableView.mj_footer == nil {
+                            self.addRefreshView()
+                        }
+                    }
+                    
+                    self.tableView.mj_header?.endRefreshing()
+                    
+                    //分成3个一组
+                    let chunkedArray = self.chunkArray(array: self.dataArray as! Array<Any>, chunkSize: 3)
+                    self.dataArray = NSMutableArray(array: chunkedArray)
+                    self.tableView.reloadData()
+                    if albumBaseModel.hasNextPage{
+                        self.tableView.mj_footer?.endRefreshing()
+                    }else{
+                        self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    }
+
+                }else if (status == .noNetwork) {
+//                    self.network_type = .noNetwork
+//                    self.tableView.reloadEmptyDataSet()
+                } else {
+//                    self.network_type = .failed
+//                    self.tableView.reloadEmptyDataSet()
+                }
+            }
+
+        }
+
+    }
+
+}
+//
+//  CNLiveHomeSearchController.swift
+//  metaCode
+//
+//  Created by zx on 2025/3/7.
+//
+//
+import Foundation
+import QMUIKit
+import MJRefresh
+
+class CNLiveHomeSearchController:CNLiveBaseViewController,UISearchBarDelegate, UITableViewDataSource, UITableViewDelegate{
+    
+    let CNLiveHomeSearchHistoryKey = "CNLiveHomeSearchHistoryKey"
+    lazy var searBarView :QMUISearchBar = {
+        let iconImgView = QMUISearchBar(frame: CGRect(x: 15, y: KStatusBarHeight, width: KSreenWidth-50-15, height: 32))
+        iconImgView.backgroundColor = .white//.clear
+        iconImgView.searchTextField.backgroundColor = .white
+        iconImgView.searchTextField.clearButtonMode = .whileEditing
+        iconImgView.searchTextField.font = Font_13
+        iconImgView.searchTextField.textColor = HexColor("#333333")
+        iconImgView.clipsToBounds = true
+        iconImgView.layer.cornerRadius = 16
+        iconImgView.backgroundImage = UIImage(named: "home_searchBg")
+        iconImgView.scopeBarBackgroundImage = UIImage(named: "home_searchBg")
+        iconImgView.contentMode = .scaleAspectFill
+        iconImgView.backgroundColor = .clear
+        iconImgView.searchTextField.backgroundColor = .clear
+        iconImgView.inputView?.backgroundColor = .clear
+        iconImgView.delegate = self
+        return iconImgView
+    }()
+    lazy var searchBgImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "home_searchBg")
+        iconImgView.contentMode = .scaleAspectFill
+        return iconImgView
+    }()
+
+    lazy var cancelBtn: QMUIButton = {
+        let playBtn = QMUIButton.init(type: .custom)
+        playBtn.setTitle("取消", for: .normal)
+        playBtn.setTitleColor(HexColor("#999999"), for: .normal)
+        playBtn.titleLabel?.font = Font_15
+        playBtn.addTarget(self, action: #selector(cancelBtnAction), for: .touchUpInside)
+        return playBtn
+    }()
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    let kCNLiveHomeSearchHotCellIdentifier = "kCNLiveHomeSearchHotCellIdentifier"
+    let kCNLiveHomeSearchHistoryCellIdentifier = "kCNLiveHomeSearchHistoryCellIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNLiveHomeSearchHistoryCell.self, forCellReuseIdentifier: kCNLiveHomeSearchHistoryCellIdentifier)
+        tableView.register(CNLiveHomeSearchHotCell.self, forCellReuseIdentifier: kCNLiveHomeSearchHotCellIdentifier)
+
+        tableView.backgroundColor = .white
+        return tableView
+    }()
+    
+    var searchText = ""//搜索内容
+    var hisArr = [String]()//搜索本地历史
+    var page = 1//当前页数
+    var historyHeight:CGFloat = 176//默认高度
+    
+    // MARK: - 搜索结果
+    //搜索结果数组
+    lazy var resultListArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    let kCNLiveHomeSearchResultJuJiCellIdentifier = "kCNLiveHomeSearchResultJuJiCellIdentifier"
+//    let kCNLiveHomeSearchResultDuanJuCellIdentifier = "kCNLiveHomeSearchResultDuanJuCellIdentifier"
+    lazy var resultTableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNLiveHomeSearchResultJuJiCell.self, forCellReuseIdentifier: kCNLiveHomeSearchResultJuJiCellIdentifier)
+//        tableView.register(CNLiveHomeSearchResultDuanJuCell.self, forCellReuseIdentifier: kCNLiveHomeSearchResultDuanJuCellIdentifier)
+
+        tableView.backgroundColor = .white
+        return tableView
+    }()
+    var resultHeaderView:UIView?
+    
+    var footerRefreshView: MJRefreshAutoNormalFooter!
+    var isJujiModel:Bool = false//搜索结果 默认单集
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .white
+
+        view.addSubview(searBarView)
+        searBarView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(15)
+            make.top.equalToSuperview().offset(KStatusBarHeight)
+            make.width.equalTo((KSreenWidth-50-15 > 310) ? 310 : KSreenWidth-50-15 )
+            make.height.equalTo(32)
+        }
+//        view.addSubview(searchBgImgView)
+//        searchBgImgView.snp.makeConstraints { make in
+//            make.left.equalToSuperview().offset(15)
+//            make.top.equalToSuperview().offset(KStatusBarHeight)
+//            make.width.equalTo(KSreenWidth-50-15)
+//            make.height.equalTo(32)
+//        }
+
+        view.addSubview(cancelBtn)
+        cancelBtn.snp.makeConstraints { make in
+            make.left.equalTo(self.searBarView.snp.right)
+            make.top.equalTo(self.searBarView.snp.top)
+            make.bottom.equalTo(self.searBarView.snp.bottom)
+            make.right.equalToSuperview()
+        }
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.top.equalTo(self.searBarView.snp.bottom)
+            make.bottom.equalToSuperview()
+            make.right.equalToSuperview()
+        }
+        self.recordSearchHistory()
+        self.getSearchHotListApi()
+        
+        view.addSubview(resultTableView)
+        resultTableView.isHidden = true
+        resultTableView.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.top.equalTo(self.searBarView.snp.bottom)
+            make.bottom.equalToSuperview()
+            make.right.equalToSuperview()
+        }
+        self.setUpResultHeaderView()
+        self.addRefreshView()
+    }
+    
+    lazy var headerJuJiBtn: UIButton = {
+        let expandBtn = UIButton.init(type: .custom)
+        expandBtn.backgroundColor = .clear
+        expandBtn.setTitleColor(HexColor("#919191"), for: .normal)
+
+        expandBtn.titleLabel?.font = BoldFont_13
+        expandBtn.setTitle("剧集", for: .normal)
+        expandBtn.layer.cornerRadius = 16
+        expandBtn.clipsToBounds = true
+        expandBtn.frame = CGRect(x: 0, y: 0, width: 60, height: 32)
+        expandBtn.addTarget(self, action: #selector(headerJuJiBtnAction), for: .touchUpInside)
+        return expandBtn
+    }()
+    lazy var headerDuanJuBtn: UIButton = {
+        let expandBtn = UIButton.init(type: .custom)
+        expandBtn.backgroundColor = HexColor("#D3E4FF")
+        expandBtn.setTitleColor(HexColor("#2076FF"), for: .normal)
+
+        expandBtn.setTitle("视频", for: .normal)
+        expandBtn.layer.cornerRadius = 16
+        expandBtn.clipsToBounds = true
+        expandBtn.titleLabel?.font = BoldFont_13
+        expandBtn.frame = CGRect(x: 0, y: 0, width: 60, height: 32)
+        expandBtn.addTarget(self, action: #selector(headerDuanJuBtnAction), for: .touchUpInside)
+        return expandBtn
+    }()
+
+    func addRefreshView() {
+        resultTableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            guard let self = self else { return }
+            self.page = 1
+            self.getSearchResultWithSearchText(searchText: self.searchText, modelId: self.isJujiModel ? "album" : "1", isFirst: true, page: "1")
+        })
+        resultTableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            guard let self = self else { return }
+            //"album"剧集 1单集
+            self.page = self.page + 1
+            self.getSearchResultWithSearchText(searchText: searchText, modelId: self.isJujiModel ? "album" : "1", isFirst: false, page: "\(self.page)")
+        })
+
+    }
+
+    func setUpResultHeaderView(){
+        resultHeaderView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 60))
+        resultHeaderView?.backgroundColor = .white
+        
+        resultHeaderView!.addSubview(headerDuanJuBtn)
+        headerDuanJuBtn.snp.makeConstraints { make in
+            make.left.equalTo(15)
+            make.width.equalTo(60)
+            make.centerY.equalToSuperview()
+            make.height.equalTo(32)
+        }
+        resultHeaderView!.addSubview(headerJuJiBtn)
+        headerJuJiBtn.snp.makeConstraints { make in
+            make.left.equalTo(self.headerDuanJuBtn.snp.right)
+            make.width.equalTo(60)
+            make.centerY.equalToSuperview()
+            make.height.equalTo(32)
+        }
+        resultTableView.tableHeaderView = resultHeaderView
+        self.isJujiModel = false
+    }
+    
+    func changeResult(){
+        self.page = 1
+        self.getSearchResultWithSearchText(searchText: self.searchText, modelId: self.isJujiModel ? "album" : "1", isFirst: true, page: "1")
+    }
+    // MARK: - BtnAction
+    @objc func headerDuanJuBtnAction(){
+        if self.searBarView.isFirstResponder{
+            self.view.endEditing(true)
+        }
+        isJujiModel = false
+        headerJuJiBtn.backgroundColor = .clear
+        headerJuJiBtn.setTitleColor(HexColor("#919191"), for: .normal)
+
+        headerDuanJuBtn.backgroundColor = HexColor("#D3E4FF")
+        headerDuanJuBtn.setTitleColor(HexColor("#2076FF"), for: .normal)
+
+        changeResult()
+    }
+    @objc func headerJuJiBtnAction(){
+        if self.searBarView.isFirstResponder{
+            self.view.endEditing(true)
+        }
+        isJujiModel = true
+        headerJuJiBtn.backgroundColor = HexColor("#D3E4FF")
+        headerJuJiBtn.setTitleColor(HexColor("#2076FF"), for: .normal)
+
+        headerDuanJuBtn.backgroundColor = .clear
+        headerDuanJuBtn.setTitleColor(HexColor("#919191"), for: .normal)
+
+        changeResult()
+    }
+    
+    @objc func cancelBtnAction(){
+        self.isJujiModel = false
+        if self.resultTableView.isHidden{
+            self.navigationController?.popViewController(animated: false)
+        }else{
+            self.resultTableView.isHidden = true
+        }
+    }
+    
+    // MARK: - UISearchBarDelegate
+    func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+        if let text = searchBar.text{
+            let trimStr = text.qmui_trim
+            if trimStr.qmui_trimAllWhiteSpace.count == 0{
+                QMUITips.showError("搜索内容不能为空", in: self.view, hideAfterDelay: 1.5)
+                return
+            }
+            self.tableView.tableFooterView = nil
+            self.tableView.mj_footer = nil
+            self.searchText = text
+            self.page = 1
+            self.view.endEditing(true)
+            showLoading(message: "")
+            self.getSearchResultWithSearchText(searchText: searchText, modelId: self.isJujiModel ? "album" : "1", isFirst: true, page: "1")
+            self.recordSearchHistory()
+            self.getSearchHotListApi()
+        }
+
+    }
+    func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
+        if searchText.count == 0{
+            self.tableView.tableFooterView = nil
+//            self.tableView.removeFromSuperview()
+        }
+        
+    }
+    func searchBar(_ searchBar: UISearchBar, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        if text == "" || text == "\n"{
+            //删
+            return true
+        }
+        if (text.count+(searchBar.text?.count ?? 0)) > 30{
+            //输入字符超过最大限制
+            QMUITips.showError("输入字符超过最大限制", in: self.view, hideAfterDelay: 1.5)
+            return false
+        }
+        return true
+        
+    }
+    
+    // MARK: - UITableViewDelegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if tableView == self.tableView{
+            return self.dataArray.count
+        }else{
+            //搜索结果
+            return self.resultListArray.count
+        }
+    }
+    // MARK: - UITableViewDelegate
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if tableView == self.tableView{
+            if let historyModel = self.dataArray[indexPath.row] as? CNLiveHomeSearchHistoryModel{
+                //搜索历史
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeSearchHistoryCellIdentifier) as? CNLiveHomeSearchHistoryCell
+                else {
+                    let cell = CNLiveHomeSearchHistoryCell()
+                    return cell
+                }
+                cell.historyModel = historyModel
+                cell.searchHistoryClickBlock = { searchText in
+                    self.searchText = searchText
+                    self.view.endEditing(true)
+                    self.getSearchResultWithSearchText(searchText: searchText, modelId: self.isJujiModel ? "album" : "1", isFirst: true, page: "1")
+                }
+                cell.newHeight = { height in
+                    self.historyHeight = height
+                }
+                return cell
+                
+            }else if let hotModel = self.dataArray[indexPath.row] as? CNLiveHomeSearchHotModel{
+                //热词
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeSearchHotCellIdentifier) as? CNLiveHomeSearchHotCell
+                else {
+                    let cell = CNLiveHomeSearchHotCell()
+                    return cell
+                }
+                cell.hotModel = hotModel
+                return cell
+            }else{
+                
+            }
+        }else{
+            //搜索结果
+            if let resModel = self.resultListArray[indexPath.row] as? CNLiveHomeSearchResultListModel{
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeSearchResultJuJiCellIdentifier) as? CNLiveHomeSearchResultJuJiCell
+                else {
+                    let cell = CNLiveHomeSearchResultJuJiCell()
+                    return cell
+                }
+                cell.resModel = resModel
+                return cell
+//                else if resModel.model == kCNDownSlideContentsModelModel1{//点播
+//                    guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeSearchResultDuanJuCellIdentifier) as? CNLiveHomeSearchResultDuanJuCell
+//                    else {
+//                        let cell = CNLiveHomeSearchResultDuanJuCell()
+//                        return cell
+//                    }
+//                    cell.resModel = resModel
+//                    return cell
+//                }
+            }
+        }
+        return UITableViewCell()
+    }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if tableView == self.tableView{
+            if let slideModel = self.dataArray[indexPath.row] as? CNLiveHomeSearchHotModel{
+                //热词列表
+                self.searchText = slideModel.value.count > 0 ? slideModel.value : ""
+                self.searBarView.text = self.searchText
+                self.recordSearchHistory()
+                self.getSearchHotListApi()
+                self.getSearchResultWithSearchText(searchText: self.searchText, modelId: self.isJujiModel ? "album" : "1", isFirst: true, page: "1")
+            }
+        }else{
+            //搜索结果
+            if let resModel = self.resultListArray[indexPath.row] as? CNLiveHomeSearchResultListModel{
+                
+                var contentId = ""
+                var pid = ""
+                var title = ""
+
+                if resModel.model == kCNDownSlideContentsModelModelAlbum_video{//专辑
+                    contentId = resModel.albumId
+                    pid = resModel.pid
+                    title = resModel.name
+                }else if resModel.model == kCNDownSlideContentsModelModel1{//点播
+                    contentId = resModel.contentId
+                    pid = resModel.pid
+                    title = resModel.title
+                }
+                //跳转到点播详情页-专辑/点播
+                CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: resModel.model, contentId: contentId, pid: pid, shareUrl: "", thirdUrl: "", title: title, s_to: "", trailerId: "", controller: navigationViewController().visibleViewController, slideModel: nil)
+            }else{
+                
+            }
+        }
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if tableView == self.tableView{
+            if let slideModel = self.dataArray[indexPath.row] as? CNLiveHomeSearchHotModel{
+                //热词列表
+                //            let slideModel = self.dataArray[indexPath.row] as! CNLiveHomeSearchHotModel
+                return 40
+            }else if let slideModel = self.dataArray[indexPath.row] as? CNLiveHomeSearchHistoryModel{
+                //搜索历史
+                let slideModel = self.dataArray[indexPath.row] as! CNLiveHomeSearchHistoryModel
+                return self.historyHeight//176//145
+                //            return CGFloat(slideModel.cellH)
+            }else{
+                return 170
+            }
+        }else{
+            //搜索结果
+            //albnum剧集90
+            //1点播 imgH+55 (imgH+55)i -10
+            return 90
+//            if let resModel = self.resultListArray[indexPath.row] as? CNLiveHomeSearchResultListModel{
+//                return 90
+//                if resModel.model == kCNDownSlideContentsModelModelAlbum_video{//专辑
+//                    return 90
+//                }else if resModel.model == kCNDownSlideContentsModelModel1{//点播
+//                    let imgW = (KSreenWidth-4*15.0)/3.0
+//                    let imgH = imgW*140.0/105.0
+//                    return imgH+55
+//                }else{
+//                    
+//                }
+//            }else{//专辑或单集
+//                return 60
+//            }
+//            return 60
+        }
+    }
+    
+    func recordSearchHistory(){
+        if var hisArr = UserDefaults.standard.array(forKey: CNLiveHomeSearchHistoryKey) as? Array<String>{
+            var hisArrM = hisArr
+            if self.searchText.count > 0{
+                if hisArrM.contains(self.searchText){
+                    hisArrM.remove(self.searchText)
+                    hisArrM.append(self.searchText)
+                }else{
+                    if hisArrM.count >= 10{
+                        hisArrM.remove(at: 0)
+                    }
+                    hisArrM.append(self.searchText)
+                }
+                UserDefaults.standard.setValue(hisArrM, forKey: CNLiveHomeSearchHistoryKey)
+                UserDefaults.standard.synchronize()
+            }
+            self.hisArr.removeAll()
+            for his in hisArrM {
+                self.hisArr.append(his)
+            }
+            let hisModel = CNLiveHomeSearchHistoryModel()
+            hisModel.history = self.hisArr
+            hisModel.cellH = 140//计算高度
+            self.dataArray.removeAllObjects()
+            self.dataArray.add(hisModel)
+        }else{
+            let tempArr = [String]()
+            UserDefaults.standard.setValue(tempArr, forKey: CNLiveHomeSearchHistoryKey)
+            UserDefaults.standard.synchronize()
+            self.hisArr = [String]()
+            let hisModel = CNLiveHomeSearchHistoryModel()
+            hisModel.history = self.hisArr
+            hisModel.cellH = 140//计算高度
+            self.dataArray.removeAllObjects()
+            self.dataArray.add(hisModel)
+        }
+        self.tableView.reloadData()
+    }
+    func getSearchHotListApi(){
+        CNLiveHomeSearchViewModel.getSearchHotListApi {[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                if let hotArr = result as? [CNLiveHomeSearchHotModel]{
+                    //热词
+                    let titleMdl = CNLiveHomeSearchHotModel()
+                    titleMdl.sort = 0
+                    titleMdl.value = "热点榜"
+                    self.dataArray.add(titleMdl)
+                    for (idx,mdl) in hotArr.enumerated() {
+                        mdl.sort = idx+1
+                        self.dataArray.add(mdl)
+                    }
+                    self.tableView.mj_header?.endRefreshing()
+                    self.tableView.reloadData()
+                }
+            }else{
+                
+            }
+        }
+    }
+    //获取搜索结果
+    func getSearchResultWithSearchText(searchText:String,modelId:String,isFirst:Bool,page:String){
+        self.searBarView.text = searchText
+        CNLiveHomeSearchViewModel.getSearchResultApi(modelId: modelId, keyword: searchText, page: page, pageSize: "10") { [weak self] result, status in
+            guard let self = self else { return }
+            self.resultTableView.isHidden = false
+            if status == .success{
+                if let resultBaseModel = result as? CNLiveHomeSearchResultListBaseModel{
+                    if self.page > 1 {
+                        for mdl in resultBaseModel.list{
+                            self.resultListArray.add(mdl)
+                        }
+                    }
+                    if self.page == 1 {
+                        self.resultListArray.removeAllObjects()
+                        for mdl in resultBaseModel.list{
+                            self.resultListArray.add(mdl)
+                        }
+                        if self.resultListArray.count > 0 && self.resultTableView.mj_header == nil && self.resultTableView.mj_footer == nil {
+                            self.addRefreshView()
+                            self.page = self.page + 1
+                            self.getSearchResultWithSearchText(searchText: searchText, modelId: self.isJujiModel ? "album" : "1", isFirst: true, page: "\(self.page)")
+
+                        }
+                    }
+                    
+                    self.resultTableView.mj_header?.endRefreshing()
+                    self.resultTableView.mj_footer?.endRefreshing()
+                    self.resultTableView.reloadData()
+                    if resultBaseModel.list.count == 0 {
+                        self.resultTableView.mj_footer?.endRefreshingWithNoMoreData()
+                        self.resultTableView.reloadData()
+                    }
+                    if resultBaseModel.hasNextPage == false{
+                        self.resultTableView.mj_footer?.endRefreshingWithNoMoreData()
+                        self.resultTableView.reloadData()
+                    }
+                    
+                    
+                }
+            }else{
+                
+            }
+        }
+    }
+    
+    deinit {
+        
+    }
+}
+
+
+//import UIKit
+//import MJRefresh
+//import QMUIKit
+//import SnapKit // 假设你使用 SnapKit 进行布局
+//
+//class CNClassifySearchController: BaseViewController {
+//    
+//    // 声明属性
+//    var refreshView: MJRefreshAutoNormalFooter!
+//    var listArrM = ‌:ml-search[Any]
+//    var hasNextPage: String?
+//    var page = 1
+//    var hideSearchKB = false
+//    
+//    // 搜索历史相关
+//    var titleLab: UILabel!
+//    var labelLineView: UIView!
+//    var scrollView: UIScrollView!
+//    var historyItemView: CNCategoryFloatLayoutView! // 假设这是一个自定义的 UIView 子类
+//    var clearButton: UIButton!
+//    
+//    // 其他必要的属性...
+//    
+//    override func viewDidLoad() {
+//        super.viewDidLoad()
+//        
+//        // 初始化列表和页面
+//        listArrM = []
+//        page = 1
+//        
+//        // 设置刷新控件
+//        refreshView = MJRefreshAutoNormalFooter { [weak self] in
+//            guard let self = self else { return }
+//            let pageStr = String(self.page)
+//            self.getClassifySearchResult(withSearchText: self.searchText, isFirst: false, page: pageStr)
+//        }
+//        
+//        // 设置头部刷新控件（假设这是自定义的）
+//        // tableView.mj_header = ...
+//        
+//        // 如果不是从全搜索来的，则设置 UI
+//        if !fromAllSearch {
+//            setupUI()
+//        }
+//        
+//        // 监听键盘隐藏通知
+//        NotificationCenter.default.addObserver(self, selector: #selector(keyBoardHidden), name: UIKeyboardDidHideNotification, object: nil)
+//    }
+//    
+//    // MARK: - 视图生命周期方法
+//    
+//    override func viewWillAppear(_ animated: Bool) {
+//        super.viewWillAppear(animated)
+//        navigationController?.navigationBar.isHidden = true
+//    }
+//    
+//    override func viewDidAppear(_ animated: Bool) {
+//        super.viewDidAppear(animated)
+//        navigationController?.navigationBar.isHidden = true
+//        if hideSearchKB {
+//            hideKB()
+//        }
+//        hideSearchKB = true
+//        searchBar.becomeFirstResponder()
+//    }
+//    
+//    override func viewWillDisappear(_ animated: Bool) {
+//        super.viewWillDisappear(animated)
+//        if !fromAllSearch {
+//            navigationController?.navigationBar.isHidden = false
+//        }
+//        view.endEditing(true)
+//    }
+//    
+//    override func viewDidDisappear(_ animated: Bool) {
+//        super.viewDidDisappear(animated)
+//        if !fromAllSearch {
+//            navigationController?.navigationBar.isHidden = false
+//        }
+//    }
+//    
+//    // MARK: - 搜索功能
+//    
+//    @objc func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
+//        let searchText = searchBar.text?.trimmingCharacters(in: .whitespacesAndNewlines)
+//        if searchText?.isEmpty ?? true {
+//            QMUITips.showError(in: view, message: "搜索内容不能为空", hideAfterDelay: 1.5)
+//            return
+//        }
+//        
+//        tableView.mj_footer = nil
+//        tableView.tableFooterView = nil
+//        self.searchText = searchText
+//        page = 1
+//        QMUITips.showLoading(in: view)
+//        getClassifySearchResult(withSearchText: searchText!, isFirst: true, page: "1")
+//        
+//        recordHistory()
+//    }
+//    
+//    // 其他搜索相关的方法...
+//    
+//    // MARK: - 清除搜索历史
+//    
+//    @objc func clearBtnClick(_ sender: UIButton) {
+//        tableView.mj_footer = nil
+//        tableView.tableFooterView = nil
+//        listArrM.removeAll()
+//        tableView.reloadData()
+//        // 可能需要移除 tableView
+//    }
+//    
+//    // MARK: - 获取搜索结果
+//    
+//    func getClassifySearchResult(withSearchText searchText: String, isFirst: Bool, page: String) {
+//        if isFirst && tableView.superview == nil {
+//            view.addSubview(tableView)
+//        }
+//        
+//        let param: [String: Any] = [
+//            "page": page.isEmpty ? "1" : page,
+//            "pageSize": "10",
+//            "keyword": searchText.urlEncoded // 假设这是一个自定义的扩展方法
+//        ]
+//        
+//        // 发起网络请求（这里使用假设的网络请求方法）
+//        // networkRequest(param) { response in
+//        //     // 处理响应
+//        // }
+//        
+//        // 假设网络请求已经完成，并返回了结果
+//        // let responseObject = ...
+//        
+//        // 更新 UI（这里仅展示逻辑，实际代码需根据响应对象调整）
+//        tableView.mj_footer?.endRefreshing()
+//        tableView.mj_header?.endRefreshing()
+//        QMUITips.hideAllTips(in: view)
+//        
+//        if let dataDic = responseObject?["data"] as? [String: Any],
+//           let hasNextPageStr = dataDic["hasNextPage"] as? String,
+//           hasNextPageStr == "1" {
+//            page += 1
+//        } else {
+//            tableView.mj_footer?.endRefreshingWithNoMoreData()
+//        }
+//        
+//        // 根据不同类型更新 listArrM 和 tableView
+//        // ...
+//        
+//        if isFirst {
+//            tableView.reloadData()
+//            if listArrM.count > 0, hasNextPageStr == "1" {
+//                tableView.mj_footer = refreshView
+//            }
+//            tableView.scrollToTop(animated: true)
+//        }
+//    }
+//    
+//    // MARK: - 记录搜索历史
+//    
+//    func recordHistory() {
+//        // 假设 CNUserShareModel 是一个单例或全局对象
+//        let historyKey = "CNWjjCategorySearchHistoryKey_\(CNUserShareModel.shared.uid)"
+//        if let userDefaults = UserDefaults.standard,
+//           let historyArray = userDefaults.array(forKey: historyKey) as? [String] {
+//            var historyArrayM = historyArray.mutableCopy() as! [String]
+//            if let searchText = searchText, !historyArrayM.contains(searchText) {
+//                if historyArrayM.count >= 10 {
+//                    historyArrayM.removeFirst()
+//                }
+//                historyArrayM.append(searchText)
+//            }
+//            userDefaults.set(historyArrayM, forKey: historyKey)
+//            userDefaults.synchronize()
+//            
+//            historyItemView.subviews.forEach { $0.removeFromSuperview() }
+//            historyArrayM.reversed().forEach { str in
+//                let button = QMUIGhostButton()
+//                button.ghostColor = .black
+//                button.layer.borderColor = UIColor(rgb: 0xD4D5DA).cgColor
+//                button.setTitle(str, for: .normal)
+//                button.titleLabel?.font = UIFont.systemFont(ofSize: 14)
+//                button.contentEdgeInsets = UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8)
+//                button.addTarget(self, action: #selector(historyButtonAction(_:)), for: .touchUpInside)
+//                historyItemView.addSubview(button)
+//            }
+//            
+//            historyItemView.snp.remakeConstraints { make in
+//                make.top.equalTo(scrollView)
+//                make.left.equalTo(view).offset(10)
+//                make.right.equalTo(view).offset(-10)
+//                make.height.equalTo(historyItemView.sizeThatFits(CGSize(width: view.bounds.width - 20, height: CGFloat.greatestFiniteMagnitude)).height)
+//            }
+//            
+//            let offHeight = historyItemView.snp.frame.height + 10 + 45 + 10 + UIApplication.shared.statusBarFrame.height + 109 - view.bounds.height
+//            if offHeight > 0 {
+//                scrollView.contentSize = CGSize(width: view.bounds.width, height: view.bounds.height - UIApplication.shared.statusBarFrame.height - 108 + offHeight)
+//            }
+//            
+//            clearButton.isHidden = historyArrayM.isEmpty
+//        }
+//    }
+//    
+//    // MARK: - 显示无内容页
+//    
+//    func showEmptyView() {
+//        tableView.mj_footer = nil
+//
+//  CNLiveTVHomeViewController.swift
+//  metaCode
+//
+//  Created by zx on 2025/2/17.
+//  忽必烈电视剧改版首页
+
+import Foundation
+import QMUIKit
+import MJRefresh
+
+class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+    
+    let kCNLiveHomeYingshiBannerCellIdentifier = "kCNLiveHomeYingshiBannerCellIdentifier"
+    let kCNLiveHomeLanmuCellIdentifier = "kCNLiveHomeLanmuCellIdentifier"
+    let kCNLiveHomeOneBigTwoSmallCellIdentifier = "kCNLiveHomeOneBigTwoSmallCellIdentifier"
+    let kCNLiveHomeADCellIdentifier = "kCNLiveHomeADCellIdentifier"
+    let kCNLiveHomeTwoDuanjuCellIdentifier = "kCNLiveHomeTwoDuanjuCellIdentifier"
+    let kCNLiveHomeFollowCellIdentifier = "kCNLiveHomeFollowCellIdentifier"
+    let kCNLiveHomeTwoShopCellIdentifier = "kCNLiveHomeTwoShopCellIdentifier"
+    let kCNLiveHomeShopCategoryCellIdentifier = "kCNLiveHomeShopCategoryCellIdentifier"
+    
+    let group = DispatchGroup()
+    let queue = DispatchQueue.global(qos: .default)
+    var homePageStyleListMdls:[CNLiveHomePageStyleListModel] = [CNLiveHomePageStyleListModel]()//频道mdls
+    
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNLiveHomeYingshiBannerCell.self, forCellReuseIdentifier: kCNLiveHomeYingshiBannerCellIdentifier)
+        tableView.register(CNLiveHomeLanmuCell.self, forCellReuseIdentifier: kCNLiveHomeLanmuCellIdentifier)
+        tableView.register(CNLiveHomeFollowCell.self, forCellReuseIdentifier: kCNLiveHomeFollowCellIdentifier)
+        tableView.register(CNLiveHomeOneBigTwoSmallCell.self, forCellReuseIdentifier: kCNLiveHomeOneBigTwoSmallCellIdentifier)
+        tableView.register(CNLiveHomeADCell.self, forCellReuseIdentifier: kCNLiveHomeADCellIdentifier)
+        tableView.register(CNLiveHomeTwoDuanjuCell.self, forCellReuseIdentifier: kCNLiveHomeTwoDuanjuCellIdentifier)
+        tableView.register(CNLiveHomeTwoShopCell.self, forCellReuseIdentifier: kCNLiveHomeTwoShopCellIdentifier)
+        tableView.register(CNLiveHomeShopCategoryCell.self, forCellReuseIdentifier: kCNLiveHomeShopCategoryCellIdentifier)
+        
+        tableView.backgroundColor = .white
+        return tableView
+    }()
+    
+    
+    lazy var iconBgImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 295*KSreenWidth/375))
+        iconImgView.image = UIImage(named: "yingshibg.jpg")
+        iconImgView.contentMode = .scaleAspectFill
+        return iconImgView
+    }()
+    
+    lazy var iconImgView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 15, y: KStatusBarHeight+10, width: 74, height: 32))
+        iconImgView.image = UIImage(named: "yingshiicon")
+        iconImgView.contentMode = .scaleAspectFill
+        return iconImgView
+    }()
+    
+    lazy var searBarView :QMUISearchBar = {
+        let iconImgView = QMUISearchBar(frame: CGRect(x: iconImgView.right+10, y: KStatusBarHeight+10, width: KSreenWidth-iconImgView.right-10-15, height: 32))
+        iconImgView.backgroundColor = .white
+        iconImgView.searchTextField.backgroundColor = .white
+        iconImgView.searchTextField.clearButtonMode = .always
+        iconImgView.searchTextField.font = Font_13
+        iconImgView.searchTextField.textColor = HexColor("#333333")
+        iconImgView.clipsToBounds = true
+        iconImgView.layer.cornerRadius = 16
+        return iconImgView
+    }()
+    lazy var searchBtn: QMUIButton = {
+        let playBtn = QMUIButton.init(type: .custom)
+        playBtn.frame = self.searBarView.bounds
+        playBtn.clipsToBounds = true
+        playBtn.layer.cornerRadius = 16
+        playBtn.addTarget(self, action: #selector(searBarViewAction), for: .touchUpInside)
+        return playBtn
+    }()
+
+    
+    lazy var pageStyleBtn1: QMUIButton = {
+        let playBtn = QMUIButton.init(type: .custom)
+        playBtn.frame = CGRect(x: 10, y: self.searBarView.bottom+20, width: 80, height: 25)
+        playBtn.setTitle("影视剧", for: .normal)
+        playBtn.setTitleColor(HexColor("#000102"), for: .normal)
+        playBtn.titleLabel?.font = BoldFont_18
+        playBtn.addTarget(self, action: #selector(pageStyleBtn1Action), for: .touchUpInside)
+        return playBtn
+    }()
+    lazy var pageStyleBtn2: QMUIButton = {
+        let playBtn = QMUIButton.init(type: .custom)
+        playBtn.frame = CGRect(x: pageStyleBtn1.right+10, y: self.searBarView.bottom+20, width: 80, height: 25)
+        playBtn.setTitle("影视剧", for: .normal)
+        playBtn.setTitleColor(HexColor("#919191"), for: .normal)
+        playBtn.titleLabel?.font = Font_14
+        playBtn.addTarget(self, action: #selector(pageStyleBtn2Action), for: .touchUpInside)
+        playBtn.isHidden = true
+        return playBtn
+    }()
+    lazy var pageStyleBtn3: QMUIButton = {
+        let playBtn = QMUIButton.init(type: .custom)
+        playBtn.frame = CGRect(x: pageStyleBtn2.right+10, y: self.searBarView.bottom+20, width: 80, height: 25)
+        playBtn.setTitle("影视剧", for: .normal)
+        playBtn.setTitleColor(HexColor("#919191"), for: .normal)
+        playBtn.titleLabel?.font = Font_14
+        playBtn.addTarget(self, action: #selector(pageStyleBtn3Action), for: .touchUpInside)
+        playBtn.isHidden = true
+        return playBtn
+    }()
+    lazy var pageStyleBtn4: QMUIButton = {
+        let playBtn = QMUIButton.init(type: .custom)
+        playBtn.frame = CGRect(x: pageStyleBtn3.right+10, y: self.searBarView.bottom+20, width: 80, height: 25)
+        playBtn.setTitle("影视剧", for: .normal)
+        playBtn.setTitleColor(HexColor("#919191"), for: .normal)
+        playBtn.titleLabel?.font = Font_14
+        playBtn.addTarget(self, action: #selector(pageStyleBtn4Action), for: .touchUpInside)
+        playBtn.isHidden = true
+        return playBtn
+    }()
+    
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    var currStyleIndex = 0
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .white
+        
+        view.addSubview(iconBgImgView)
+        view.addSubview(iconImgView)
+        iconImgView.snp.makeConstraints { make in
+            make.left.equalTo(15)
+            make.top.equalTo(KStatusBarHeight+10)
+            make.width.equalTo(74)
+            make.height.equalTo(32)
+        }
+        view.addSubview(searBarView)
+        searBarView.snp.makeConstraints { make in
+            make.left.equalTo(self.iconImgView.snp.right).offset(10)
+            make.top.equalTo(self.iconImgView.snp.top)
+            make.right.equalToSuperview().offset(-15)
+            make.height.equalTo(32)
+        }
+        searBarView.addSubview(searchBtn)
+        searchBtn.snp.makeConstraints { make in
+            make.top.left.right.bottom.equalToSuperview()
+        }
+
+        view.addSubview(pageStyleBtn1)
+        view.addSubview(pageStyleBtn2)
+        view.addSubview(pageStyleBtn3)
+        view.addSubview(pageStyleBtn4)
+        
+        view.addSubview(tableView)
+        tableView.frame = CGRect(x: 0, y: self.pageStyleBtn1.bottom+10, width: KSreenWidth, height: KSreenHeight-KTabBarHeight-self.pageStyleBtn1.bottom-10)
+        self.getHomePageTopConfigListApi()
+        self.addRefreshView()
+    }
+    
+    deinit {
+        
+    }
+    
+    ////
+    @objc func searBarViewAction(){
+        let homePageStyleListMdl = self.homePageStyleListMdls[self.currStyleIndex]
+
+        if homePageStyleListMdl.id == "3337"{
+            //电商搜索页面
+            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/goods/search/search?uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
+            CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: "" , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
+
+        }else {
+            //跳转原生搜索页面
+            currentViewController()?.navigationController?.pushViewController(CNLiveHomeSearchController(), animated: false)
+        }
+        
+    }
+
+    @objc func pageStyleBtn1Action(){
+        self.changeBtnHighLight(idx: 0)
+    }
+    
+    @objc func pageStyleBtn2Action(){
+        self.changeBtnHighLight(idx: 1)
+
+    }
+    
+    @objc func pageStyleBtn3Action(){
+        self.changeBtnHighLight(idx: 2)
+
+    }
+
+    @objc func pageStyleBtn4Action(){
+        self.changeBtnHighLight(idx: 3)
+
+    }
+    
+    func changeBtnHighLight(idx:Int){
+        if idx == 0{
+            self.changeBtn(btn: self.pageStyleBtn1, isHighLight: true)
+            self.changeBtn(btn: self.pageStyleBtn2, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn3, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn4, isHighLight: false)
+        }else if idx == 1{
+            self.changeBtn(btn: self.pageStyleBtn1, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn2, isHighLight: true)
+            self.changeBtn(btn: self.pageStyleBtn3, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn4, isHighLight: false)
+        }else if idx == 2{
+            self.changeBtn(btn: self.pageStyleBtn1, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn2, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn3, isHighLight: true)
+            self.changeBtn(btn: self.pageStyleBtn4, isHighLight: false)
+        }else if idx == 3{
+            self.changeBtn(btn: self.pageStyleBtn1, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn2, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn3, isHighLight: false)
+            self.changeBtn(btn: self.pageStyleBtn4, isHighLight: true)
+        }else{
+            
+        }
+        let homePageStyleListMdl = self.homePageStyleListMdls[idx]
+//        self.group.enter()
+        self.currStyleIndex = idx
+        self.dataArray.removeAllObjects()
+        self.getPageApi(pageID: homePageStyleListMdl.pageId)
+    }
+    func changeBtn(btn:QMUIButton,isHighLight:Bool){
+        if isHighLight{
+            btn.setTitleColor(HexColor("#000102"), for: .normal)
+            btn.titleLabel?.font = BoldFont_18
+        }else{
+            btn.setTitleColor(HexColor("#919191"), for: .normal)
+            btn.titleLabel?.font = Font_14
+        }
+
+    }
+    
+    // MARK: - UITableViewDelegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.dataArray.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if let slideModel = self.dataArray[indexPath.row] as? CNLiveDownSlideModel{
+            if slideModel.type == SlideModelTypeRecommend1{
+                //banner
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeYingshiBannerCellIdentifier) as? CNLiveHomeYingshiBannerCell
+                else {
+                    let cell = CNLiveHomeYingshiBannerCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeLanmu22{
+                //栏目
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeLanmuCellIdentifier) as? CNLiveHomeLanmuCell
+                else {
+                    let cell = CNLiveHomeLanmuCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                cell.imgClickBlock = { slideContentMdl in
+                    let urlString = slideContentMdl.thirdUrl
+                    if let url = URL(string: urlString){
+                        // 使用 URLComponents 解析 URL
+                        let components = URLComponents(url: url, resolvingAgainstBaseURL: false)!
+                        // 获取查询项数组
+                        let queryItems = components.queryItems
+                        // 遍历查询项数组，查找 pageId 的值
+                        var pageId = ""
+                        for queryItem in queryItems ?? [] {
+                            if queryItem.name == "pageId" {
+                                pageId = queryItem.value ?? ""
+                                break
+                            }
+                        }
+                        if pageId.count > 0{
+                            let vc = CNLiveHomeLanmuController()
+                            vc.slideContentModel = slideContentMdl
+                            vc.pageId = pageId
+                            currentViewController()?.navigationController?.pushViewController(vc, animated: true)
+                        }else{
+                            //跳转webView
+                            CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: slideContentMdl.model, contentId: slideContentMdl.contentId, pid: slideContentMdl.pid, shareUrl: slideContentMdl.shareUrl, thirdUrl: slideContentMdl.thirdUrl, title: slideContentMdl.title, s_to: slideContentMdl.s_to, trailerId: slideContentMdl.trailerId, controller: self, slideModel: nil)
+                        }
+                    }
+
+                }
+                return cell
+            }else if slideModel.type == SlideModelTypeTVOneBigTwoSmall2{
+                //
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeOneBigTwoSmallCellIdentifier) as? CNLiveHomeOneBigTwoSmallCell
+                else {
+                    let cell = CNLiveHomeOneBigTwoSmallCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeAD31{
+                //广告
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeADCellIdentifier) as? CNLiveHomeADCell
+                else {
+                    let cell = CNLiveHomeADCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeTwoDuanJu5{
+                //一排3个
+                guard let cell = tableView.dequeueReusableCell  (withIdentifier: kCNLiveHomeTwoDuanjuCellIdentifier) as? CNLiveHomeTwoDuanjuCell
+                else {
+                    let cell = CNLiveHomeTwoDuanjuCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else if slideModel.type == SlideModelTypeShop29{
+                //官方周边 一排2个
+                guard let cell = tableView.dequeueReusableCell  (withIdentifier: kCNLiveHomeTwoShopCellIdentifier) as? CNLiveHomeTwoShopCell
+                else {
+                    let cell = CNLiveHomeTwoShopCell()
+                    return cell
+                }
+                cell.slideModel = slideModel
+                return cell
+            }else{
+                return UITableViewCell()
+            }
+        }else if let followModel = self.dataArray[indexPath.row] as? CNLiveHomeFollowModel{
+            //正在追
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeFollowCellIdentifier) as? CNLiveHomeFollowCell
+            else {
+                let cell = CNLiveHomeFollowCell()
+                return cell
+            }
+            cell.followModel = followModel
+            return cell
+        }else if let categoryModel = self.dataArray[indexPath.row] as? CNLiveHomeShopCategoryModel{
+            //电商分类 一排三个
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveHomeShopCategoryCellIdentifier) as? CNLiveHomeShopCategoryCell
+            else {
+                let cell = CNLiveHomeShopCategoryCell()
+                return cell
+            }
+            cell.slideModel = categoryModel
+            return cell
+        }else{
+            return UITableViewCell()
+        }
+
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        
+        if let slideModel = self.dataArray[indexPath.row] as? CNLiveDownSlideModel{
+            //非短剧
+            let slideModel = self.dataArray[indexPath.row] as! CNLiveDownSlideModel
+            if slideModel.type == SlideModelTypeFollow77{
+                return 0.0//追剧 占位数据
+            }
+            return CGFloat(slideModel.cellH)
+        }else if let slideModel = self.dataArray[indexPath.row] as? CNLiveHomeFollowModel{
+            //正在追
+            return 50.0+15.0//80
+        }else if let slideModel = self.dataArray[indexPath.row] as? CNLiveHomeShopCategoryModel{
+            //商品分类 一排三个
+            let maxCount = slideModel.group.count > 6 ? 6 : slideModel.group.count
+            let hangNum = Int(ceil(Double(maxCount)/3.0))
+            let imgW = (KSreenWidth-15*4)/3.0
+            let imgH = imgW*32.0/105.0
+            let rowH = imgH+15.0
+            let height = CGFloat(hangNum)*rowH
+            return height
+        }else{
+            return 60
+        }
+    }
+    
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.getHomePageTopConfigListApi()
+        })
+    }
+
+    //MARK: - 获取首页配置
+    func getHomePageTopConfigListApi(){
+        CNLiveHomePageViewModel.requestGetHomePageTopConfigList{[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                                
+                let dataModelArr = result as! [CNLiveHomePageHuBiLieModel]
+                let dataModel = dataModelArr.first!
+                
+                let img = dataModel.img
+                if img.count > 0{
+                    self.iconImgView.kf.setImage(with: URL(string: img))
+                    self.iconImgView.isHidden = false
+                    
+                    self.iconImgView.snp.remakeConstraints { make in
+                        make.left.equalTo(15)
+                        make.top.equalTo(KStatusBarHeight+10)
+                        make.width.equalTo(74)
+                        make.height.equalTo(32)
+                    }
+                    self.searBarView.snp.remakeConstraints { make in
+                        make.left.equalTo(self.iconImgView.snp.right).offset(10)
+                        make.top.equalTo(self.iconImgView.snp.top)
+                        make.right.equalToSuperview().offset(-15)
+                        make.height.equalTo(32)
+                    }
+                }else{
+                    self.iconImgView.isHidden = true
+                    self.iconImgView.image = nil
+                    self.iconImgView.snp.remakeConstraints { make in
+                        make.left.equalTo(15)
+                        make.top.equalTo(KStatusBarHeight+10)
+                        make.width.equalTo(0)
+                        make.height.equalTo(32)
+                    }
+                    self.searBarView.snp.remakeConstraints { make in
+                        make.left.equalTo(self.iconImgView.snp.right)
+                        make.top.equalTo(self.iconImgView.snp.top)
+                        make.right.equalToSuperview().offset(-15)
+                        make.height.equalTo(32)
+                    }
+
+                }
+                
+                let homePageListMdls = dataModel.pageStyleList
+                self.homePageStyleListMdls = homePageListMdls
+                for (idx,mdl) in homePageListMdls.enumerated() {
+                    if idx == 0{
+                        self.pageStyleBtn1.setTitle(mdl.name, for: .normal)
+                        self.changeBtn(btn: self.pageStyleBtn1, isHighLight: true)
+                        self.pageStyleBtn1.isHidden = false
+//                        self.group.enter()
+                        self.getPageApi(pageID: mdl.pageId)
+
+                    }else if idx == 1{
+                        self.pageStyleBtn2.setTitle(mdl.name, for: .normal)
+                        self.changeBtn(btn: self.pageStyleBtn2, isHighLight: false)
+                        self.pageStyleBtn2.isHidden = false
+                    }else if idx == 2{
+                        self.pageStyleBtn3.setTitle(mdl.name, for: .normal)
+                        self.changeBtn(btn: self.pageStyleBtn3, isHighLight: false)
+                        self.pageStyleBtn3.isHidden = false
+                    }else if idx == 3{
+                        self.pageStyleBtn4.setTitle(mdl.name, for: .normal)
+                        self.changeBtn(btn: self.pageStyleBtn4, isHighLight: false)
+                        self.pageStyleBtn4.isHidden = false
+                    }else{
+                        
+                    }
+                }
+//                self.group.notify(queue: .main) {
+//                    // 所有网络请求都已完成，在这里执行你的任务
+//                    self.tableView.mj_header?.endRefreshing()
+//                    self.tableView.reloadData()
+//                }
+
+            }else{
+                self.getHomePageTopConfigListApi()
+            }
+        }
+    }
+
+    func getHomePageShopCategoryApi(shop_id:String){
+        
+        CNLiveHomePageViewModel.requestGetHomePageShopCategoryApi(shop_id: shop_id){[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                var cateMdl = result as! CNLiveHomeShopCategoryModel
+                
+                var followIdx = 0
+                for (idx,mdl) in self.dataArray.enumerated(){
+                    if let lanmuMdl = mdl as? CNLiveDownSlideModel{
+                        if lanmuMdl.type == SlideModelTypeShopCategory78{
+                            //商品分类
+                            followIdx = idx
+                        }
+                    }
+                }
+                if cateMdl.group.count == 0{
+                    //不显示分类
+                    self.dataArray.removeObject(at: followIdx)
+                }else{
+                    let model = CNLiveHomeShopCategoryGroupModel()
+                    model.title = "全部商品"
+                    cateMdl.group.insert(model, at: 0)
+                    self.dataArray.replaceObject(at: followIdx, with: cateMdl)
+                }
+            }else{
+                
+            }
+            self.tableView.mj_header?.endRefreshing()
+            self.tableView.reloadData()
+            self.tableView.scrollToTop(animated: false)
+        }
+    }
+    func getHomePageFollowApi(sid:String){
+        CNLiveHomePageViewModel.requestGetHomePageFollow(sid: sid){[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                //插入数据到栏目下一位
+                let followMdl = result as! CNLiveHomeFollowModel
+//                if self.dataArray.count >= 2{
+//                    self.dataArray.insert(followMdl, at: 2)
+//                }
+                var followIdx = 0
+                for (idx,mdl) in self.dataArray.enumerated(){
+                    if let lanmuMdl = mdl as? CNLiveDownSlideModel{
+                        if lanmuMdl.type == SlideModelTypeFollow77{
+                            //正在追
+                            followIdx = idx
+                        }
+                    }
+                }
+                self.dataArray.replaceObject(at: followIdx, with: followMdl)
+                
+//                self.group.leave()
+
+            }else{
+                //没有在追
+//                self.group.leave()
+            }
+            self.tableView.mj_header?.endRefreshing()
+            self.tableView.reloadData()
+            self.tableView.scrollToTop(animated: false)
+        }
+    }
+    //MARK: - 网络请求获取区块详情页
+    func getPageApi(pageID:String)
+    {
+        //        showLoading(message: "")
+        CNLiveDownSlideViewModel.requestGetPage(pageId: pageID as NSString) {[weak self] result, status in
+            hiddenLoading()
+            guard let self = self else { return }
+            
+            if status == .success{
+                self.dataArray.removeAllObjects()
+                let array = result as! [Any]
+                let newDataArray = NSMutableArray()
+                var isRefreshTable = true
+                for slideModel in array {
+                    if let model = slideModel as? CNLiveDownSlideModel{
+                        
+                        let layout = CNLiveDownSlideModelLayout.init(model: model)
+                        let cellModel = layout.getCellHModel()
+                        newDataArray.addObjects(from: [cellModel])
+                        if model.type == SlideModelTypeFollow77{
+//                            self.group.enter()
+                            self.getHomePageFollowApi(sid: UserInfoManager.shared.userInfo.uid)
+                            isRefreshTable = false
+                        }else if model.type == SlideModelTypeShopCategory78{
+                            if model.contents.count > 0{
+                                let shop_id = model.contents[0].contentId
+                                self.getHomePageShopCategoryApi(shop_id: shop_id)
+                                isRefreshTable = false
+                            }
+                        }else{
+                        }
+                    }
+                }
+                self.dataArray.addObjects(from: newDataArray as! [Any])
+                if isRefreshTable{
+                    //需要刷新table
+                    self.tableView.mj_header?.endRefreshing()
+                    self.tableView.reloadData()
+                    self.tableView.scrollToTop(animated: false)
+                }else{
+                    //后面接口刷新table
+                }
+            }else if (status == .failed){
+
+                //                self.NetApiStatus = .apiError
+            }else if (status == .noNetwork){
+                
+                //                self.NetApiStatus = .notNetwork
+            }
+//            self.group.leave()
+        }
+        //
+    }
+
+    
+}
+
+//
+//  CNLivePlayerViewController.swift
+//  metaCode
+//
+//  Created by zx on 2025/1/21.
+//
+
+import Foundation
+import ZFPlayer
+import MJRefresh
+import HandyJSON
+import CNLiveShareToolKit
+
+class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITableViewDelegate{
+    
+    //当前内容id
+    var contentId = ""
+    
+    //CNLiveVodPlayModel 单集model
+    var _vodPlayModel : CNLiveVodPlayModel?
+    var vodPlayModel : CNLiveVodPlayModel? {
+        get{
+            _vodPlayModel
+        }
+        set{
+            _vodPlayModel = newValue!
+        }
+    }
+
+    //CNLiveVodPlayModel 专辑列表model
+    var _vodAlbumListBaseModel : CNLiveVodAlbumListBaseModel?
+    var vodAlbumListBaseModel : CNLiveVodAlbumListBaseModel? {
+        get{
+            _vodAlbumListBaseModel
+        }
+        set{
+            _vodAlbumListBaseModel = newValue!
+        }
+    }
+    
+    //playerUrl
+    var _url:URL?
+    var url:URL? {
+        get{
+            return _url
+        }
+        set{
+            _url = newValue!
+        }
+    }
+    
+    let kCNLiveVodIntroductionCellIdentifier = "kCNLiveVodIntroductionCellIdentifier"
+    let kCNLiveVodAlbumListCellIdentifier = "kCNLiveVodAlbumListCellIdentifier"
+    let kCNLiveVodTrailersCellIdentifier = "kCNLiveVodTrailersCellIdentifier"
+    let kCNLiveVodPlayShopCellIdentifier = "kCNLiveVodPlayShopCellIdentifier"
+
+    
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNLiveVodIntroductionCell.self, forCellReuseIdentifier: kCNLiveVodIntroductionCellIdentifier)
+        tableView.register(CNLiveVodAlbumListCell.self, forCellReuseIdentifier: kCNLiveVodAlbumListCellIdentifier)
+        tableView.register(CNLiveVodTrailersCell.self, forCellReuseIdentifier: kCNLiveVodTrailersCellIdentifier)
+        tableView.register(CNLiveVodPlayShopCell.self, forCellReuseIdentifier: kCNLiveVodPlayShopCellIdentifier)
+        
+        tableView.backgroundColor = .white
+        return tableView
+    }()
+    ///数据源
+    lazy var dataArray: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    
+    lazy var bottomCommentShowContainView :UIView = {
+        let iconImgView = UIView()
+        iconImgView.backgroundColor = .clear
+        return iconImgView
+    }()
+    lazy var bottomCommentView :UIView = {
+        let iconImgView = UIView(frame: CGRect(x: 0, y: KSreenHeight-60-KTabBarSafeHeight, width: KSreenWidth, height: 60))
+        iconImgView.backgroundColor = .white
+        iconImgView.isUserInteractionEnabled = true
+        iconImgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(bottomCommentViewTapAction)))
+        return iconImgView
+    }()
+    lazy var bottomCommentTalkView :UIView = {
+        let iconImgView = UIView()
+        iconImgView.layer.borderColor = HexColor("#979797")?.cgColor
+        iconImgView.layer.borderWidth = 0.5
+        iconImgView.layer.cornerRadius = 20
+        iconImgView.clipsToBounds = true
+        return iconImgView
+    }()
+    lazy var bottomCommentLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "我来说几句…"
+        titleLabel.textColor = HexColor("#999999")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_14
+        return titleLabel
+    }()
+    lazy var bottomCommentImgView :UIImageView = {
+        let iconImgView = UIImageView()
+        iconImgView.image = UIImage(named: "home_player_comment")
+        return iconImgView
+    }()
+
+
+    lazy var whitBgView :UIView = {
+        let iconImgView = UIView(frame: CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-KStatusBarHeight))
+        iconImgView.backgroundColor = .white
+        return iconImgView
+    }()
+    lazy var containerView :UIImageView = {
+        let iconImgView = UIImageView(frame: CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenWidth*9/16))
+        iconImgView.image = UIImage.imageWithColor(color: UIColor.black, size: CGSize(width: 1, height: 1))
+        return iconImgView
+    }()
+    lazy var controlView :CNLiveZFPlayerControlView = {
+        let controlView = CNLiveZFPlayerControlView()
+        controlView.fastViewAnimated = true
+        controlView.autoHiddenTimeInterval = 5
+        controlView.autoFadeTimeInterval = 0.5
+        controlView.prepareShowLoading = true
+        controlView.prepareShowControlView = false
+        controlView.showCustomStatusBar = true
+        return controlView
+    }()
+    var player: ZFPlayerController!
+    var isAblumVideo = false
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .black
+        self.view.addSubview(self.whitBgView)
+        self.view.addSubview(self.containerView)
+        
+        let backBtn = UIButton.backItem(imageName: ("mine_header_icon_white_back"), target: self, action: #selector(ClickBackBtn))
+        backBtn.frame = CGRect(x: 15, y: KStatusBarHeight, width: backBtn.width, height: backBtn.height)
+        self.view.addSubview(backBtn)
+//        backBtn.backgroundColor = .red
+
+        self.setupPlayer()
+        
+        view.addSubview(tableView)
+        tableView.frame = CGRect(x: 0, y: self.containerView.bottom, width: KSreenWidth, height: KSreenHeight-self.containerView.bottom-KTabBarSafeHeight-60)
+        view.addSubview(self.bottomCommentView)
+        self.bottomCommentView.addSubview(self.bottomCommentTalkView)
+        bottomCommentTalkView.snp.makeConstraints { make in
+            make.top.left.equalToSuperview().offset(10)
+            make.width.equalToSuperview().offset(-75)
+            make.height.equalTo(40)
+        }
+        self.bottomCommentView.addSubview(self.bottomCommentLabel)
+        bottomCommentLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(25)
+            make.centerY.equalToSuperview()
+            make.width.equalTo(100)
+            make.height.equalTo(20)
+        }
+        self.bottomCommentView.addSubview(self.bottomCommentImgView)
+        bottomCommentImgView.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-20)
+            make.centerY.equalToSuperview()
+            make.width.equalTo(25)
+            make.height.equalTo(24)
+        }
+        self.view.addSubview(self.bottomCommentShowContainView)
+        bottomCommentShowContainView.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.top.equalToSuperview().offset(self.containerView.bottom)
+            make.width.equalToSuperview()
+            make.height.equalToSuperview().offset(-self.containerView.bottom)
+        }
+        bottomCommentShowContainView.isHidden = true
+//        self.addRefreshView()
+        self.configDataArray()
+        self.isAblumVideo = false
+        if let albumModel = self.vodAlbumListBaseModel{
+            //专辑
+            self.isAblumVideo = true
+        }else{
+            //单集
+            self.isAblumVideo = false
+        }
+    }
+    
+    func configDataArray(){
+        //配置数据
+        var tempDataArray = NSMutableArray()
+        //单集 简介
+        if let vodPlayModel = self.vodPlayModel{//单集有值-简介
+            for (_,mdl) in vodPlayModel.blockList.enumerated(){
+                if mdl.type == "5"{//点播详情数据
+                    //CNLiveVodPlayBlockListModel
+                    tempDataArray.add(mdl)
+                }
+            }
+        }
+        //专辑-简介
+        if let vodAlbumListBaseModel = self.vodAlbumListBaseModel{//专辑有值-专辑列表
+            if let mdl = vodAlbumListBaseModel.list.first{
+                if let msgModel = mdl.vodAlbumMsgModel{
+                    let tempArr = NSMutableArray(array: tempDataArray as! [Any])
+                    if let vodMdl = tempArr.firstObject as? CNLiveVodPlayBlockListModel{
+                        for firMdl in vodMdl.list{
+                            firMdl.title = msgModel.albumName
+                            firMdl.desc = msgModel.desc
+                        }
+                        tempDataArray.removeAllObjects()
+                        tempDataArray.add(vodMdl)
+                    }
+                    
+                }
+            }
+        }
+        //专辑有值-专辑列表
+        if let vodAlbumListBaseModel = self.vodAlbumListBaseModel{//专辑有值-专辑列表
+            tempDataArray.add(vodAlbumListBaseModel)
+        }
+        //看点
+        ///**blockList.type 1/2/3/4/5  商品入口/片花资讯/活动推荐/相关推荐/点播详情 */
+        if let vodPlayModel = self.vodPlayModel{//单集有值-简介
+            for (_,mdl) in vodPlayModel.blockList.enumerated(){
+                if mdl.type == "2"{//看点list数据
+                    //CNLiveVodPlayBlockListModel
+                    tempDataArray.add(mdl)
+                }
+            }
+        }
+        //商品
+        if let vodPlayModel = self.vodPlayModel{//单集有值
+            if vodPlayModel.goodsJson.count > 0{
+                let goodMdls = jsonArrayToModel(vodPlayModel.goodsJson, CNLiveVodPlayShopModel.self)
+                if goodMdls.count > 0{//CNLiveVodPlayModel [CNLiveVodPlayShopModel]
+                    //有商品
+                    tempDataArray.add(goodMdls)
+                }else{
+                    //没商品
+                }
+            }
+        }
+        
+        self.dataArray = NSMutableArray(array: tempDataArray)
+
+    }
+    
+    func setupNewUI(model:CNLiveDownSlideContentsModel){
+        
+    }
+    func setupPlayer(){
+        let playerManager = ZFAVPlayerManager()
+        playerManager.shouldAutoPlay = true
+//        playerManager.rate = 2
+
+        player = ZFPlayerController(playerManager: playerManager, containerView: containerView)
+        player.pauseWhenAppResignActive = false
+        player.controlView = controlView
+        //不跟随设备旋转
+        player.allowOrentitaionRotation = false
+
+        //        self.player.currentPlayerManager.rate = 0.5 //点击按钮加
+        
+        self.player.orientationDidChanged = {[weak self] player,isFullScreen in
+            guard let self = self else { return }
+            
+        }
+        /// 播放完成
+        self.player.playerDidToEnd = {
+            [weak self] asset in
+            guard let self = self else { return }
+            
+            //            if (!self.player.isLastAssetURL) {
+            //                [self.player playTheNext];
+            //                NSString *title = [NSString stringWithFormat:@"视频标题%zd",self.player.currentPlayIndex];
+            //                [self.controlView showTitle:title coverURLString:kVideoCover fullScreenMode:ZFFullScreenModeLandscape];
+            //            } else {
+            //                [self.player stop];
+            //            }
+        }
+        var urls = [URL]()
+        urls.append(self.url!)
+        self.player.assetURLs = urls
+        self.player.playTheIndex(0)
+        var title = ""
+        if self.vodPlayModel?.blockList.count ?? 0 > 0{
+            for mdl in self.vodPlayModel!.blockList{
+                if mdl.type == "5"{//详情
+                    if mdl.list.count > 0{
+                        let vodModel = mdl.list[0]
+                        title = vodModel.title
+                    }
+                }
+            }
+        }
+        self.controlView.showTitle(title, cover: UIImage.imageWithColor(color: .darkGray, size: CGSize(width: 50, height: 50)), fullScreenMode: .landscape)
+                
+    }
+    
+    // MARK: - UITableViewDelegate
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.dataArray.count
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if let vodPlayBlockListModel = self.dataArray[indexPath.row] as? CNLiveVodPlayBlockListModel{
+            if vodPlayBlockListModel.type == "5"{
+                //点播详情
+                //简介-标题描述,点赞评论分享
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveVodIntroductionCellIdentifier) as? CNLiveVodIntroductionCell
+                else {
+                    let cell = CNLiveVodIntroductionCell()
+                    return cell
+                }
+                cell.vodPlayBlockListModel = vodPlayBlockListModel
+                cell.updateCellBlock = {[weak self] isExpand,isFavorite,isCollection,type,vodPlayBlockListListModel in
+                    guard let self = self else { return }
+                    if type == "1"{
+                        //点击了详情按钮
+                        self.introducCellDetailBtnAction(vodPlayBlockListListModel: vodPlayBlockListListModel)
+                    }else if type == "2"{
+                        //点击了点赞按钮
+                        self.vodSupport(vodPlayBlockListListModel: vodPlayBlockListListModel, isLiked: isFavorite)
+                    }else if type == "3"{
+                        //点击了收藏按钮
+                        self.vodCollection(vodPlayBlockListListModel: vodPlayBlockListListModel, isCollectioned: isCollection)
+                    }else if type == "4"{
+                        //点击了分享按钮
+                        self.vodShare(vodPlayBlockListListModel: vodPlayBlockListListModel)
+                    }
+                }
+                return cell
+
+            }else if vodPlayBlockListModel.type == "2"{//看点
+                //看点
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveVodTrailersCellIdentifier) as? CNLiveVodTrailersCell
+                else {
+                    let cell = CNLiveVodTrailersCell()
+                    return cell
+                }
+                cell.vodPlayBlockListModel = vodPlayBlockListModel
+                cell.expandBlock = { [weak self] model in
+                    guard let self = self else { return }
+                    self.trailersCellDetailBtnAction(vodPlayBlockListModel: model)
+                }
+                cell.selectBlock = { [weak self] model in
+                    guard let self = self else { return }
+                    self.contentId = model.contentId
+                    let isAblumVideo = model.model == "1" ? false : true
+                    self.refreshVodData(isAblumVideo: isAblumVideo)
+                }
+                return cell
+            }else{
+                
+            }
+        }else if let vodAlbumListBaseModel = self.dataArray[indexPath.row] as? CNLiveVodAlbumListBaseModel{
+            //专辑列表
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveVodAlbumListCellIdentifier) as? CNLiveVodAlbumListCell
+            else {
+                let cell = CNLiveVodAlbumListCell()
+                return cell
+            }
+            cell.vodAlbumListBaseModel = vodAlbumListBaseModel
+            
+            cell.selectBlock = {[weak self] vodModel, index in
+                guard let self = self else { return }
+                self.contentId = vodModel.contentId
+                self.changeContentApi(vodModel: vodModel)
+            }
+            return cell
+        }else if let vodPlayShopModels = self.dataArray[indexPath.row] as? [CNLiveVodPlayShopModel]{
+            //电商
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveVodPlayShopCellIdentifier) as? CNLiveVodPlayShopCell
+            else {
+                let cell = CNLiveVodPlayShopCell()
+                return cell
+            }
+            cell.vodPlayShopModels = vodPlayShopModels
+            cell.expandBlock = {[weak self] vodPlayShopModels in
+                guard let self = self else { return }
+                self.shopCellDetailBtnAction(vodPlayShopModels: vodPlayShopModels)
+            }
+            return cell
+        }else {
+            return UITableViewCell()
+        }
+        return UITableViewCell()
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if let vodPlayBlockListModel = self.dataArray[indexPath.row] as? CNLiveVodPlayBlockListModel{
+            if vodPlayBlockListModel.type == "5"{
+                //点播详情
+                //简介-标题描述,点赞评论分享
+                return 112
+            }else if vodPlayBlockListModel.type == "2"{
+                //看点
+                return 25+106+76
+            }else{
+            }
+    
+        }else if let vodAlbumListBaseModel = self.dataArray[indexPath.row] as? CNLiveVodAlbumListBaseModel{
+            //专辑列表
+            return 50+15
+        }else if let vodPlayShopModels = self.dataArray[indexPath.row] as? [CNLiveVodPlayShopModel]{
+            //电商
+            return 145.0
+        }else {
+            
+        }
+        return 100
+    }
+    
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.refreshVodData(isAblumVideo: self!.isAblumVideo)
+        })
+    }
+    
+    //更换contentId内容 play接口刷新看点和电商
+    func changeContentApi(vodModel:CNLiveVodAlbumListModel){
+        
+        //刷新url
+        CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: vodModel.activityId) {[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success
+            {
+                if let url = result as? String{
+                    self.playWithUrlAndTitle(url: url, title: vodModel.title)
+                }
+            }else{
+                
+            }
+        }
+
+        
+        //play接口刷新 看点和电商
+        CNLiveDownSlideTool.getVodPlayApi(contentId: vodModel.contentId) {[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                if let vodPlayModel = result as? CNLiveVodPlayModel{
+                    self.vodPlayModel = vodPlayModel
+                    self.configDataArray()
+                    self.tableView.reloadData()
+                }else{
+                    
+                }
+            }else{
+                
+            }
+        }
+
+    }
+    
+    //播放url更换title
+    func playWithUrlAndTitle(url:String,title:String){
+        self.url = URL(string: url)
+        var urls = [URL]()
+        urls.append(self.url!)
+        self.player.assetURLs = urls
+        self.player.playTheIndex(0)
+        self.controlView.showTitle(title, cover: UIImage.imageWithColor(color: .darkGray, size: CGSize(width: 50, height: 50)), fullScreenMode: .landscape)
+    }
+    
+    override var preferredStatusBarStyle: UIStatusBarStyle{
+        return .lightContent
+    }
+    
+    override var prefersStatusBarHidden: Bool{
+        return false
+    }
+    
+    override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation{
+        return .none
+    }
+    
+    override var shouldAutorotate: Bool{
+        return false
+    }
+
+    override var supportedInterfaceOrientations: UIInterfaceOrientationMask{
+        return .allButUpsideDown
+    }
+
+    func shopCellDetailBtnAction(vodPlayShopModels:[CNLiveVodPlayShopModel]) {
+        bottomCommentShowContainView.isHidden = false
+        
+        let detailBgView = CNLiveVodShopBottomView(frame: bottomCommentShowContainView.bounds)
+        detailBgView.backgroundColor = .white
+        bottomCommentShowContainView.addSubview(detailBgView)
+        detailBgView.vodPlayShopModels = vodPlayShopModels
+        detailBgView.expandHideBlock = {[weak self] in
+            guard let self = self else { return }
+            self.bottomCommentShowContainView.removeAllSubviews()
+            self.bottomCommentShowContainView.isHidden = true
+        }
+        
+    }
+    // MARK: - 看点cell展开
+    func trailersCellDetailBtnAction(vodPlayBlockListModel:CNLiveVodPlayBlockListModel) {
+        bottomCommentShowContainView.isHidden = false
+        
+        let detailBgView = CNLiveVodCellBottomView(frame: bottomCommentShowContainView.bounds)
+        detailBgView.backgroundColor = .white
+        bottomCommentShowContainView.addSubview(detailBgView)
+        detailBgView.vodPlayBlockListModel = vodPlayBlockListModel
+        detailBgView.expandHideBlock = {[weak self] in
+            guard let self = self else { return }
+            self.bottomCommentShowContainView.removeAllSubviews()
+            self.bottomCommentShowContainView.isHidden = true
+        }
+        detailBgView.updateBlock = {[weak self] seleIdx,model in
+            guard let self = self else { return }
+            self.contentId = model.contentId
+            var isAblumVideo = false
+            if model.model == "1"{
+                isAblumVideo = false
+            }else{
+                isAblumVideo = true
+            }
+            self.refreshVodData(isAblumVideo: isAblumVideo)
+        }
+    }
+    // MARK: - 简介cell点击事件
+    func introducCellDetailBtnAction(vodPlayBlockListListModel:CNLiveVodPlayBlockListListModel) {
+        bottomCommentShowContainView.isHidden = false
+        
+        let detailBgView = UIView(frame: bottomCommentShowContainView.bounds)
+        detailBgView.backgroundColor = .white
+        bottomCommentShowContainView.addSubview(detailBgView)
+        
+        let vodMdl = vodPlayBlockListListModel
+
+        let titleLbl = UILabel()
+        titleLbl.font = BoldFont_15
+        titleLbl.textColor = HexColor("#000102")
+        titleLbl.text = vodMdl.title
+        bottomCommentShowContainView.addSubview(titleLbl)
+        
+        titleLbl.snp.makeConstraints { make in
+            make.left.equalTo(10)
+            make.top.equalTo(16)
+            make.width.lessThanOrEqualTo(KSreenWidth-50)
+        }
+        
+        let detailLbl = UILabel()
+        detailLbl.font = Font_10
+        detailLbl.textColor = HexColor("#999999")
+        detailLbl.text = "详情"
+        bottomCommentShowContainView.addSubview(detailLbl)
+        detailLbl.snp.makeConstraints { make in
+            make.left.equalTo(titleLbl.snp.right).offset(15)
+            make.top.equalTo(20.5)
+            make.width.equalTo(20)
+            make.height.equalTo(14)
+        }
+
+        let descLbl = UITextView()
+        descLbl.font = Font_13
+        descLbl.textColor = HexColor("#999999")
+        descLbl.text = vodMdl.desc
+        descLbl.width = KSreenWidth-20
+        bottomCommentShowContainView.addSubview(descLbl)
+
+        descLbl.snp.makeConstraints { make in
+            make.left.equalTo(10)
+            make.top.equalTo(titleLbl.snp.bottom).offset(10)
+            make.right.equalToSuperview().offset(-20)
+            make.bottom.equalToSuperview().offset(-15-50-10)
+        }
+        
+        let expandBtn = UIButton.init(type: .custom)
+        expandBtn.backgroundColor = .clear
+        expandBtn.setImage(UIImage(named: "home_player_unexpand"), for: .normal)
+        expandBtn.addTarget(self, action: #selector(expandBtnAction), for: .touchUpInside)
+        bottomCommentShowContainView.addSubview(expandBtn)
+        expandBtn.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-15)
+            make.width.equalTo(50)
+            make.height.equalTo(50)
+        }
+        
+    }
+
+    func vodSupport(vodPlayBlockListListModel:CNLiveVodPlayBlockListListModel,isLiked:Bool){
+        CNLiveVodPlayViewModel.vodSupport(contentId: vodPlayBlockListListModel.pid, support: isLiked) {[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                
+            }
+        }
+    }
+    func vodCollection(vodPlayBlockListListModel:CNLiveVodPlayBlockListListModel,isCollectioned:Bool){
+        let type = isCollectioned ? "1" : "2"
+        CNLiveVodPlayViewModel.vodCollection(type: type, vodPlayBlockListListModel: vodPlayBlockListListModel) {[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                //不改数据了
+            }
+        }
+    }
+    func vodShare(vodPlayBlockListListModel:CNLiveVodPlayBlockListListModel){
+        //vodPlayBlockListListModel.img
+        //vodPlayBlockListListModel.title
+        //vodPlayBlockListListModel.subTitle
+        //
+        //http://wjjh5.cnlive.com/cnYjzg.html?id=2&version=1.0.9&isShowTitle=true&plat=i&wjjFrom=apple&backgroundColor=%234B8AF5&wjjToken=ACGspwyhX6xbuJ27P0flZOejyKjcS70g7VegVKRgAWPUzacEKgXz2JcmlAVoc5oG&appId=769_li40lrkt53&channelName=yjzg&shareSid=352610&isApp=false&ver=1.0.9.24.03.27.14&sid=352610&wjjUUID=B849E3C36DF04D89B0C8DB9322B69B51_1711520943&voteId=AS5FFqIhAAAQAAAAAAAAAA==&isWjjReport=true
+        //https://wjjh5.cnlive.com/apkdownloadYuanma.php
+        CNLiveShareManager.showShareViewWithParam(forShareTitle: "标题111", shareUrl: "http://wjjh5.cnlive.com/cnYjzg.html?id=2&version=1.0.9&isShowTitle=true&plat=i&wjjFrom=apple&backgroundColor=%234B8AF5&wjjToken=ACGspwyhX6xbuJ27P0flZOejyKjcS70g7VegVKRgAWPUzacEKgXz2JcmlAVoc5oG&appId=769_li40lrkt53&channelName=yjzg&shareSid=352610&isApp=false&ver=1.0.9.24.03.27.14&sid=352610&wjjUUID=B849E3C36DF04D89B0C8DB9322B69B51_1711520943&voteId=AS5FFqIhAAAQAAAAAAAAAA==&isWjjReport=true", shareDesc: "描述111", shareImage: vodPlayBlockListListModel.img, screenFull: false, hiddenWjj: true, hiddenQQ: false, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: false, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in
+            
+        } completerBlock: { resultType, platformType, typeString in
+            if resultType == .succ{
+                
+            }
+        }
+    }
+    
+    // MARK: - ButtonAction
+    
+    @objc func expandBtnAction() {
+        //详情 收起
+        self.bottomCommentShowContainView.removeAllSubviews()
+        self.bottomCommentShowContainView.isHidden = true
+    }
+    @objc func bottomCommentViewTapAction() {
+        bottomCommentShowContainView.isHidden = false
+        //评论
+        CNLiveShortVideoCommentListView.showVideoCommentListView(pid: self.vodPlayModel?.contentId ?? "", contentSid: UserInfoManager.shared.userInfo.uid,containView:self.bottomCommentShowContainView, result: { commentModel in
+            print("\(commentModel)")
+        }, close: {
+            self.bottomCommentShowContainView.isHidden = true
+        })
+
+    }
+
+    @objc func ClickBackBtn() {
+        
+        let viewControllers = self.navigationController?.viewControllers
+        if viewControllers?.count ?? 0 > 1 {
+            if viewControllers?.last == self {
+                self.navigationController!.popViewController(animated: true)
+            }
+        }
+    }
+    
+    func destroyPlayer(){
+        self.player.stop()
+    }
+    
+    func refreshVodData(isAblumVideo:Bool){
+        CNLiveDownSlideTool.getVodData(contentId: self.contentId, isAblumVideo: isAblumVideo) {[weak self] vodPlayModel, contentId,url, result, status  in
+            if status == .success{
+                self!.vodPlayModel = vodPlayModel
+                self!.contentId = contentId
+                if let vodAlbumListBaseModel = result{
+                    self!.vodAlbumListBaseModel = vodAlbumListBaseModel
+                }
+                self!.url = URL(string: url)
+                self!.configDataArray()
+                self!.tableView.mj_header?.endRefreshing()
+                self!.tableView.reloadData()
+                self!.playWithUrlAndTitle(url: url, title: "")
+            }else{
+                
+            }
+        }
+    }
+    // MARK: - 点播play接口
+    /*
+    func requestGetVodPlayApi(contentId:String){
+        CNLiveHomePageViewModel.requestGetVodPlayApi(contentId: contentId, sid: UserInfoManager.shared.userInfo.uid, resultBlock: { result, status in
+            if status == .success{
+                if let vodPlayMpdel = result as? CNLiveVodPlayModel{
+                    if let albumMdl = vodPlayMpdel.album{
+                        //专辑
+                        self.requestGetVodPlay1Api(contentId: vodPlayMpdel.contentId)
+                        //记录当前播放集数的ContentId
+                        self.contentId = vodPlayMpdel.contentId
+                        self.requestGetAlbumMsgApi(contentId: vodPlayMpdel.contentId)
+                    }else{
+                        //单集
+                        
+                    }
+                }
+            }
+        })
+    }
+    //专辑的单集内容
+    func requestGetVodPlay1Api(contentId:String){
+        CNLiveHomePageViewModel.requestGetVodPlayApi(contentId: contentId, sid: UserInfoManager.shared.userInfo.uid, resultBlock: { result, status in
+            if status == .success{
+                if let vodPlayMpdel = result as? CNLiveVodPlayModel{
+                    if let albumMdl = vodPlayMpdel.album{
+                        //专辑
+
+                    }else{
+                        //单集
+                        
+                    }
+                }
+            }
+        })
+    }
+     */
+    // MARK: - 专辑内容详情
+//    func requestGetAlbumMsgApi(contentId:String){
+//        CNLiveHomePageViewModel.requstWithVodAlbumMsgVideo(aid: contentId, resultBlock: { result, status in
+//            if status == .success{
+//                if let vodPlayMpdel = result as? CNLiveVodPlayModel{
+//                    //专辑详情
+//                }
+//            }
+//        })
+//    }
+    
+    deinit {
+        print("vod deinit")
+    }
+}
+//
+//  CNLiveHomeSearchHistoryModel.swift
+//  metaCode
+//
+//  Created by zx on 2025/3/8.
+//
+
+import Foundation
+
+class CNLiveHomeSearchHistoryModel:BaseModel{
+    var history = [String]()
+    ///电商cell高度
+    var cellH:CGFloat = 145.0
+
+}
+class CNLiveHomeSearchResultListBaseModel:BaseModel{
+    var endRow = 0
+    var firstPage = 0
+    var hasNextPage = false
+    var nextPage = 0
+    var hasPreviousPage = false
+    var isFirstPage = true
+    var isLastPage = true
+    var lastPage = 0
+    var list = [CNLiveHomeSearchResultListModel]()
+    var navigateFirstPage = 0
+    var navigateLastPage = 0
+    var navigatePages = 0
+    var navigatepageNums:Array<Any> = []
+    var pageNum = 0
+    var pageSize = 0
+    var pages = 0
+    var prePage = 0
+    var size = 0
+    var startRow = 0
+    var total = 0
+}
+
+class CNLiveHomeSearchResultListModel:BaseModel{
+    //专辑 点播
+    var albumId = ""//专辑
+    var icon = ""//专辑
+    var name = ""//专辑
+    var model = ""//专辑 //点播
+    var product:CNLiveAlbumProductModel?//专辑//点播
+    var title = ""//点播
+    var subTitle = ""//专辑//点播
+    var status = ""//点播
+    var poster = ""//点播
+    var contentId = ""//点播
+    var pid = ""//点播
+    var publishTime = ""//点播
+
+}
+
+//class CNLiveHomeSearchHistoryModelLayout:NSObject{
+//    
+//    ///cell高度
+//    var cellH:CGFloat = 0.0
+//    
+//    //slideModel
+//    var _historyModel : CNLiveHomeSearchHistoryModel?
+//    var historyModel : CNLiveHomeSearchHistoryModel? {
+//        get{
+//            _historyModel
+//        }
+//        set{
+//            _historyModel = newValue
+//        }
+//    }
+//    
+//    init(model:CNLiveHomeSearchHistoryModel){
+//        super.init()
+//        self.historyModel = model
+//        self.historyModel?.cellH =
+//    }
+//    func getCellHModel()->CNLiveHomeSearchHistoryModel{
+//        return historyModel!
+//    }
+//    
+//}
+//
+//  CNLiveHomeSearchHotModel.swift
+//  metaCode
+//
+//  Created by zx on 2025/3/8.
+//
+
+import Foundation
+
+class CNLiveHomeSearchHotModel:BaseModel{
+    var sort = 1
+    var value = ""
+}
+//
+//  CNLiveHomeShopCategoryModel.swift
+//  metaCode
+//
+//  Created by zx on 2025/3/13.
+//
+
+import Foundation
+class CNLiveHomeShopCategoryModel:BaseModel{
+    var state = ""
+    var group = [CNLiveHomeShopCategoryGroupModel]()
+}
+class CNLiveHomeShopCategoryGroupModel:BaseModel{
+    var simg = ""
+    var id = ""
+    var istop = ""
+    var title = ""
+    var level = ""
+    var pid = ""
+    ///二级分类列表
+    var child = [CNLiveShopClassifyModel]()
+}
+//
+//  CNLiveVodAlbumListModel.swift
+//  metaCode
+//
+//  Created by zx on 2025/3/1.
+//
+//  专辑视频列表详情(播放地址 ,点赞数等信息)
+
+import Foundation
+
+class CNLiveVodAlbumListBaseModel:BaseModel{
+    var endRow = 0
+    var firstPage = 0
+    var hasNextPage = false
+    var nextPage = 0
+    var hasPreviousPage = false
+    var isFirstPage = true
+    var isLastPage = true
+    var lastPage = 0
+    var list = [CNLiveVodAlbumListModel]()
+    var navigateFirstPage = 0
+    var navigateLastPage = 0
+    var navigatePages = 0
+    var navigatepageNums:Array<Any> = []
+    var pageNum = 0
+    var pageSize = 0
+    var pages = 0
+    var prePage = 0
+    var size = 0
+    var startRow = 0
+    var total = 0
+    
+    //非接口数据
+    var cellH:CGFloat = 0.0
+    var isExpand = false//是否展开详情简介
+
+}
+class CNLiveVodAlbumListModel:BaseModel{
+    var title = ""
+    var albumId = ""
+    var albumName = ""
+    var actor = ""
+    var spId = ""
+    var spName = ""
+    var modelId = ""
+    var time = ""
+    var img = ""
+    var poster = ""
+    var counts = ""
+    var description = ""
+    var viewCounts = ""
+    var schedule = ""
+    var liveType = ""
+    var downloadType = ""
+    var activityId = ""
+    var isHorizontalScreen = ""
+    var comments = ""
+    var chapterId = ""
+    var contentId = ""
+    var duration = ""
+    var shareUrl = ""
+    var fileSize = ""
+    var cmccActiveId = ""
+    var productId = ""
+    var productType = ""
+    var isStudy = ""
+    var playTime = ""
+    var tool :CNLiveAlbumListToolModel?
+    var product:CNLiveAlbumProductModel?
+
+    //非接口数据-专辑详情
+    var vodAlbumMsgModel:CNLiveVodAlbumMsgModel?
+//    var shortTitle = ""
+//    var subTitle = ""
+//    var model = ""
+//    var thirdUrl = ""
+//    var colours = ""
+//    var address = ""
+//    var source = ""
+//    var sourceName = ""
+//    var pid = ""
+//    var witnessId = ""
+//    var videoUrl = ""
+//    var number = ""
+//    var goods = ""
+//    var icon : CNLiveAlbumListIconModel?
+//    var tagId = ""
+//    var tagName = ""
+//    var activityEndTime = ""
+//    var h5Url = ""
+//    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?
+//}
+
+//
+//  CNLiveVodAlbumMsgModel.swift
+//  metaCode
+//
+//  Created by zx on 2025/3/1.
+//
+
+import Foundation
+
+class CNLiveVodAlbumMsgModel:BaseModel{
+    var albumId = ""
+    var albumImg = ""
+    var albumName = ""//专辑名称
+    var product:CNLiveAlbumProductModel?
+    var desc = ""
+    var descImg = ""
+    var subTitle = ""
+    var actor = ""
+    var actorName = ""
+    var time = ""
+    var sp:CNLiveVodPlaySPModel?
+    var siteId = ""
+    var episodeNow = ""
+    var episodeAll = ""
+    var subscriptions = ""
+    var subscribe = false
+    var episodeLast = 1//上次播放集数
+    var contentIdLast = ""//上次播放集的id
+    var collection = false //是否追剧
+    var charity:CNLiveVodPlayCharityModel?
+}