Skip to content

Commit

Permalink
Squashed 'ios/Classes/Base/' changes from b664522..6db7748
Browse files Browse the repository at this point in the history
6db7748 feat: support 3.5.2
325c233 feat: support 3.5.1 & plugin
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: 6db77489c80d7367d12988c7095383b9be22937d
  • Loading branch information
LichKing-2234 committed Dec 13, 2021
1 parent 74aa42a commit 0f2edf0
Show file tree
Hide file tree
Showing 15 changed files with 1,019 additions and 248 deletions.
69 changes: 40 additions & 29 deletions AgoraRtcEngineKit.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,47 @@
#import <AgoraRtcKit/AgoraRtcEngineKit.h>

typedef NS_ENUM(NSUInteger, AgoraRtcQualityReportFormat) {
AgoraRtc_QualityReportFormat_Json = 0,
AgoraRtc_QualityReportFormat_Html = 1,
AgoraRtc_QualityReportFormat_Json = 0,
AgoraRtc_QualityReportFormat_Html = 1,
};

typedef NS_ENUM(NSUInteger, AgoraRtcAppType) {
AgoraRtc_APP_TYPE_NATIVE = 0,
AgoraRtc_APP_TYPE_COCOS = 1,
AgoraRtc_APP_TYPE_UNITY = 2,
AgoraRtc_APP_TYPE_ELECTRON = 3,
AgoraRtc_APP_TYPE_FLUTTER = 4,
AgoraRtc_APP_TYPE_UNREAL = 5,
AgoraRtc_APP_TYPE_XAMARIN = 6,
AgoraRtc_APP_TYPE_APICLOUD = 7,
AgoraRtc_APP_TYPE_REACTNATIVE = 8
AgoraRtc_APP_TYPE_NATIVE = 0,
AgoraRtc_APP_TYPE_COCOS = 1,
AgoraRtc_APP_TYPE_UNITY = 2,
AgoraRtc_APP_TYPE_ELECTRON = 3,
AgoraRtc_APP_TYPE_FLUTTER = 4,
AgoraRtc_APP_TYPE_UNREAL = 5,
AgoraRtc_APP_TYPE_XAMARIN = 6,
AgoraRtc_APP_TYPE_APICLOUD = 7,
AgoraRtc_APP_TYPE_REACTNATIVE = 8
};

@protocol AgoraRtcEngineExtensionDelegate <AgoraRtcEngineDelegate>
@optional
- (void)rtcEngine:(AgoraRtcEngineKit * _Nonnull)engine audioTransportQualityOfUid:(NSUInteger)uid delay:(NSUInteger)delay lost:(NSUInteger)lost;
- (void)rtcEngine:(AgoraRtcEngineKit * _Nonnull)engine videoTransportQualityOfUid:(NSUInteger)uid delay:(NSUInteger)delay lost:(NSUInteger)lost;
- (void)rtcEngine:(AgoraRtcEngineKit *_Nonnull)engine
audioTransportQualityOfUid:(NSUInteger)uid
delay:(NSUInteger)delay
lost:(NSUInteger)lost;
- (void)rtcEngine:(AgoraRtcEngineKit *_Nonnull)engine
videoTransportQualityOfUid:(NSUInteger)uid
delay:(NSUInteger)delay
lost:(NSUInteger)lost;
@end

@interface AgoraRtcEngineKit (AgoraExtension)

+ (instancetype _Nonnull)sharedEngineWithAppId:(NSString * _Nonnull)appId
extensionDelegate:(id<AgoraRtcEngineExtensionDelegate> _Nullable)delegate;
+ (instancetype _Nonnull)sharedEngineWithAppId:(NSString *_Nonnull)appId
extensionDelegate:
(id<AgoraRtcEngineExtensionDelegate> _Nullable)
delegate;

/** Sets the profile to control the RTC engine.
*
* @param profile SDK profile in JSON format.
* @param merge Whether to merge the profile data with the original value.
*/
- (int)setProfile:(NSString * _Nonnull)profile
merge:(BOOL)merge;
- (int)setProfile:(NSString *_Nonnull)profile merge:(BOOL)merge;

/** Set wrapper frame type by language wrapper.
*
Expand All @@ -54,7 +61,6 @@ typedef NS_ENUM(NSUInteger, AgoraRtcAppType) {

/** BEGIN OF AUDIO METHODS */


/**
* Enable recap
*
Expand All @@ -76,31 +82,36 @@ typedef NS_ENUM(NSUInteger, AgoraRtcAppType) {
andFrameRate:(NSInteger)frameRate
andBitrate:(NSInteger)andBitrate;

- (int)sendReportData:(NSData * _Nonnull)data
type:(NSInteger)type;
- (int)sendReportData:(NSData *_Nonnull)data type:(NSInteger)type;
/** END OF AUDIO METHODS */

/** Queries internal states
* @param parameters
* json string, array type
* @return a json string
*/
- (NSString * _Nullable)getParameters:(NSString * _Nonnull)parameters;
- (NSString *_Nullable)getParameters:(NSString *_Nonnull)parameters;

/**
* Generates a URL linking to the call quality reports. @param channel The channel name specified in the joinChannel method.
* Generates a URL linking to the call quality reports. @param channel The
channel name specified in the joinChannel method.
* @param listenerUid The uid of the listener.
* @param speakerUid The uid of the speaker.
* @param reportFormat The format of the report.
AgoraRtc_QualityReportFormat_Json (0): JSON.: Returns the quality report data in Json.
AgoraRtc_QualityReportFormat_Html (1): HTML.: Returns a report in HTML format, displayed on a web browser or WebVIEW components.
AgoraRtc_QualityReportFormat_Json (0): JSON.: Returns
the quality report data in Json. AgoraRtc_QualityReportFormat_Html (1): HTML.:
Returns a report in HTML format, displayed on a web browser or WebVIEW
components.
*
* @return 0 when executed successfully. return minus value when failed. return AgoraRtc_Error_Invalid_Argument (-2):Invalid argument. return AgoraRtc_Error_Buffer_Too_Small (-6):The buffer length is too small.
* @return 0 when executed successfully. return minus value when failed. return
AgoraRtc_Error_Invalid_Argument (-2):Invalid argument. return
AgoraRtc_Error_Buffer_Too_Small (-6):The buffer length is too small.
*/
- (NSString * _Nullable)makeQualityReportUrl:(NSString * _Nonnull) channel
listenerUid:(NSUInteger)listenerUid
speakerrUid:(NSUInteger)speakerUid
reportFormat:(AgoraRtcQualityReportFormat)reportFormat;
- (NSString *_Nullable)makeQualityReportUrl:(NSString *_Nonnull)channel
listenerUid:(NSUInteger)listenerUid
speakerrUid:(NSUInteger)speakerUid
reportFormat:
(AgoraRtcQualityReportFormat)reportFormat;

/*********************************************************
* Large group conference call (experiment) - END
Expand Down
Loading

0 comments on commit 0f2edf0

Please sign in to comment.