From bb68fa1e3ca4bd6abf302d7d3f2bcfdf475452ca Mon Sep 17 00:00:00 2001 From: BilalKhanWDI Date: Wed, 24 Jul 2024 19:59:08 +0530 Subject: [PATCH] - Completed Apply Coupon Functionality - Made a selection for the coupon selected, also added no coupon found when coupon is not there - Added Masila view in more section - Added Play trailer from Manila in more section - Gave other connectivity --- WOKA/Cart/Cart.storyboard | 77 ++++++++++++------ WOKA/Cart/Controller/CartListVC.swift | 12 +++ .../Controller/CartPaymentOptionsVC.swift | 12 +-- WOKA/Cart/View/CartListCell.xib | 11 +-- WOKA/Cart/View/CouponCell.swift | 8 +- WOKA/Cart/View/CouponCell.xib | 7 +- .../Cart/ViewModel/CartPaymentOptionsVM.swift | 71 ++++++++++++++--- .../ActivityToast&Indicator/LLSpinner.swift | 2 +- .../ActivityToast&Indicator/Utilities.swift | 27 +++++++ WOKA/Network Adapter/APIEndPoints.swift | 6 ++ WOKA/Theme/Base.lproj/Theme.storyboard | 78 +++++++++++++++---- WOKA/Theme/Controller/MoreVC.swift | 4 + WOKA/Theme/Controller/PlayerVC.swift | 5 +- WOKA/Theme/Controller/RadioVC.swift | 4 +- WOKA/Theme/ViewModel/MoreVM.swift | 3 - WOKA/WebSeries/Controller/WebSeriesVC.swift | 2 +- WOKA/WebSeries/JWPlayerManager.swift | 5 ++ WOKA/WebSeries/ViewModel/WebSeriesVM.swift | 3 +- 18 files changed, 260 insertions(+), 77 deletions(-) diff --git a/WOKA/Cart/Cart.storyboard b/WOKA/Cart/Cart.storyboard index 239688b..7972e7b 100644 --- a/WOKA/Cart/Cart.storyboard +++ b/WOKA/Cart/Cart.storyboard @@ -138,23 +138,23 @@ - + - + - + @@ -175,7 +175,7 @@ - + - + - - + - + - + + + + + + + + + + + @@ -571,7 +622,7 @@ - + - + - + @@ -636,7 +687,7 @@ - + @@ -1092,6 +1143,7 @@ + @@ -1108,10 +1160,10 @@ - + - + diff --git a/WOKA/Theme/Controller/MoreVC.swift b/WOKA/Theme/Controller/MoreVC.swift index 50fb348..b4c5f76 100644 --- a/WOKA/Theme/Controller/MoreVC.swift +++ b/WOKA/Theme/Controller/MoreVC.swift @@ -33,6 +33,10 @@ class MoreVC: UIViewController { vm.player?.pause() } + @IBAction func playTrailerBtnTapped(_ sender: LocalisedElementsButton) { + let item = JwPlayerItemCreate(url: APIEndPoints.StaticURLs.masilaUrl, poster: nil, titles: "Masila") + JWPlayerManager.shared.presentPlayer(from: self, playerItems: [item], contentType: .trailer) + } } // MARK: - TableView DataSource , Delegates diff --git a/WOKA/Theme/Controller/PlayerVC.swift b/WOKA/Theme/Controller/PlayerVC.swift index cbe90bf..d37f71c 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{ + if let videoIndex , contentType == .webSeries{ player.nextUpPlaylistIndex = videoIndex player.next() self.videoIndex = nil @@ -129,7 +129,8 @@ class PlayerVC: JWPlayerViewController, JWPlayerViewControllerDelegate { // player.next() } case .trailer: - player.play() + break +// player.play() case .continueWatching,.audioBooks, .games: player.seek(to: 0) player.play() diff --git a/WOKA/Theme/Controller/RadioVC.swift b/WOKA/Theme/Controller/RadioVC.swift index bb1a923..79fa960 100644 --- a/WOKA/Theme/Controller/RadioVC.swift +++ b/WOKA/Theme/Controller/RadioVC.swift @@ -12,7 +12,8 @@ class RadioVC: UIViewController, WKNavigationDelegate { @IBOutlet var webView: WKWebView! var url = "https://wokaland.com/admin/api/woka_fm" -// var url = "https://s4.voscast.com:9161/stream" +// var url = "https://s4.voscast.com:9161/stream" provide on 18th july +// var url = "https://planetcast.radiowalla.in/radio.mp3" //url from 24th july @IBOutlet weak var backView: UIView! @@ -63,7 +64,6 @@ class RadioVC: UIViewController, WKNavigationDelegate { self.unloadWebView() } } - func unloadWebView() { // Cancel any ongoing navigation diff --git a/WOKA/Theme/ViewModel/MoreVM.swift b/WOKA/Theme/ViewModel/MoreVM.swift index 2af6f5b..2742b06 100644 --- a/WOKA/Theme/ViewModel/MoreVM.swift +++ b/WOKA/Theme/ViewModel/MoreVM.swift @@ -125,10 +125,7 @@ class MoreVM{ Utilities.dismissProgressHUD() guard let data = data.data?.blogs else{return} blogData = data - blogData.append(contentsOf: data) vc.blogsCollectionView.reloadData() - //Fetched Blogs - break default: break } diff --git a/WOKA/WebSeries/Controller/WebSeriesVC.swift b/WOKA/WebSeries/Controller/WebSeriesVC.swift index 43ee267..feddf99 100644 --- a/WOKA/WebSeries/Controller/WebSeriesVC.swift +++ b/WOKA/WebSeries/Controller/WebSeriesVC.swift @@ -73,7 +73,7 @@ class WebSeriesVC: UIViewController { // MARK: - Tap Handler @IBAction func playTrailer(_ sender: LocalisedElementsButton) { - let item = JwPlayerItemCreate(url: vm.masilaUrl, poster: nil, titles: "Masila") + let item = JwPlayerItemCreate(url: APIEndPoints.StaticURLs.masilaUrl, poster: nil, titles: "Masila") JWPlayerManager.shared.presentPlayer(from: self, playerItems: [item], contentType: .trailer) } diff --git a/WOKA/WebSeries/JWPlayerManager.swift b/WOKA/WebSeries/JWPlayerManager.swift index b4839b1..2a54a6a 100644 --- a/WOKA/WebSeries/JWPlayerManager.swift +++ b/WOKA/WebSeries/JWPlayerManager.swift @@ -115,6 +115,11 @@ class JWPlayerManager { .playlist(items: items) .autostart(true) .build() + case .trailer: + finalConfig = try JWPlayerConfigurationBuilder() + .playlist(items: items) + .autostart(true) + .build() default: // Create a JWPlayerConfiguration with the playlist finalConfig = try JWPlayerConfigurationBuilder() diff --git a/WOKA/WebSeries/ViewModel/WebSeriesVM.swift b/WOKA/WebSeries/ViewModel/WebSeriesVM.swift index 8e7dc10..22d1604 100644 --- a/WOKA/WebSeries/ViewModel/WebSeriesVM.swift +++ b/WOKA/WebSeries/ViewModel/WebSeriesVM.swift @@ -20,7 +20,8 @@ class WebSeriesVM{ var dataSource = [String]() //Static url for masila - var masilaUrl = "https://content.jwplatform.com/videos/Iygt11AD-Ysj2G4DQ.mp4" +//// var masilaUrl = "https://content.jwplatform.com/videos/Iygt11AD-Ysj2G4DQ.mp4" +// var masilaUrl = "https://cdn.jwplayer.com/manifests/Iygt11AD.m3u8" var pageNo = 0 var stopFetch = false