Skip to content

Commit 3f11368

Browse files
author
xianing
committed
relase 3.5.2
1 parent 92783cc commit 3f11368

23 files changed

Lines changed: 18 additions & 118 deletions

File tree

‎Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/customaudio/AudioRecordService.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ public class AudioRecordService extends Service {
2727

2828
/**
2929
* Since v3.5.1
30-
* 根据实际需求，你可以将外部音频帧推送到音频采集后、编码前或本地播放前的位置。
31-
* 你可以多次调用该方法，将一个音频帧推送到多个位置或者将多个音频帧推送到不同位置。
32-
* 例如，在 KTV 场景中，你可以将歌声推送到音频采集后的位置，让歌声经过 SDK 音频模块的处理，
33-
* 从而获取优质的音频体验；将伴奏推送到音频编码前的位置，让伴奏不受 SDK 音频模块的影响。
30+
* https://docs.agora.io/en/Interactive%20Broadcast/API%20Reference/java/classio_1_1agora_1_1rtc_1_1_rtc_engine.html?platform=Android#acc77cfbe4ddfcf36d722a89af6729ce5
3431
*
3532
* {@link io.agora.rtc.Constants.AudioExternalSourcePos}
3633
* AUDIO_EXTERNAL_PLAYOUT_SOURCE(0)

‎Android/APIExample/lib-component/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
3131
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3232

33-
api 'io.agora.rtc:full-sdk:3.5.1'
33+
api 'io.agora.rtc:full-sdk:3.5.2'
3434
api 'io.agora:player:1.3.0'
3535

3636
}

‎iOS/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ target 'APIExample' do
66
use_frameworks!
77
pod 'Floaty', '~> 4.2.0'
88
pod 'AGEVideoLayout', '~> 1.0.2'
9-
pod 'AgoraRtcEngine_iOS', '3.5.1'
9+
pod 'AgoraRtcEngine_iOS', '3.5.2'
1010
pod 'AgoraMediaPlayer_iOS', '1.2.2'
1111
end
1212

1313
target 'Agora-ScreenShare-Extension' do
1414

1515
use_frameworks!
16-
pod 'AgoraRtcEngine_iOS', '3.5.1'
16+
pod 'AgoraRtcEngine_iOS', '3.5.2'
1717
end

‎macOS/APIExample/Base.lproj/Main.storyboard‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<scenes>
@@ -732,19 +732,19 @@
732732
<scene sceneID="2bm-hg-KGt">
733733
<objects>
734734
<viewController id="frP-Og-4hq" customClass="MenuController" customModule="APIExample" customModuleProvider="target" sceneMemberID="viewController">
735-
<view key="view" id="bDS-2Z-AsB">
736-
<rect key="frame" x="0.0" y="0.0" width="280" height="602"/>
735+
<view key="view" misplaced="YES" id="bDS-2Z-AsB">
736+
<rect key="frame" x="0.0" y="0.0" width="280" height="583"/>
737737
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
738738
<subviews>
739739
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvf-iG-0lJ">
740-
<rect key="frame" x="0.0" y="30" width="280" height="572"/>
740+
<rect key="frame" x="0.0" y="30" width="280" height="553"/>
741741
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
742742
<clipView key="contentView" id="cyL-uB-YCU">
743-
<rect key="frame" x="1" y="1" width="278" height="570"/>
743+
<rect key="frame" x="1" y="1" width="278" height="551"/>
744744
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
745745
<subviews>
746746
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="arv-VN-9VJ">
747-
<rect key="frame" x="0.0" y="0.0" width="278" height="551"/>
747+
<rect key="frame" x="0.0" y="0.0" width="278" height="532"/>
748748
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
749749
<size key="intercellSpacing" width="3" height="2"/>
750750
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>

‎macOS/APIExample/Base.lproj/Settings.storyboard‎

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<scenes>
@@ -33,33 +33,14 @@
3333
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
3434
</textFieldCell>
3535
</textField>
36-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bne-jc-3o4">
37-
<rect key="frame" x="18" y="423" width="204" height="16"/>
38-
<constraints>
39-
<constraint firstAttribute="width" constant="200" id="bNl-hf-Sqh"/>
40-
</constraints>
41-
<textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Rna-q3-nEV">
42-
<font key="font" usesAppearanceFont="YES"/>
43-
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
44-
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
45-
</textFieldCell>
46-
</textField>
47-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8ck-Ow-7rf">
36+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8ck-Ow-7rf">
4837
<rect key="frame" x="18" y="368" width="464" height="21"/>
4938
<textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Meta Data" id="zLR-cI-iJ0">
5039
<font key="font" metaFont="system" size="18"/>
5140
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
5241
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
5342
</textFieldCell>
5443
</textField>
55-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rrz-Vk-Awn">
56-
<rect key="frame" x="18" y="455" width="464" height="21"/>
57-
<textFieldCell key="cell" lineBreakMode="clipping" alignment="left" title="Proxy Configuration" id="ECh-fS-91N">
58-
<font key="font" metaFont="system" size="18"/>
59-
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
60-
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
61-
</textFieldCell>
62-
</textField>
6344
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FKk-R7-n5E">
6445
<rect key="frame" x="18" y="497" width="204" height="16"/>
6546
<constraints>
@@ -109,57 +90,38 @@
10990
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
11091
</textFieldCell>
11192
</textField>
112-
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uU6-Nf-xuj">
113-
<rect key="frame" x="227" y="414" width="257" height="25"/>
114-
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="Aoh-Kp-3vm">
115-
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
116-
<font key="font" metaFont="menu"/>
117-
<menu key="menu" id="2jP-ec-wM4"/>
118-
</popUpButtonCell>
119-
<connections>
120-
<action selector="onProxyChanged:" target="58f-m9-Rc4" id="RVP-nB-53g"/>
121-
</connections>
122-
</popUpButton>
12393
</subviews>
12494
<constraints>
125-
<constraint firstItem="Bne-jc-3o4" firstAttribute="top" secondItem="Rrz-Vk-Awn" secondAttribute="bottom" constant="16" id="1nZ-zV-dBV"/>
12695
<constraint firstItem="FKk-R7-n5E" firstAttribute="top" secondItem="0gx-V8-KN1" secondAttribute="bottom" constant="8" symbolic="YES" id="3Qf-oa-p2N"/>
12796
<constraint firstItem="1ju-Qi-n55" firstAttribute="top" secondItem="8ck-Ow-7rf" secondAttribute="bottom" constant="15" id="A25-h0-fzM"/>
12897
<constraint firstItem="PRQ-f7-0my" firstAttribute="leading" secondItem="pGL-28-S71" secondAttribute="leading" constant="20" symbolic="YES" id="DZQ-8Y-wtO"/>
12998
<constraint firstItem="dae-jL-GB0" firstAttribute="top" secondItem="pGL-28-S71" secondAttribute="top" constant="20" id="EyB-8R-sHQ"/>
13099
<constraint firstItem="dae-jL-GB0" firstAttribute="leading" secondItem="0gx-V8-KN1" secondAttribute="leading" id="IDY-Bb-v88"/>
131100
<constraint firstItem="PRQ-f7-0my" firstAttribute="top" secondItem="8ck-Ow-7rf" secondAttribute="bottom" constant="15" id="Ip2-2d-86o"/>
132101
<constraint firstItem="ADC-m5-Fbc" firstAttribute="baseline" secondItem="0gx-V8-KN1" secondAttribute="firstBaseline" id="K75-wc-JTs"/>
133-
<constraint firstItem="8ck-Ow-7rf" firstAttribute="top" secondItem="uU6-Nf-xuj" secondAttribute="bottom" constant="29" id="LCD-I2-bQ8"/>
134102
<constraint firstItem="dae-jL-GB0" firstAttribute="top" secondItem="pGL-28-S71" secondAttribute="top" constant="20" id="LeW-x5-cXK"/>
135103
<constraint firstItem="ZdP-fi-5yU" firstAttribute="leading" secondItem="FKk-R7-n5E" secondAttribute="trailing" constant="10" id="NLa-4D-YZL"/>
136104
<constraint firstItem="0gx-V8-KN1" firstAttribute="leading" secondItem="FKk-R7-n5E" secondAttribute="leading" id="Nye-v4-ZfR"/>
137-
<constraint firstItem="uU6-Nf-xuj" firstAttribute="leading" secondItem="Bne-jc-3o4" secondAttribute="trailing" constant="10" id="Tzj-dR-Dt9"/>
138105
<constraint firstItem="0gx-V8-KN1" firstAttribute="firstBaseline" secondItem="ADC-m5-Fbc" secondAttribute="firstBaseline" id="UI2-76-Xea"/>
139106
<constraint firstAttribute="trailing" secondItem="dae-jL-GB0" secondAttribute="trailing" constant="20" symbolic="YES" id="UYv-Gp-fph"/>
140107
<constraint firstAttribute="trailing" secondItem="dae-jL-GB0" secondAttribute="trailing" constant="20" symbolic="YES" id="VJc-LV-1Sq"/>
141-
<constraint firstItem="Rrz-Vk-Awn" firstAttribute="top" secondItem="ZdP-fi-5yU" secondAttribute="bottom" constant="19" id="VPH-I2-Igl"/>
142-
<constraint firstAttribute="trailing" secondItem="Rrz-Vk-Awn" secondAttribute="trailing" constant="20" symbolic="YES" id="XT9-nu-ZeW"/>
143108
<constraint firstItem="ADC-m5-Fbc" firstAttribute="leading" secondItem="0gx-V8-KN1" secondAttribute="trailing" constant="10" id="Zds-2u-VET"/>
144-
<constraint firstAttribute="trailing" secondItem="uU6-Nf-xuj" secondAttribute="trailing" constant="20" id="ZqT-6g-etV"/>
145109
<constraint firstItem="FKk-R7-n5E" firstAttribute="centerY" secondItem="ZdP-fi-5yU" secondAttribute="centerY" id="eKi-7d-6pd"/>
110+
<constraint firstItem="8ck-Ow-7rf" firstAttribute="top" secondItem="pGL-28-S71" secondAttribute="top" constant="211" id="eoD-4W-zeI"/>
146111
<constraint firstItem="dae-jL-GB0" firstAttribute="leading" secondItem="pGL-28-S71" secondAttribute="leading" constant="20" id="j4g-d7-LlA"/>
147112
<constraint firstItem="0gx-V8-KN1" firstAttribute="centerY" secondItem="ADC-m5-Fbc" secondAttribute="centerY" id="jDq-Sm-dfs"/>
148-
<constraint firstItem="Rrz-Vk-Awn" firstAttribute="leading" secondItem="pGL-28-S71" secondAttribute="leading" constant="20" symbolic="YES" id="jgE-hX-sF6"/>
149113
<constraint firstAttribute="trailing" secondItem="1ju-Qi-n55" secondAttribute="trailing" constant="20" symbolic="YES" id="liK-QA-ZST"/>
150-
<constraint firstItem="uU6-Nf-xuj" firstAttribute="top" secondItem="Rrz-Vk-Awn" secondAttribute="bottom" constant="17" id="nmV-Yg-Eb2"/>
114+
<constraint firstItem="8ck-Ow-7rf" firstAttribute="leading" secondItem="PRQ-f7-0my" secondAttribute="leading" id="myh-tu-JWU"/>
151115
<constraint firstItem="ADC-m5-Fbc" firstAttribute="leading" secondItem="ZdP-fi-5yU" secondAttribute="leading" id="o9b-cq-HPe"/>
152116
<constraint firstItem="ADC-m5-Fbc" firstAttribute="trailing" secondItem="ZdP-fi-5yU" secondAttribute="trailing" id="oNp-MT-x7w"/>
153-
<constraint firstItem="Bne-jc-3o4" firstAttribute="leading" secondItem="pGL-28-S71" secondAttribute="leading" constant="20" symbolic="YES" id="pLS-AR-vil"/>
117+
<constraint firstItem="8ck-Ow-7rf" firstAttribute="trailing" secondItem="1ju-Qi-n55" secondAttribute="trailing" id="qMB-eU-S7F"/>
154118
<constraint firstItem="ADC-m5-Fbc" firstAttribute="top" secondItem="dae-jL-GB0" secondAttribute="bottom" constant="19" id="rGD-wL-YBb"/>
155119
<constraint firstItem="dae-jL-GB0" firstAttribute="trailing" secondItem="ADC-m5-Fbc" secondAttribute="trailing" id="tfN-ti-b0v"/>
156120
</constraints>
157121
</view>
158122
<connections>
159123
<outlet property="fpsLabel" destination="FKk-R7-n5E" id="J3s-7d-ZaP"/>
160124
<outlet property="fpsPicker" destination="ZdP-fi-5yU" id="kMi-KI-OTv"/>
161-
<outlet property="proxyLabel" destination="Bne-jc-3o4" id="XMJ-M9-0ls"/>
162-
<outlet property="proxyPicker" destination="uU6-Nf-xuj" id="R4m-iv-Ke5"/>
163125
<outlet property="resolutionLabel" destination="0gx-V8-KN1" id="uu0-K2-i2v"/>
164126
<outlet property="resolutionPicker" destination="ADC-m5-Fbc" id="Fjk-yl-ddd"/>
165127
<outlet property="sdkVersion" destination="1ju-Qi-n55" id="B8X-2d-KbK"/>

‎macOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,6 @@ class AudioMixing: BaseViewController {
380380
return
381381
}
382382
agoraKit.setDevice(.audioRecording, deviceId: micId)
383-
// set proxy configuration
384-
let proxySetting = GlobalSettings.shared.proxySetting.selectedOption().value
385-
agoraKit.setCloudProxy(AgoraCloudProxyType.init(rawValue: UInt(proxySetting)) ?? .noneProxy)
386383
// disable video module in audio scene
387384
agoraKit.disableVideo()
388385
agoraKit.setAudioProfile(profile, scenario: scenario)

‎macOS/APIExample/Examples/Advanced/ChannelMediaRelay/ChannelMediaRelay.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ class ChannelMediaRelay: BaseViewController {
132132
// set myself as broadcaster to stream video/audio
133133
agoraKit.setClientRole(.broadcaster)
134134

135-
// set proxy configuration
136-
let proxySetting = GlobalSettings.shared.proxySetting.selectedOption().value
137-
agoraKit.setCloudProxy(AgoraCloudProxyType.init(rawValue: UInt(proxySetting)) ?? .noneProxy)
138-
139135
// set up local video to render your local camera preview
140136
let localVideo = videos[0]
141137
let videoCanvas = AgoraRtcVideoCanvas()

‎macOS/APIExample/Examples/Advanced/CreateDataStream/CreateDataStream.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ class CreateDataStream: BaseViewController {
160160
// set myself as broadcaster to stream video/audio
161161
agoraKit.setClientRole(.broadcaster)
162162

163-
// set proxy configuration
164-
let proxySetting = GlobalSettings.shared.proxySetting.selectedOption().value
165-
agoraKit.setCloudProxy(AgoraCloudProxyType.init(rawValue: UInt(proxySetting)) ?? .noneProxy)
166-
167163
// set up local video to render your local camera preview
168164
let localVideo = videos[0]
169165
let videoCanvas = AgoraRtcVideoCanvas()

‎macOS/APIExample/Examples/Advanced/CustomAudioRender/CustomAudioRender.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,6 @@ class CustomAudioRender: BaseViewController {
156156
// disable video module in audio scene
157157
agoraKit.disableVideo()
158158

159-
// set proxy configuration
160-
// let proxySetting = GlobalSettings.shared.proxySetting.selectedOption().value
161-
// agoraKit.setCloudProxy(AgoraCloudProxyType.init(rawValue: UInt(proxySetting)) ?? .noneProxy)
162-
163159
// set live broadcaster mode
164160
agoraKit.setChannelProfile(.liveBroadcasting)
165161
// set myself as broadcaster to stream audio

‎macOS/APIExample/Examples/Advanced/CustomAudioSource/CustomAudioSource.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@ class CustomAudioSource: BaseViewController {
155155
// disable video module in audio scene
156156
agoraKit.disableVideo()
157157

158-
// set proxy configuration
159-
let proxySetting = GlobalSettings.shared.proxySetting.selectedOption().value
160-
agoraKit.setCloudProxy(AgoraCloudProxyType.init(rawValue: UInt(proxySetting)) ?? .noneProxy)
161-
162158
// set live broadcaster mode
163159
agoraKit.setChannelProfile(.liveBroadcasting)
164160
// set myself as broadcaster to stream audio

0 commit comments

Comments
 (0)