修复首次进入专辑时播放视频和选中的集数偶尔不一致的问题

修复每次播放专辑视频会播放上次播放的下一集的问题优化切换看点或剧集时展示对应视频的标题和简介

修复首次进入专辑时播放视频和选中的集数偶尔不一致的问题
修复每次播放专辑视频会播放上次播放的下一集的问题优化切换看点或剧集时展示对应视频的标题和简介
张旭
1 parent 723299d8
Showing 2 changed files with 41 additions and 22 deletions
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/Util/CNLiveDownSlideTool.swift
@@ -413,22 +413,22 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             }
         }
         //专辑-简介
-        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{//专辑有值-专辑列表
+//            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)
@@ -1252,6 +1252,8 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                         }
                     }
+                    var vodTitle = ""
+                    
                     for(index,vodModel) in tempVodPlayModel.blockList.enumerated(){
                         if self.isPlayAblumOrKandian{
                             //切换剧集时, 调用play接口, 更新片花列表和商品列表
@@ -1273,6 +1275,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                         if temp5Mdl != nil{
                             if vodModel.type == "5"{
                                 tempVodPlayModel.blockList[index] = temp5Mdl!
+                                vodTitle = temp5Mdl!.list.first?.title ?? title
                             }
                         }
                     }
@@ -1293,11 +1296,12 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                                     if self.contentId == contentId{
                                         self.player.contentId = contentId
                                         self.player.activityId = activityId
-                                        self.player.title = title
+                                        self.player.title = vodTitle
                                         self.player.url = url
-                                        self.playWithUrlAndTitle(url: url, title: title)
+                                        self.playWithUrlAndTitle(url: url, title: vodTitle)
                                         self.url = URL(string: url)
+                                        
                                     }else{
                                         print("2222222:vodPlayMdlCId:\(self.vodPlayModel?.cid),vodPlayMdlContentId:\(self.vodPlayModel?.contentId),currentPlayIsNeedPay:\(self.currentPlayIsNeedPay)")
                                         if self.currentPlayIsNeedPay{
@@ -1315,7 +1319,19 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                             }
                         }
                     }
-
+                    
+                    if self.isPlayAblumOrKandian{
+                        //如果是专辑,更新albumIndex
+                        for (idx,mdl) in self.albumListArr.enumerated(){
+                            if let model = mdl as? CNLiveVodAlbumListModel{
+                                if vodPlayModel.contentId == model.contentId || vodPlayModel.contentId == model.activityId{
+                                    self.albumIndex = idx
+                                    break
+                                }
+                            }
+                        }
+                    }
+                    
                     self.configDataArray()
                     self.tableView.reloadData()
                 }else{
@@ -302,7 +302,8 @@ class CNLiveDownSlideTool:NSObject{
                                 var currVodModel:CNLiveVodAlbumListModel?
                                 for (idx,albumListModel) in  albumListBaseModel.list.enumerated(){
                                     albumListModel.vodAlbumMsgModel = vodModel
-                                    if idx == vodModel.episodeLast{
+                                    let toIndex = vodModel.episodeLast-1 <= 0 ? 0 : vodModel.episodeLast-1
+                                    if idx == toIndex{
                                         currVodModel =
                                         albumListModel}
                                 }
@@ -388,7 +389,8 @@ CNLiveDownSlideTool.getVodAlbumMsgApi(contentId: albumId){ result, status in
                     var currVodModel:CNLiveVodAlbumListModel?
                     for (idx,albumListModel) in  albumListBaseModel.list.enumerated(){
                         albumListModel.vodAlbumMsgModel = vodModel
-                        if idx == vodModel.episodeLast{
+                        let toIndex = vodModel.episodeLast-1 <= 0 ? 0 : vodModel.episodeLast-1
+                        if idx == toIndex{
                             currVodModel =
                             albumListModel
                         }
@@ -463,7 +465,8 @@ CNLiveDownSlideTool.getVodPlayApi(contentId: contentId){ result, status in
                                     var currVodModel:CNLiveVodAlbumListModel?
                                     for (idx,albumListModel) in  albumListBaseModel.list.enumerated(){
                                         albumListModel.vodAlbumMsgModel = vodModel
-                                        if idx == vodModel.episodeLast{
+                                        let toIndex = vodModel.episodeLast-1 <= 0 ? 0 : vodModel.episodeLast-1
+                                        if idx == toIndex{
                                             currVodModel =
                                             albumListModel                                    }
                                     }