1.专辑/单集增加跳过片头片尾逻辑

2.切换清晰度时不处理跳过片头片尾逻辑

1.专辑/单集增加跳过片头片尾逻辑
2.切换清晰度时不处理跳过片头片尾逻辑
张旭
1 parent c06e7402
Showing 2 changed files with 96 additions and 6 deletions
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/Model/CNLiveVodPlayModel.swift
@@ -29,6 +29,8 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
     //当前选择内容是否需要付费
     var currentPlayIsNeedPay = false
+    //是否正在跳过片尾 ,播放下一集
+    var isSkipEndPlayNext = false
     var player: CNLiveZFPlayerController!
@@ -601,6 +603,58 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             }
         }
         var endAssetURL:URL?
+        // player更新时间
+        self.player.playerPlayTimeChanged = { [weak self] asset, currentTime, duration in
+            guard let self = self else { return }
+            print("currentTime:\(currentTime),duration:\(duration)")
+            //如果跳过片头片尾seek
+            if metaAppDelegate.isSkip{
+//                let openingDuration = self.vodPlayModel?.openingDuration ?? "0"
+//                if let seconds = Double(openingDuration) {
+//                    let timeInterval: TimeInterval = seconds
+//                    if timeInterval > 0{
+//                        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+//                            self.player.seek(toTime: timeInterval)
+//                        }
+//                    }else{
+//                        print("片头为0")
+//                    }
+//                    print("转换结果: \(timeInterval)")  // 输出: 50.0
+//                } else {
+//                    print("无效的秒数字符串")
+//                }
+                let endingDuration = self.vodPlayModel?.endingDuration ?? "0"
+                if let seconds = Double(endingDuration) {
+                    let timeInterval: TimeInterval = seconds
+                    if timeInterval > 0 && currentTime+timeInterval>duration{
+                        if !self.isSkipEndPlayNext{
+                            DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+                                self.playNextIfExist()
+                                //上报end
+                                CNLiveShortVideoViewModel.requestVodPlayRecordEnd(contentId: self.contentId , channelName: "yszg",model: self.vodPlayModel?.model ?? "1")
+                                print("\(self.contentId),\(self.vodPlayModel?.model)")
+                                
+                                //刷新选集-专辑列表
+                                if self.isPlayAblumOrKandian{
+                                    self.controlView.xuanjiBgView.currSeleIdx = self.albumIndex
+                                }else{
+                                    //刷新选集-看点列表
+                                    self.controlView.xuanjiBgView.currSeleIdx = self.kanDianIndex
+                                    self.controlView.xuanjiBgView.kandianTableView.reloadData()
+                                }
+                            }
+                        }
+                        self.isSkipEndPlayNext = true
+                    }else{
+                        print("片头为0")
+                    }
+                } else {
+                    print("无效的秒数字符串")
+                }
+            }else{
+                
+            }
+        }
         /// 播放完成
         self.player.playerDidToEnd = {
             [weak self] asset in
@@ -608,7 +662,10 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             if endAssetURL == nil {
                 endAssetURL = asset.assetURL
-                self.playNextIfExist()
+                if !self.isSkipEndPlayNext{
+                    self.playNextIfExist()
+                }
+                self.isSkipEndPlayNext = true
             }else{
                 //一个视频回调 两次end
                 endAssetURL = nil
@@ -1098,7 +1155,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             self.controlView.gaoqingBgView.resetGaoqing()
         }
         self.controlView.payBgView.isHidden = true
-        self.isSeek = false
+        
         self.player.currentPlayerManager.rate = 1.0
         self.controlView.beiSuBgView.setDefault1Beisu()
@@ -1111,9 +1168,37 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             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)
+            
+            //如果跳过片头片尾 ,且没有切换清晰度seek
+            if metaAppDelegate.isSkip && !self.isSeek{
+                let openingDuration = self.vodPlayModel?.openingDuration ?? "0"
+                let endingDuration = self.vodPlayModel?.endingDuration ?? "0"
+                if let seconds = Double(openingDuration) {
+                    let timeInterval: TimeInterval = seconds
+                    if timeInterval > 0{
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+                            self.player.seek(toTime: timeInterval)
+                        }
+                    }else{
+                        print("片头为0")
+                    }
+                    print("转换结果: \(timeInterval)")  // 输出: 50.0
+                } else {
+                    print("无效的秒数字符串")
+                }
+                if let seconds = Double(endingDuration) {
+                    let timeInterval: TimeInterval = seconds
+                    print("转换结果: \(timeInterval)")  // 输出: 50.0
+                } else {
+                    print("无效的秒数字符串")
+                }
+            }else{
+                
+            }
         }
         //上报end
         CNLiveShortVideoViewModel.requestVodPlayRecordEnd(contentId: self.contentId , channelName: "yszg",model: self.vodPlayModel?.model ?? "1")
+        self.isSeek = false
     }
     func seekPlayerWithUrlAndTitle(url:String,title:String,seekTime:TimeInterval){
         self.isSeek = true
@@ -1144,7 +1229,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             if status == .success{
                 if let vodPlayModel = result as? CNLiveVodPlayModel{
                     self.vodPlayModel = vodPlayModel
-                    self.controlView.vodPlayModel = vodPlayModel
+                    self.controlView.vodPlayModel = self.vodPlayModel
                     self.configDataArray()
                     self.tableView.reloadData()
                 }else{
@@ -1301,7 +1386,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     }
                     tempVodPlayModel.goodsJson = vodPlayModel.goodsJson
                     self.vodPlayModel = tempVodPlayModel
-                    self.controlView.vodPlayModel = tempVodPlayModel
+                    self.controlView.vodPlayModel = self.vodPlayModel
                     //刷新url 1955_71512cfbcd5b497580732b48e26d16d6
                     if isRefreshPlayer{
@@ -1354,6 +1439,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     self.configDataArray()
                     self.tableView.reloadData()
+                    self.isSkipEndPlayNext = false
                 }else{
                 }
@@ -1372,7 +1458,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             hiddenLoading()
             if status == .success{
                 self.vodPlayModel = vodPlayModel
-                self.controlView.vodPlayModel = vodPlayModel
+                self.controlView.vodPlayModel = self.vodPlayModel
                 self.contentId = contentId
                 if let vodAlbumListBaseModel = result{
                     self.vodAlbumListBaseModel = vodAlbumListBaseModel
@@ -19,7 +19,7 @@ class CNLiveVodPlayModel:BaseModel{
     var goodsJson = ""
     var goodsName = ""
     var model = ""
-    var duration = ""
+    var duration = ""//总时长s
     var attention = false
     var playTime = ""
     var product:CNLiveAlbumProductModel?
@@ -27,6 +27,10 @@ class CNLiveVodPlayModel:BaseModel{
     var sp:CNLiveVodPlaySPModel?
     var blockList = [CNLiveVodPlayBlockListModel]()
     var signIn = false
+    var openingDuration = "0"//片头时长s
+    var endingDuration = "0"//片尾时长s
+    var openingDurationTime:Double = 0.0//片头时长s
+    var endingDurationTime:Double = 0.0//片尾时长s
     //非接口数据
     var goodShopModelArr = [CNLiveVodPlayShopModel]()//电商goodJson转换的数据