From 993e7346fd9084da8f95048d4ad6a140ccd62d3f Mon Sep 17 00:00:00 2001 From: Bilal Date: Thu, 25 Jul 2024 08:58:13 +0530 Subject: [PATCH] morning upoad --- WOKA/Theme/Controller/PlayerVC.swift | 4 ++-- WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift | 3 ++- WOKA/WebSeries/JWPlayerManager.swift | 3 ++- WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift | 12 +++++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/WOKA/Theme/Controller/PlayerVC.swift b/WOKA/Theme/Controller/PlayerVC.swift index d37f71c..47538b3 100644 --- a/WOKA/Theme/Controller/PlayerVC.swift +++ b/WOKA/Theme/Controller/PlayerVC.swift @@ -109,7 +109,7 @@ class PlayerVC: JWPlayerViewController, JWPlayerViewControllerDelegate { override func jwplayer(_ player: any JWPlayer, didFinishLoadingWithTime loadTime: TimeInterval) { super.jwplayer(player, didFinishLoadingWithTime: loadTime) print("LoadTime", loadTime) - if let videoIndex , contentType == .webSeries{ + if let videoIndex , contentType == .webSeries, videoIndex != 0{ player.nextUpPlaylistIndex = videoIndex player.next() self.videoIndex = nil @@ -128,7 +128,7 @@ class PlayerVC: JWPlayerViewController, JWPlayerViewControllerDelegate { // player.nextUpPlaylistIndex = videoIndex ?? 0 // player.next() } - case .trailer: + case .trailer,.songs: break // player.play() case .continueWatching,.audioBooks, .games: diff --git a/WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift b/WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift index 1097668..791f926 100644 --- a/WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift +++ b/WOKA/WebSeries/Controller/WebSeriesSeasonVC.swift @@ -248,6 +248,7 @@ extension WebSeriesSeasonVC : TableViewSRC{ }else{ playerItems.append(JwPlayerItemCreate(url: url, poster: teaserData.thumbnailPath, titles: hindiData.title)) } + JWPlayerManager.shared.presentPlayer(from: self, playerItems: playerItems,startIndex: indexPath.row, contentType: .trailer) case self.episodeTableView: let episodeData = vm.seasonEpisodeData for i in episodeData{ @@ -277,7 +278,6 @@ extension WebSeriesSeasonVC : TableViewSRC{ break } - JWPlayerManager.shared.presentPlayer(from: self, playerItems: playerItems,startIndex: indexPath.row, contentType: .webSeries) } vcPush.modalPresentationStyle = .overCurrentContext @@ -307,6 +307,7 @@ extension WebSeriesSeasonVC : CollectionViewSRC{ vm.setSeasonData() episodeTitle.isHidden = false episodeTitle.text = "" + vm.pageNo = 0 vm.getSeasonEpisode() vm.getTeaserListing() self.categoryCV.reloadData() diff --git a/WOKA/WebSeries/JWPlayerManager.swift b/WOKA/WebSeries/JWPlayerManager.swift index 9019aaa..80fe125 100644 --- a/WOKA/WebSeries/JWPlayerManager.swift +++ b/WOKA/WebSeries/JWPlayerManager.swift @@ -15,6 +15,7 @@ enum VideoContentType{ case continueWatching case audioBooks case games + case songs } struct JwPlayerItemCreate{ @@ -46,7 +47,7 @@ class JWPlayerManager { // } switch contentType{ - case .webSeries: + case .webSeries,.songs: // Iterate over the liveStreamURLs to create JWPlayerItems for (index, singleItem) in playerItems.enumerated() { guard let url = URL(string: singleItem.url) else { diff --git a/WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift b/WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift index b2f4c06..3251b77 100644 --- a/WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift +++ b/WOKA/WebSeries/ViewModel/WebSeriesSeasonVM.swift @@ -241,10 +241,20 @@ class WebSeriesSeasonVM{ Error */ Utilities.dismissProgressHUD() - vc.toast(msg: data.message ?? "Unrecognised error" , time: 2) + if pageNo == 0 { + self.seasonEpisodeData.removeAll() + } + self.vc.episodeTableView.reloadData() + self.vc.tableHeight.constant = self.vc.episodeTableView.contentSize.height + 100 + self.vc.episodeTableView.layoutIfNeeded() + self.vc.tableHeight.constant = self.vc.episodeTableView.contentSize.height +// vc.toast(msg: data.message ?? "Unrecognised error" , time: 2) case 1: Utilities.dismissProgressHUD() guard let dataCount = data.data?.totalRecords ,let data = data.data?.result else{return} + if pageNo == 0 { + self.seasonEpisodeData.removeAll() + } self.seasonEpisodeData.append(contentsOf: data) // self.seasonEpisodeData = self.seasonEpisodeData.filter { // $0.episodeData != nil && !$0.episodeData!.isEmpty