diff --git a/android/build.gradle b/android/build.gradle index 3aeb3ecf3..2d654c99f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -57,9 +57,9 @@ dependencies { if (isDev(project)) { implementation fileTree(dir: "libs", include: ["*.jar"]) } else { - api 'io.agora.rtc:iris-rtc:4.3.0-dev.13' - api 'io.agora.rtc:agora-full-preview:4.3.0-dev.13' - api 'io.agora.rtc:full-screen-sharing-special:4.3.0-dev.13' + api 'io.agora.rtc:iris-rtc:4.3.0-dev.14' + api 'io.agora.rtc:agora-full-preview:4.3.0-dev.14' + api 'io.agora.rtc:full-screen-sharing-special:4.3.0-dev.14' } } diff --git a/android/src/main/cpp/third_party/include/agora_rtc/AgoraBase.h b/android/src/main/cpp/third_party/include/agora_rtc/AgoraBase.h index 0473bce8a..ece32fd04 100644 --- a/android/src/main/cpp/third_party/include/agora_rtc/AgoraBase.h +++ b/android/src/main/cpp/third_party/include/agora_rtc/AgoraBase.h @@ -5997,7 +5997,13 @@ struct LocalAccessPointConfiguration { /** Local proxy connection, advanced Config info. */ AdvancedConfigInfo advancedConfig; - LocalAccessPointConfiguration() : ipList(NULL), ipListSize(0), domainList(NULL), domainListSize(0), verifyDomainName(NULL), mode(ConnectivityFirst) {} + /** + * Whether to disable vos-aut: + - true: (Default)disable vos-aut. + - false: not disable vos-aut + */ + bool disableAut; + LocalAccessPointConfiguration() : ipList(NULL), ipListSize(0), domainList(NULL), domainListSize(0), verifyDomainName(NULL), mode(ConnectivityFirst), disableAut(true) {} }; /** diff --git a/android/src/main/cpp/third_party/include/agora_rtc/IAgoraMusicContentCenter.h b/android/src/main/cpp/third_party/include/agora_rtc/IAgoraMusicContentCenter.h index d5ed99ef8..7e929de3d 100644 --- a/android/src/main/cpp/third_party/include/agora_rtc/IAgoraMusicContentCenter.h +++ b/android/src/main/cpp/third_party/include/agora_rtc/IAgoraMusicContentCenter.h @@ -18,63 +18,63 @@ typedef enum /** * 0: No error occurs and preload succeeds. */ - kPreloadStatusCompleted = 0, + kPreloadStateCompleted = 0, /** * 1: A general error occurs. */ - kPreloadStatusFailed = 1, + kPreloadStateFailed = 1, /** * 2: The media file is preloading. */ - kPreloadStatusPreloading = 2, + kPreloadStatePreloading = 2, /** * 3: The media file is removed. */ - kPreloadStatusRemoved = 3, -} PreloadStatusCode; + kPreloadStateRemoved = 3, +} PreloadState; typedef enum { /** * 0: No error occurs and request succeeds. */ - kMusicContentCenterStatusOk = 0, + kMusicContentCenterReasonOk = 0, /** * 1: A general error occurs. */ - kMusicContentCenterStatusError = 1, + kMusicContentCenterReasonError = 1, /** * 2: The gateway error. There are several possible reasons: * - Token is expired. Check if your token is expired. * - Token is invalid. Check the type of token you passed in. * - Network error. Check your network. */ - kMusicContentCenterStatusGateway = 2, + kMusicContentCenterReasonGateway = 2, /** * 3: Permission and resource error. There are several possible reasons: * - Your appid may not have the mcc permission. Please contact technical support * - The resource may not exist. Please contact technical support */ - kMusicContentCenterStatusPermissionAndResource = 3, + kMusicContentCenterReasonPermissionAndResource = 3, /** * 4: Internal data parse error. Please contact technical support */ - kMusicContentCenterStatusInternalDataParse = 4, + kMusicContentCenterReasonInternalDataParse = 4, /** * 5: Music loading error. Please contact technical support */ - kMusicContentCenterStatusMusicLoading = 5, + kMusicContentCenterReasonMusicLoading = 5, /** * 6: Music decryption error. Please contact technical support */ - kMusicContentCenterStatusMusicDecryption = 6, + kMusicContentCenterReasonMusicDecryption = 6, /** * 7: Http internal error. Please retry later. */ - kMusicContentCenterStatusHttpInternalError = 7, -} MusicContentCenterStatusCode; + kMusicContentCenterReasonHttpInternalError = 7, +} MusicContentCenterStateReason; typedef struct { @@ -234,18 +234,18 @@ class IMusicContentCenterEventHandler { * * @param requestId The request id is same as that returned by getMusicCharts. * @param result The result of music chart collection - * @param status The status of the request. See MusicContentCenterStatusCode + * @param statusCode The status of the request. See MusicContentCenterStateReason */ - virtual void onMusicChartsResult(const char* requestId, agora_refptr result, MusicContentCenterStatusCode status) = 0; + virtual void onMusicChartsResult(const char* requestId, agora_refptr result, MusicContentCenterStateReason reason) = 0; /** * Music collection, occurs when getMusicCollectionByMusicChartId or searchMusic method is called. * * @param requestId The request id is same as that returned by getMusicCollectionByMusicChartId or searchMusic * @param result The result of music collection - * @param status The status of the request. See MusicContentCenterStatusCode + * @param statusCode The status of the request. See MusicContentCenterStateReason */ - virtual void onMusicCollectionResult(const char* requestId, agora_refptr result, MusicContentCenterStatusCode status) = 0; + virtual void onMusicCollectionResult(const char* requestId, agora_refptr result, MusicContentCenterStateReason reason) = 0; /** * Lyric url callback of getLyric, occurs when getLyric is called @@ -253,9 +253,9 @@ class IMusicContentCenterEventHandler { * @param requestId The request id is same as that returned by getLyric * @param songCode Song code * @param lyricUrl The lyric url of this music - * @param status The status of the request. See MusicContentCenterStatusCode + * @param statusCode The status of the request. See MusicContentCenterStateReason */ - virtual void onLyricResult(const char* requestId, int64_t songCode, const char* lyricUrl, MusicContentCenterStatusCode status) = 0; + virtual void onLyricResult(const char* requestId, int64_t songCode, const char* lyricUrl, MusicContentCenterStateReason reason) = 0; /** * Simple info callback of getSongSimpleInfo, occurs when getSongSimpleInfo is called @@ -263,9 +263,9 @@ class IMusicContentCenterEventHandler { * @param requestId The request id is same as that returned by getSongSimpleInfo. * @param songCode Song code * @param simpleInfo The metadata of the music. - * @param status The status of the request. See MusicContentCenterStatusCode + * @param statusCode The status of the request. See MusicContentCenterStateReason */ - virtual void onSongSimpleInfoResult(const char* requestId, int64_t songCode, const char* simpleInfo, MusicContentCenterStatusCode status) = 0; + virtual void onSongSimpleInfoResult(const char* requestId, int64_t songCode, const char* simpleInfo, MusicContentCenterStateReason reason) = 0; /** * Preload process callback, occurs when preload is called @@ -274,10 +274,10 @@ class IMusicContentCenterEventHandler { * @param songCode Song code * @param percent Preload progress (0 ~ 100) * @param lyricUrl The lyric url of this music - * @param preloadStatus Preload status; see PreloadStatusCode. - * @param mccStatus The status of the request. See MusicContentCenterStatusCode + * @param state Preload state; see PreloadState. + * @param reason The status of the request. See MusicContentCenterStateReason */ - virtual void onPreLoadEvent(const char* requestId, int64_t songCode, int percent, const char* lyricUrl, PreloadStatusCode preloadStatus, MusicContentCenterStatusCode mccStatus) = 0; + virtual void onPreLoadEvent(const char* requestId, int64_t songCode, int percent, const char* lyricUrl, PreloadState state, MusicContentCenterStateReason reason) = 0; virtual ~IMusicContentCenterEventHandler() {}; }; diff --git a/android/src/main/cpp/third_party/include/iris/iris_base.h b/android/src/main/cpp/third_party/include/iris/iris_base.h index 373d1dd7a..f05c41f2f 100644 --- a/android/src/main/cpp/third_party/include/iris/iris_base.h +++ b/android/src/main/cpp/third_party/include/iris/iris_base.h @@ -32,7 +32,6 @@ typedef enum IrisAppType { } IrisAppType; typedef enum IrisLogLevel { - levelTrace = 0, levelDebug = 1, levelInfo = 2, levelWarn = 3, @@ -51,7 +50,9 @@ typedef enum IrisError { ERR_NULL_POINTER = 1001, ERR_SIZE_NOT_MATCHING = 1002, ERR_BUFFER_EMPTY = 1005, - ERR_FRAM_TYPE_NOT_MATCHING = 10006 + ERR_FRAM_TYPE_NOT_MATCHING = 1006, + ERR_ALREADY_REGISTERED = 1007, + ERR_ALREADY_UNREGISTERED = 1008, } IrisError; IRIS_API void enableUseJsonArray(bool enable); diff --git a/ios/agora_rtc_engine.podspec b/ios/agora_rtc_engine.podspec index 0c99ffad3..fd74c0d68 100644 --- a/ios/agora_rtc_engine.podspec +++ b/ios/agora_rtc_engine.podspec @@ -24,7 +24,7 @@ Pod::Spec.new do |s| s.vendored_frameworks = 'libs/*.xcframework' else s.dependency 'AgoraIrisRTC_iOS', '4.3.0-dev.13' - s.dependency 'AgoraRtcEngine_iOS_Preview', '4.3.0-dev.13' + s.dependency 'AgoraRtcEngine_iOS_Preview', '4.3.0-dev.14' end s.platform = :ios, '9.0' diff --git a/macos/agora_rtc_engine.podspec b/macos/agora_rtc_engine.podspec index 53b972132..9e3ba3376 100644 --- a/macos/agora_rtc_engine.podspec +++ b/macos/agora_rtc_engine.podspec @@ -21,8 +21,8 @@ A new flutter plugin project. puts '[plugin_dev] Found .plugin_dev file, use vendored_frameworks instead.' s.vendored_frameworks = 'libs/*.framework' else - s.dependency 'AgoraRtcEngine_macOS_Preview', '4.3.0-dev.13' - s.dependency 'AgoraIrisRTC_macOS', '4.3.0-dev.13' + s.dependency 'AgoraRtcEngine_macOS_Preview', '4.3.0-dev.14' + s.dependency 'AgoraIrisRTC_macOS', '4.3.0-dev.14' end s.platform = :osx, '10.11' diff --git a/scripts/artifacts_version.sh b/scripts/artifacts_version.sh index 986e9ebe0..6af421113 100644 --- a/scripts/artifacts_version.sh +++ b/scripts/artifacts_version.sh @@ -1,6 +1,6 @@ set -e -export IRIS_CDN_URL_ANDROID="https://download.agora.io/sdk/release/iris_4.3.0-dev.13_DCG_Android_Video_20231213_0239.zip" +export IRIS_CDN_URL_ANDROID="https://download.agora.io/sdk/release/iris_4.3.0-dev.14_DCG_Android_Video_20231221_0531.zip" export IRIS_CDN_URL_IOS="https://download.agora.io/sdk/release/iris_4.3.0-dev.13_DCG_iOS_Video_20231213_0239.zip" -export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.3.0-dev.13_DCG_Mac_Video_20231213_0239.zip" -export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.3.0-dev.13_DCG_Windows_Video_20231213_0239.zip" +export IRIS_CDN_URL_MACOS="https://download.agora.io/sdk/release/iris_4.3.0-dev.14_DCG_Mac_Video_20231221_0531.zip" +export IRIS_CDN_URL_WINDOWS="https://download.agora.io/sdk/release/iris_4.3.0-dev.14_DCG_Windows_Video_20231222_0659.zip" diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 023bfb05f..e7b7f9abb 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -12,8 +12,8 @@ project(${PROJECT_NAME} LANGUAGES CXX) # not be changed set(PLUGIN_NAME "agora_rtc_engine_plugin") -set(IRIS_SDK_DOWNLOAD_URL "https://download.agora.io/sdk/release/iris_4.3.0-dev.13_DCG_Windows_Video_20231213_0239.zip") -set(IRIS_SDK_DOWNLOAD_NAME "iris_4.3.0-dev.13_DCG_Windows") +set(IRIS_SDK_DOWNLOAD_URL "https://download.agora.io/sdk/release/iris_4.3.0-dev.14_DCG_Windows_Video_20231222_0659.zip") +set(IRIS_SDK_DOWNLOAD_NAME "iris_4.3.0-dev.14_DCG_Windows") set(RTC_SDK_DOWNLOAD_NAME "Agora_Native_SDK_for_Windows_FULL") set(IRIS_SDK_VERSION "v3_6_2_fix.1")