Skip to content

Commit

Permalink
Release Version to 1.9.4
Browse files Browse the repository at this point in the history
Release Version to `1.9.4`
  • Loading branch information
jayce1116 authored Mar 15, 2024
2 parents 404818a + 6331319 commit 8fd13a7
Show file tree
Hide file tree
Showing 20 changed files with 78 additions and 50 deletions.
2 changes: 1 addition & 1 deletion JadeMarble.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'JadeMarble'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'End Point Detector for NUGU ASR'
s.homepage = 'https://github.com/nugu-developers/nugu-ios'
Expand Down
2 changes: 1 addition & 1 deletion KeenSense.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'KeenSense'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Key Word Detector for NUGU'
s.homepage = 'https://github.com/nugu-developers/nugu-ios'
Expand Down
2 changes: 1 addition & 1 deletion NuguAgents.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NuguAgents'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Nugu Agents'
s.description = <<-DESC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public final class AudioPlayerAgent: AudioPlayerAgentProtocol {
}
}

public var ignoreLatestPlayer: Bool = false

// Private
private let playSyncManager: PlaySyncManageable
private let contextManager: ContextManageable
Expand Down Expand Up @@ -862,18 +864,38 @@ private extension AudioPlayerAgent {

func playlistEvent(typeInfo: PlaylistEvent.TypeInfo) -> Single<Eventable> {
return Single.create { [weak self] (observer) -> Disposable in
guard let self = self, let player = self.latestPlayer else {
guard let self else {
observer(.failure(NuguAgentError.invalidState))
return Disposables.create()
}

let playlistEvent = PlaylistEvent(
do {
let playlistEvent = try self.makePlaylistEvent(typeInfo: typeInfo)
observer(.success(playlistEvent))
} catch {
observer(.failure(NuguAgentError.invalidState))
}

return Disposables.create()
}.subscribe(on: audioPlayerScheduler)
}

private func makePlaylistEvent(typeInfo: PlaylistEvent.TypeInfo) throws -> PlaylistEvent {
if ignoreLatestPlayer == true {
return PlaylistEvent(
typeInfo: typeInfo,
playServiceId: latestPlayer?.payload.playServiceId
)
} else {
guard let player = self.latestPlayer else {
throw NuguAgentError.invalidState
}

return PlaylistEvent(
typeInfo: typeInfo,
playServiceId: player.payload.playServiceId
)
observer(.success(playlistEvent))
return Disposables.create()
}.subscribe(on: audioPlayerScheduler)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public protocol AudioPlayerAgentProtocol: CapabilityAgentable, TypedNotifyable {
/// This function retrieves the volume of the current `MediaPlayable` handled by the `AudioPlayerAgent`.
var volume: Float { get set }

/// Ignore latestPlayerInfo when receive Directive
var ignoreLatestPlayer: Bool { get set }

/// Begins playback of the current item.
func play()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ extension AudioPlayerDisplayManager {
}

func updateMetadata(payload: AudioPlayerUpdateMetadataPayload, playServiceId: String, header: Downstream.Header) {
guard currentItem?.mediaPayload.playServiceId == playServiceId else { return }
delegate?.audioPlayerDisplayShouldUpdateMetadata(payload: payload, header: header)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import Foundation
extension AudioPlayerAgent {
struct PlaylistEvent {
let typeInfo: TypeInfo
let playServiceId: String
let playServiceId: String?

enum TypeInfo {
case playlistItemSelected(token: String, postback: [String: AnyHashable])
Expand All @@ -48,6 +48,10 @@ extension AudioPlayerAgent.PlaylistEvent: Eventable {
case .playlistFavoriteSelected(token: let playlistItemToken, postback: let postback):
eventPayload["token"] = playlistItemToken
eventPayload["postback"] = postback

if playServiceId == nil {
eventPayload["playServiceId"] = postback["playServiceId"]
}
case .playlistItemSelected(token: let playlistItemToken, postback: let postback):
eventPayload["token"] = playlistItemToken
eventPayload["postback"] = postback
Expand Down
2 changes: 1 addition & 1 deletion NuguClientKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NuguClientKit'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Nugu Client Kit'
s.description = <<-DESC
Expand Down
1 change: 0 additions & 1 deletion NuguClientKit/Sources/Audio/AudioSessionManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ public extension AudioSessionManager {
log.debug("")
// Defer statement for recovering audioSession and MicInputProvider
defer {
updateAudioSession()
delegate?.audioSessionDidDeactivate()
}
do {
Expand Down
3 changes: 2 additions & 1 deletion NuguCore.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NuguCore'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Nugu'
s.description = <<-DESC
Expand All @@ -22,6 +22,7 @@ Nugu framework for AI Service
s.source_files = 'NuguCore/Sources/**/*'

s.dependency 'NuguUtils', s.version.to_s
s.dependency 'NuguObjcUtils', s.version.to_s
s.dependency 'NattyLog', '~> 1.0'
s.dependency 'RxSwift', '~> 6'

Expand Down
2 changes: 1 addition & 1 deletion NuguCore/Sources/NuguCore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ public var logLevel: NattyLog.LogLevel {
public let nuguSDKVersion = (Bundle(for: AuthorizationStore.self).object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "0")
#else
// FIXME: 현재는 SPM에서 버전을 가져올 방법이 없다.
public let nuguSDKVersion = "1.9.3"
public let nuguSDKVersion = "1.9.4"
#endif
2 changes: 1 addition & 1 deletion NuguLoginKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NuguLoginKit'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Supported login for Nugu Service'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion NuguObjcUtils.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NuguObjcUtils'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Nugu Utils'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion NuguServiceKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NuguServiceKit'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Customized Webview for Nugu Service'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion NuguUIKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NuguUIKit'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'UI Set of Nugu Service'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion NuguUtils.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'NuguUtils'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Supported login for Nugu Service'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion OpusSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'OpusSDK'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Opus codec wrapper'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion SilverTray.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'SilverTray'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Data chunk player'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion TycheSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'TycheSDK'
s.version = '1.9.3'
s.version = '1.9.4'
s.license = 'Apache License, Version 2.0'
s.summary = 'Tyche wrapper'
s.description = <<-DESC
Expand Down
Loading

0 comments on commit 8fd13a7

Please sign in to comment.