feat: update demo for all new play APIs (#2)

* feat: update demo for all new play APIs
* feat: add demo auto play

Author: duyhungtnn

TrinityAudioSwiftUIDemo.xcodeproj/project.pbxproj

@@ -648,8 +648,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/TrinityAudioSDK/trinityaudio-ios-sdk";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 2.0.85;
+				branch = main;
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

TrinityAudioSwiftUIDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,14 +1,15 @@
 {
+  "originHash" : "a23b42ccf7382d7f0ed93dc0d5b1c30c7cff3d6211d146b443deec7fef1734ce",
   "pins" : [
     {
       "identity" : "trinityaudio-ios-sdk",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/TrinityAudioSDK/trinityaudio-ios-sdk",
       "state" : {
-        "revision" : "b3147950462af27a525accb76fde3e51754230c7",
-        "version" : "2.0.85"
+        "branch" : "main",
+        "revision" : "49bf7e5028995c3a620806f29d4e61c100a84f30"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

TrinityAudioSwiftUIDemo/ContentView.swift

@@ -5,16 +5,24 @@ import TrinityPlayer
 struct ContentView: View {
 
     @StateObject var permissionRequester = AppTrackingPermissionRequester()
+    // Use session value to force the screen reload
+    @State var session = 0
 
     var body: some View {
-        VStack{
-            if permissionRequester.isRequestedTrackingPermission {
-                DemoContentView()
-            } else {
-                EmptyView()
+        NavigationView{
+            VStack{
+                if permissionRequester.isRequestedTrackingPermission {
+                    NavigationLink("Main Usage") {
+                        DemoContentView(session: $session).id(session)
+                    }.padding(.bottom, 20)
+                    NavigationLink("Auto Play") {
+                        DemoContentView(autoPlay: true, session: $session).id(session)
+                    }
+                } else {
+                    EmptyView()
+                }
             }
-        }
-        .onAppear(perform: {
+        }.onAppear(perform: {
             // Request permission for tracking user.
             // After have a permission we could access the IAD
             permissionRequester.request()

TrinityAudioSwiftUIDemo/DemoContentView.swift

@@ -9,9 +9,18 @@ import SwiftUI
 import TrinityPlayer
 
 struct DemoContentView: View {
-
-    @StateObject var trinityAudioController = TrinityAudioController(unitId: "2900004156", contentURL:"https://demo.trinityaudio.ai/general-demo/demo.html")
-    @StateObject var delegate = TrinityPlayerDelegate()
+    
+    var autoPlay: Bool = false
+    @ObservedObject var trinityAudioController: TrinityAudioController
+    @ObservedObject var delegate: TrinityPlayerDelegate = TrinityPlayerDelegate()
+    @Binding var session: Int
+    
+    internal init(autoPlay: Bool = false, session: Binding<Int>) {
+        self._session = session
+        self.autoPlay = autoPlay
+        self.trinityAudioController = TrinityAudioController(unitId: "2900004156", contentURL:"https://demo.trinityaudio.ai/general-demo/demo.html", autoPlay: autoPlay)
+        self.trinityAudioController.delegate = delegate
+    }
 
     var body: some View {
         ScrollView(.vertical) {
@@ -32,6 +41,19 @@ struct DemoContentView: View {
                 .foregroundColor(Color(UIColor.lightGray))
                 // 1. Insert the player view on the scroll view
                 TrinityAudioPlayer(audioController: trinityAudioController)
+                Text("Player Id: \(trinityAudioController.playerId ?? "")")
+                    .font(.system(size: 14, weight: .semibold))
+                HStack{
+                    Button("Play", action: {
+                        trinityAudioController.play()
+                    })
+                    .padding(.trailing, 20)
+                    Button("Pause") {
+                        if let playerId = trinityAudioController.playerId {
+                            trinityAudioController.pause(playerID: playerId)
+                        }
+                    }
+                }
                 VStack(alignment: .leading) {
                     Text("Player Events")
                         .font(.system(size: 21, weight: .heavy))
@@ -52,15 +74,16 @@ struct DemoContentView: View {
         .trinityFAB(
             controller: trinityAudioController,
             fabViewTopLeftCoordinates: CGPoint(x: 20, y: 80)
-        ).onAppear(perform: {
-            trinityAudioController.delegate = delegate
-        })
+        ).onDisappear{
+            trinityAudioController.invalidate()
+            session = session + 1
+        }
     }
 }
 
 struct DemoContentView_Previews: PreviewProvider {
     static var previews: some View {
-        DemoContentView()
+        DemoContentView(session: .constant(0))
     }
 }
 

TrinityAudioSwiftUIDemo/TrinityPlayerDelegate.swift

@@ -8,8 +8,9 @@
 import Foundation
 import TrinityPlayer
 
+
 class TrinityPlayerDelegate: ObservableObject, TrinityAudioDelegate {
-    
+
     private var cachedEvents = [[String: Any]]()
     @Published var eventLog : String = ""
 
@@ -27,12 +28,10 @@ class TrinityPlayerDelegate: ObservableObject, TrinityAudioDelegate {
 
     func trinity(service: TrinityPlayer.TrinityAudioProtocol, didReceivePostMessage message: [String : Any]) {
         print(message)
-        
-        cachedEvents.append(message)
-        
-        if let eventsData = try? JSONSerialization.data(withJSONObject: cachedEvents, options: [.prettyPrinted, .withoutEscapingSlashes]),
-           let eventsText = String(data: eventsData, encoding: .utf8) {
-            eventLog = eventsText
-        }
+        eventLog.append("\n\(message)")
+    }
+    
+    func trinity(service: any TrinityPlayer.TrinityAudioProtocol, onPlayerReady playerId: String) {
+        print("onPlayerReady \(playerId)")
     }
 }