[ZEUS-4591] Fix dismissal of player instance and refreshing of views

Sources/PlaybackSDK/PlayBackSDKManager.swift

@@ -146,8 +146,20 @@ public class PlayBackSDKManager {
      ```swift
      let playerView = loadPlayer(entryID: "exampleEntryID", authorizationToken: "exampleToken")
      */
-    public func loadPlayer(entryID: String, authorizationToken: String? = nil, mediaTitle: String? = nil, onError: ((PlayBackAPIError) -> Void)?) -> some View {
-        return PlaybackUIView(entryId: entryID, authorizationToken: authorizationToken, mediaTitle: mediaTitle, onError: onError)
+    public func loadPlayer(
+        entryID: String,
+        authorizationToken: String? = nil,
+        mediaTitle: String? = nil,
+        onError: ((PlayBackAPIError) -> Void)?
+    ) -> some View {
+
+        PlaybackUIView(
+            entryId: entryID,
+            authorizationToken: authorizationToken,
+            mediaTitle: mediaTitle,
+            onError: onError
+        )
+        .id(entryID)
     }
 
     // MARK: Private fuctions
@@ -197,7 +209,7 @@ public class PlayBackSDKManager {
     ///   - authorizationToken: Authorization token for accessing the video entry.
     ///   - completion: A closure to be called after loading the HLS stream.
     ///                 It receives a result containing the HLS stream URL or an error.
-    internal func loadHLSStream(forEntryId entryId: String, andAuthorizationToken: String?, completion: @escaping (Result<URL, PlayBackAPIError>) -> Void) {
+    public func loadHLSStream(forEntryId entryId: String, andAuthorizationToken: String?, completion: @escaping (Result<URL, PlayBackAPIError>) -> Void) {
         guard let playBackAPIExist = playBackAPI else {
             completion(.failure(PlayBackAPIError.initializationError))
             return

Sources/PlaybackSDK/Player Plugin/BitMovinPlugin/BitMovinPlayerView.swift

@@ -15,8 +15,8 @@ public struct BitMovinPlayerView: View {
     @State private var playEventTarget: Any?
     @State private var pauseEventTarget: Any?
 
-    internal let player: Player
-    private let playerViewConfig: PlayerViewConfig
+    private let player: Player
+    private let playerViewConfig = PlayerViewConfig()
     private let hlsURLString: String
 
     private var sourceConfig: SourceConfig? {
@@ -27,7 +27,16 @@ public struct BitMovinPlayerView: View {
 
         return sConfig
     }
-
+
+    public init(hlsURLString: String, player: Player, title: String) {
+
+        self.hlsURLString = hlsURLString
+
+        self.player = player
+
+        setup(title: title)
+    }
+
     public init(hlsURLString: String, playerConfig: PlayerConfig, title: String) {
 
         self.hlsURLString = hlsURLString
@@ -40,21 +49,10 @@ public struct BitMovinPlayerView: View {
         self.player = PlayerFactory.createPlayer(
             playerConfig: playerConfig
         )
-
-        // Create player view configuration
-        self.playerViewConfig = PlayerViewConfig()
-
-        // Setup remote control commands to be able to control playback from Control Center
-        setupRemoteTransportControls()
-
-        // Set playback metadata. Updates to the other metadata values are done in the specific listeners
-        setupNowPlayingMetadata(key: MPMediaItemPropertyTitle, value: title)
-
-        // Make sure that the correct audio session category is set to allow for background playback.
-        handleAudioSessionCategorySetting()
+
+        setup(title: title)
     }
-
-
+
     public var body: some View {
         ZStack {
             Color.black
@@ -70,7 +68,6 @@ public struct BitMovinPlayerView: View {
                 dump(event, name: "[Source Event]", maxDepth: 1)
             }
         }
-       // .padding()
         .onAppear {
             if let sourceConfig = self.sourceConfig {
                 player.load(sourceConfig: sourceConfig)
@@ -97,9 +94,11 @@ public struct BitMovinPlayerView: View {
     /// Remove RemoteCommandCenter and AudioSession
     func removeRemoteTransportControlsAndAudioSession() {
         let commandCenter = MPRemoteCommandCenter.shared()
+
         commandCenter.playCommand.isEnabled = false
         commandCenter.playCommand.removeTarget(playEventTarget)
         playEventTarget = nil
+
         commandCenter.pauseCommand.isEnabled = false
         commandCenter.pauseCommand.removeTarget(pauseEventTarget)
         pauseEventTarget = nil
@@ -111,24 +110,14 @@ public struct BitMovinPlayerView: View {
     }
     /// Play event handler for RemoteCommandCenter
     func handleRemotePlayEvent(_: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
-        guard let player = self.player as? Player else { return .commandFailed }
-
         player.play()
-        if player.isPlaying {
-            return .success
-        }
-        return .commandFailed
+        return player.isPlaying ? .success : .commandFailed
     }
 
     /// Pause event handler for RemoteCommandCenter
     func handleRemotePauseEvent(_: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus {
-        guard let player = self.player as? Player else { return .commandFailed }
-
         player.pause()
-        if player.isPaused {
-            return .success
-        }
-        return .commandFailed
+        return player.isPaused ? .success : .commandFailed
     }
 
     func setupNowPlayingMetadata(key: String, value: Any) {
@@ -157,6 +146,17 @@ public struct BitMovinPlayerView: View {
             print("Setting category to AVAudioSessionCategoryPlayback failed.")
         }
     }
-
+
+    private func setup(title: String) {
+
+        // Setup remote control commands to be able to control playback from Control Center
+        setupRemoteTransportControls()
+
+        // Set playback metadata. Updates to the other metadata values are done in the specific listeners
+        setupNowPlayingMetadata(key: MPMediaItemPropertyTitle, value: title)
+
+        // Make sure that the correct audio session category is set to allow for background playback.
+        handleAudioSessionCategorySetting()
+    }
 }
 #endif

Sources/PlaybackSDK/Player Plugin/BitMovinPlugin/BitmovinPlayerPlugin.swift

@@ -11,8 +11,8 @@ import SwiftUI
 public class BitmovinPlayerPlugin: VideoPlayerPlugin {
 
     private let playerConfig: PlayerConfig
-    private var player: BitMovinPlayerView?
-    
+    private weak var player: Player?
+
     // Required properties
     public let name: String
     public let version: String
@@ -29,36 +29,49 @@ public class BitmovinPlayerPlugin: VideoPlayerPlugin {
         self.version = "1.0.1"
     }
 
-    func getPlayer() -> Player? {
-        return player?.player
-    }
-
     // MARK: VideoPlayerPlugin protocol implementation
     public func setup(config: VideoPlayerConfig) {
         playerConfig.playbackConfig.isAutoplayEnabled = config.playbackConfig.autoplayEnabled
         playerConfig.playbackConfig.isBackgroundPlaybackEnabled = config.playbackConfig.backgroundPlaybackEnabled
+
+        let uiConfig = BitmovinUserInterfaceConfig()
+        uiConfig.hideFirstFrame = true
+        playerConfig.styleConfig.userInterfaceConfig = uiConfig
     }
 
     public func playerView(hlsURLString: String, title: String = "") -> AnyView {
-        let videoPlayerView = BitMovinPlayerView(hlsURLString: hlsURLString, playerConfig: playerConfig, title: title)
-
-        self.player = videoPlayerView
-
-        return AnyView(videoPlayerView)
+
+        // Create player based on player and analytics configurations
+        let player = PlayerFactory.createPlayer(
+            playerConfig: playerConfig
+        )
+
+        self.player = player
+
+        return AnyView(
+            BitMovinPlayerView(
+                hlsURLString: hlsURLString,
+                player: player,
+                title: title
+            )
+        )
     }
-    
+
     public func play() {
-        getPlayer()?.play()
+        player?.play()
     }
-    
+
     public func pause() {
-        getPlayer()?.pause()
+        player?.pause()
     }
-
+
+    public func unload() {
+        player?.unload()
+    }
+
     public func removePlayer() {
-        player?.player.unload()
-        player?.player.destroy()
-        player = nil
+        player?.unload()
+        player?.destroy()
     }
 }
 

Sources/PlaybackSDK/Player Plugin/VideoPlayerPluginManager.swift

@@ -22,10 +22,10 @@ public class VideoPlayerPluginManager: ObservableObject {
     }
 
     public func removePlugin() {
-           DispatchQueue.main.async {
-               self.selectedPlugin = nil
-           }
-       }
+        DispatchQueue.main.async {
+            self.selectedPlugin = nil
+        }
+    }
 }
 
 #endif

Sources/PlaybackSDK/PlayerUIView/PlaybackUIView.swift

@@ -81,8 +81,10 @@ internal struct PlaybackUIView: View {
             switch result {
             case .success(let hlsURL):
                 print("HLS URL: \(hlsURL)")
-                self.videoURL = hlsURL
-                self.hasFetchedVideoDetails = true
+                DispatchQueue.main.async {
+                    self.videoURL = hlsURL
+                    self.hasFetchedVideoDetails = true
+                }
             case .failure(let error):
                 // Trow error to the app
                 onError?(error)