Skip to content

Commit

Permalink
Rc/3.5.+ (#523)
Browse files Browse the repository at this point in the history
* Squashed 'ios/Classes/Base/' changes from b664522..d4e2686

d4e2686 fix: mapToEncryptionConfig crash
f4be532 fix: compiler error
4eb127f chore: support 3.5.0.2
3c32dc5 chore: add API which is missing
3bb9210 fix: API call error
732df69 feat: support 3.4.6
782ec46 chore: prepare to migrate to iris
ba7fba7 chore: support 3.4.5
f25a603 fix: startAudioRecording bug
02b6cc3 chore: optimize startAudioRecording
88b3d59 style: format code
b60a451 Merge pull request #6 from AgoraLibrary/main/3.4.+
d1561f7 feat(upgrade): 3.4.1
bb84006 Merge pull request #5 from AgoraLibrary/main/3.3.+
4623dc3 fix: getErrorDescription key error
ee40ba1 Merge pull request #4 from AgoraLibrary/dev/3.3.0
f8bde68 Merge branch 'master' into dev/3.3.0
0db518f Merge pull request #3 from AgoraLibrary/dev/3.2.0
5f69768 Merge branch 'master' into dev/3.2.0
d355c51 Merge pull request #2 from AgoraLibrary/dev/3.1.0
a81db07 fix: merge some bug fix
2d1ac8f fix: iOS selector error
98c4331 fix: type cast error
836f3b4 feat: support 3.3.1 for iOS
b422ce8 feat: support 3.3.0 for iOS
c8a08e5 Merge branch 'master' into dev/3.2.0
561b3fd Merge branch 'master' into dev/3.2.0
da3222a Merge branch 'master' into dev/3.2.0
3a55997 feat: add `setClientRole(role: ClientRole, options?: ClientRoleOptions): Promise<void>`
4ee51a9 feat: upgrade to 3.2.0
REVERT: b664522 fix: merge error
REVERT: ed3b61b feat: support 3.0.+

git-subtree-dir: ios/Classes/Base
git-subtree-split: d4e2686fb9a0919fc474bc0e9f5cd87cacdfcce6

* feat: support 3.5.0.4

* feat: support 3.5.1

* Squashed 'android/src/main/java/io/agora/rtc/base/' changes from 21c7655..4ebf77c

4ebf77c feat: support 3.5.1 & plugin
27c788c chore: mapToColor
0278629 feat: support 3.5.0.2
45dcd16 chore: add API which is missing
58ca4b0 fix: AudioRecordingConfiguration bug
4a32e12 chore: prepare to migrate to iris
276c9fe chore: support 3.4.5
783aecf chore: add ERR_ALREADY_IN_RECORDING
3aed6ce fix: startAudioRecording bug
510b405 chore: optimize
4f801b9 chore: optimize
ab71f52 chore: optimize startAudioRecording
07f81c7 chore: optimize
5a20e13 style: optimize
858b58f fix(uid compatible): int to uint
8d14d2d feat(upgrade): 3.4.1
be5efea Merge pull request #4 from AgoraLibrary/dev/3.3.0
382f858 Merge branch 'master' into dev/3.3.0
8671535 Merge pull request #3 from AgoraLibrary/dev/3.2.0
feabda3 Merge branch 'master' into dev/3.2.0
9e57891 Merge pull request #2 from AgoraLibrary/dev/3.1.0
df303ee fix: merge some bug fix
cd7a2cd feat: support 3.3.1 for Android
551ebfe fix: annotation build warning
9c48594 feat: support 3.3.0 for Android
de52ca6 Merge branch 'master' into dev/3.2.0
ddeaefb Merge branch 'master' into dev/3.2.0
2fef3ae feat: add `setClientRole(role: ClientRole, options?: ClientRoleOptions): Promise<void>`
fcb57cc feat: upgrade to 3.2.0
REVERT: 21c7655 feat: support 3.0.+

git-subtree-dir: android/src/main/java/io/agora/rtc/base
git-subtree-split: 4ebf77cf1a688f5f4eccd6d04d754b3a62fd084c

* Squashed 'ios/Classes/Base/' changes from d4e2686..325c233

325c233 feat: support 3.5.1 & plugin

git-subtree-dir: ios/Classes/Base
git-subtree-split: 325c233e45b1d6d84501e3321261129579f32351

* Update RtcEngine.swift

* Update RtcEngineEvent.swift
  • Loading branch information
LichKing-2234 authored Dec 13, 2021
1 parent 15500f0 commit 6b89421
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,11 @@ end
post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
# Temporary exclude simulator arm64 to allow run app on simulator
# https://developer.apple.com/forums/thread/656509
target.build_configurations.each do |config|
config.build_settings['ONLY_ACTIVE_ARCH'] = 'YES'
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "i386 arm64"
end
end
end
2 changes: 1 addition & 1 deletion ios/Classes/Base/BeanCovertor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func mapToEncryptionConfig(_ map: [String: Any]) -> AgoraEncryptionConfig {
var encryptionKdfSalt: [UInt8] = []
for i in list.indices {
if let item = list[i] as? NSNumber {
encryptionKdfSalt[i] = item.uint8Value
encryptionKdfSalt.append(item.uint8Value)
}
}
config.encryptionKdfSalt = Data(bytes: encryptionKdfSalt)
Expand Down
8 changes: 4 additions & 4 deletions ios/Classes/Base/RtcEngine.swift
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ protocol RtcEngineAudioMixingInterface {
func setAudioMixingPosition(_ params: NSDictionary, _ callback: Callback)

func setAudioMixingPitch(_ params: NSDictionary, _ callback: Callback)

func setAudioMixingPlaybackSpeed(_ params: NSDictionary, _ callback: Callback)

func getAudioTrackCount(_ callback: Callback)

func selectAudioTrack(_ params: NSDictionary, _ callback: Callback)

func setAudioMixingDualMonoMode(_ params: NSDictionary, _ callback: Callback)
}

Expand Down

0 comments on commit 6b89421

Please sign in to comment.