搜索tab “剧集”改为“电视剧” , 我的收藏 / 搜多结果专辑跳转 , 1.1.4.25.04.11.16

“张旭”
1 parent 8131b7a0
Showing 4 changed files with 63 additions and 5 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveHomeSearchController.swift
metaCode/Classes/Main/HuBiLieHomePage/Util/CNLiveDownSlideTool.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeTwoHengTuCell.swift
@@ -2936,7 +2936,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.4.25.02.09.11;
+				CURRENT_PROJECT_VERSION = 1.1.4.25.04.11.16;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3192,7 +3192,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.4.25.02.09.11;
+				CURRENT_PROJECT_VERSION = 1.1.4.25.04.11.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -147,7 +147,7 @@ class CNLiveHomeSearchController:CNLiveBaseViewController,UISearchBarDelegate, U
         expandBtn.setTitleColor(HexColor("#919191"), for: .normal)
         expandBtn.titleLabel?.font = BoldFont_13
-        expandBtn.setTitle("剧集", for: .normal)
+        expandBtn.setTitle("电视剧", for: .normal)
         expandBtn.layer.cornerRadius = 16
         expandBtn.clipsToBounds = true
         expandBtn.frame = CGRect(x: 0, y: 0, width: 60, height: 32)
@@ -197,7 +197,7 @@ class CNLiveHomeSearchController:CNLiveBaseViewController,UISearchBarDelegate, U
         resultHeaderView!.addSubview(headerJuJiBtn)
         headerJuJiBtn.snp.makeConstraints { make in
             make.left.equalTo(self.headerDuanJuBtn.snp.right)
-            make.width.equalTo(60)
+            make.width.equalTo(100)
             make.centerY.equalToSuperview()
             make.height.equalTo(32)
         }
@@ -190,7 +190,8 @@ class CNLiveDownSlideTool:NSObject{
             }
         }else if (model == kCNDownSlideContentsModelModelAlbum_video){
             //点播-专辑
-            self.pushVodController(contentId: contentId, navigationVC: navigationViewController().visibleViewController?.navigationController, isAblumVideo: true)
+            self.pushVodController(albumId: contentId, navigationVC: navigationViewController().visibleViewController?.navigationController)
+//            self.pushVodController(contentId: contentId, navigationVC: navigationViewController().visibleViewController?.navigationController, isAblumVideo: true)
         }else if (model == kCNDownSlideContentsModelModelProduct){
 //            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentId)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
             let regURL = URL(string: thirdUrl)
@@ -350,6 +351,54 @@ class CNLiveDownSlideTool:NSObject{
         }
     }
+    //已经确定专辑 ,只有 albumId 2653 ,其他contentId为nil时 跳转点播页
+    class func pushVodController(albumId:String,navigationVC:UINavigationController?){
+//获取专辑详情
+CNLiveDownSlideTool.getVodAlbumMsgApi(contentId: albumId){ result, status in
+    if status == .success{
+        if let vodModel = result as? CNLiveVodAlbumMsgModel{
+            //获取专辑列表
+            CNLiveHomePageViewModel.requstWithVodAlbumVideoList(aid: albumId){result, status in
+                if let  albumListBaseModel = result as? CNLiveVodAlbumListBaseModel{
+                    var currVodModel:CNLiveVodAlbumListModel?
+                    for (idx,albumListModel) in  albumListBaseModel.list.enumerated(){
+                        albumListModel.vodAlbumMsgModel = vodModel
+                        if idx == vodModel.episodeLast{
+                            currVodModel =
+                            albumListModel       }
+                    }
+                    //拿最新播放集数的单集pid,再请求play
+                    CNLiveDownSlideTool.getVodPlayApi(contentId: currVodModel?.contentId ?? ""){ result, status in
+                        if status == .success{
+                            if let vodModel = result as? CNLiveVodPlayModel{
+                                //获得点播url
+                                //获取301播放地址
+                                CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: vodModel.contentId) {result,status in //vodModel.contentId result, status in
+                                                hiddenLoading()
+                                                if status == .success{
+                                                    let vc =  CNLiveTVPlayerViewController()
+                                                    let url = result as! String
+                                                    vc.url = URL(string: url)
+                                                    vc.vodPlayModel = vodModel//vodModel
+                                                        vc.contentId = vodModel.contentId
+                                                    vc.vodAlbumListBaseModel = albumListBaseModel
+                                                    navigationVC?.pushViewController(vc, animated: pushAnimated)
+                                                }else{
+                                                    
+                                                }
+                                }
+                            }
+                        }
+                    }
+                    
+                }
+            }
+        }
+    }
+}
+
+    }
+    //单集时请求play接口确定是专辑/单集  有contentId 1350755 跳转点播页
     class func pushVodController(contentId:String,navigationVC:UINavigationController?,isAblumVideo:Bool){
 showLoading(message: "")
 var tempIsAblumVideo = isAblumVideo
@@ -253,6 +253,15 @@ class CNLiveHomeTwoHengTuCell: UITableViewCell {
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(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)
         }else if let contentMdl = self.followModel?[i] as? CNLiveHomeFollowModel{
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: contentMdl.modelId , contentId: contentMdl.contentId , pid: contentMdl.activeId , shareUrl: contentMdl.shareUrl , thirdUrl: contentMdl.shareUrl , title: contentMdl.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
+        }else if let contentMdl = self.collectionModel?[i] as? CNLiveCollectionListModel{//我的收藏
+            if contentMdl.model == kCNDownSlideContentsModelModelAlbum_video{
+                //专辑
+                CNLiveDownSlideTool.pushVodController(albumId: contentMdl.albumId, navigationVC: navigationViewController())
+            }else{
+                //点播
+                CNLiveDownSlideTool.pushVodController(contentId: contentMdl.contentId, navigationVC: navigationViewController(), isAblumVideo: false)
+
+            }
         }
     }