Merge pull request #430 from AgoraIO/dev/HarmonyOS_NEXT-Beta

update rtc sdk to 4.4.1
AgoraIO · Oct 25, 2024 · d092bfb · d092bfb
2 parents b04801a + 051cd3a
commit d092bfb
Show file tree

Hide file tree

Showing 162 changed files with 256 additions and 46,854 deletions.
diff --git a/Android/APIExample-Audio/app/build.gradle b/Android/APIExample-Audio/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 def localSdkPath= "${rootProject.projectDir.absolutePath}/../../sdk"
-def agoraSdkVersion = '4.4.0'
+def agoraSdkVersion = '4.4.1'
 
 android {
     compileSdkVersion 32

diff --git a/Android/APIExample-Compose/gradle/libs.versions.toml b/Android/APIExample-Compose/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ composeBom = "2023.08.00"
 loggingInterceptor = "4.10.0"
 materialIconsExtended = "1.6.0"
 navigationCompose = "2.7.7"
-agoraSdk = "4.4.0"
+agoraSdk = "4.4.1"
 okhttp = "4.10.0"
 
 [libraries]

diff --git a/Android/APIExample/app/build.gradle b/Android/APIExample/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply from: "${rootDir.absolutePath}/git-hooks.gradle"
 apply from: 'vendors.gradle'
 
-def agoraSdkVersion = "4.4.0"
+def agoraSdkVersion = "4.4.1"
 def localSdkPath= "${rootProject.projectDir.absolutePath}/../../sdk"
 
 

diff --git a/HarmonyOS_NEXT/APIExample/AppScope/app.json5 b/HarmonyOS_NEXT/APIExample/AppScope/app.json5
@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "io.agora.hmos.apiexample",
+    "bundleName": "io.agora.api.example",
     "vendor": "example",
     "versionCode": 1000000,
     "versionName": "1.0.0",

diff --git a/HarmonyOS_NEXT/APIExample/README.md b/HarmonyOS_NEXT/APIExample/README.md
@@ -32,7 +32,8 @@ To build and run the sample application, get an App Id:
     export const AppCertificate: String = YOUR APP CERTIFICATE
     ```
 
-6. Download the har package from the [official website](https://doc.shengwang.cn/doc/rtc/harmonyos/resources#%E4%B8%8B%E8%BD%BD-sdk) and copy it to `HarmonyOS_NEXT/APIExample/entry/libs/AgoraRtcSdk.har`
+6. Download the har package from the [official website](https://download.agora.io/sdk/release/Agora_Native_SDK_for_HarmonyOS_v4.4.1_FULL.har) and rename`AgoraRtcSdk.har`,then copy it to `HarmonyOS_NEXT/APIExample/entry/libs/AgoraRtcSdk.har`
+7. config the signature information in `build-profile.json5` under the root directory with your own
 
 You are all set. Now connect your HarmonyOS NEXT device and run the project.
 

diff --git a/HarmonyOS_NEXT/APIExample/README.zh.md b/HarmonyOS_NEXT/APIExample/README.zh.md
@@ -31,7 +31,8 @@
     // 注意：App证书放在客户端不安全，推荐放在服务端以确保 App 证书不会泄露。
     export const AppCertificate: String = YOUR APP CERTIFICATE
     ```
-6. 在[官网](https://doc.shengwang.cn/doc/rtc/harmonyos/resources#%E4%B8%8B%E8%BD%BD-sdk)上下载har包，并复制到`HarmonyOS_NEXT/APIExample/entry/libs/AgoraRtcSdk.har`
+6. 在[官网](https://download.agora.io/sdk/release/Agora_Native_SDK_for_HarmonyOS_v4.4.1_FULL.har)上下载har包，重命名`AgoraRtcSdk.har`并复制到`HarmonyOS_NEXT/APIExample/entry/libs/AgoraRtcSdk.har`
+7. 在根目录下面的 `build-profile.json5` 文件配置你的签名
 
 然后你就可以编译并运行项目了。
 

diff --git a/HarmonyOS_NEXT/APIExample/build-profile.json5 b/HarmonyOS_NEXT/APIExample/build-profile.json5
@@ -1,13 +1,17 @@
 {
   "app": {
-    "signingConfigs": [
-    ],
+    "signingConfigs": [],
     "products": [
       {
         "name": "default",
         "signingConfig": "default",
-        "compatibleSdkVersion": "4.1.0(11)",
+        "compatibleSdkVersion": "5.0.0(12)",
         "runtimeOS": "HarmonyOS",
+        "buildOption": {
+          "strictMode": {
+            "useNormalizedOHMUrl": true
+          },
+        }
       }
     ],
     "buildModeSet": [

diff --git a/HarmonyOS_NEXT/APIExample/entry/oh-package-lock.json5 b/HarmonyOS_NEXT/APIExample/entry/oh-package-lock.json5
diff --git a/HarmonyOS_NEXT/APIExample/entry/oh-package.json5 b/HarmonyOS_NEXT/APIExample/entry/oh-package.json5
@@ -6,7 +6,7 @@
   "author": "",
   "license": "",
   "dependencies": {
-    "AgoraRtcSdk": "file:./libs/AgoraRtcSdk.har",
+    "@shengwang/rtc-full": "file:./libs/AgoraRtcSdk.har",
     "librawdataprocessing.so": "file:./src/main/cpp/types/librawdataprocessing"
   }
 }

diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/cpp/CMakeLists.txt b/HarmonyOS_NEXT/APIExample/entry/src/main/cpp/CMakeLists.txt
@@ -9,9 +9,9 @@ if(DEFINED PACKAGE_FIND_FILE)
 endif()
 
 include_directories(${ROOT_PATH}
-                    ${ROOT_PATH}/include)
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules/@shengwang/rtc-full/include)
 
-set(AGORA_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules/AgoraRtcSdk/libs)
+set(AGORA_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules/@shengwang/rtc-full/libs)
 
 add_library(agora_rtc_sdk SHARED IMPORTED)
 set_target_properties(agora_rtc_sdk PROPERTIES IMPORTED_LOCATION ${AGORA_LIB_PATH}/${CMAKE_OHOS_ARCH_ABI}/libagora_rtc_sdk.so)

diff --git a/HarmonyOS_NEXT/APIExample/entry/src/main/cpp/include/AgoraAtomicOps.h b/HarmonyOS_NEXT/APIExample/entry/src/main/cpp/include/AgoraAtomicOps.h